diff -Nru blends-0.6.99ubuntu1/debian/changelog blends-0.6.100ubuntu1/debian/changelog --- blends-0.6.99ubuntu1/debian/changelog 2017-08-14 12:01:30.000000000 +0000 +++ blends-0.6.100ubuntu1/debian/changelog 2017-08-24 14:18:08.000000000 +0000 @@ -1,3 +1,20 @@ +blends (0.6.100ubuntu1) artful; urgency=medium + + * Merge from Debian unstable. Remaining changes: + + Add support for ubuntu's supported and devel release(s). + + -- Bhavani Shankar Thu, 24 Aug 2017 19:47:11 +0530 + +blends (0.6.100) unstable; urgency=medium + + * Team upload + + * devtools/blend-gen-control: Nasty typo fix for (= ${source:Version}) + expression (swap "$" and "{"). + * debian/control: Add myself to Uploaders: field. + + -- Mike Gabriel Mon, 21 Aug 2017 14:11:25 -0400 + blends (0.6.99ubuntu1) artful; urgency=medium * Merge from Debian unstable. Remaining changes: @@ -20,7 +37,7 @@ * devtools/Makefile: Make -D option configurable from the make command call to enable real Depends in debian/control. This can be set by GENCONTROL_DEPEND = true - in Makefile (example: debian-edu src:package) + in Makefile (example: debian-edu src:package). (Closes: #825172). [ Andreas Tille ] * Do not parse changelog to get package metadata diff -Nru blends-0.6.99ubuntu1/debian/control blends-0.6.100ubuntu1/debian/control --- blends-0.6.99ubuntu1/debian/control 2017-08-13 18:19:34.000000000 +0000 +++ blends-0.6.100ubuntu1/debian/control 2017-08-21 21:47:12.000000000 +0000 @@ -4,7 +4,8 @@ Uploaders: Petter Reinholdtsen , Andreas Tille , Jonas Smedegaard , - Ole Streicher + Ole Streicher , + Mike Gabriel , Section: devel Priority: optional Build-Depends: debhelper (>= 10) diff -Nru blends-0.6.99ubuntu1/devtools/blend-gen-control blends-0.6.100ubuntu1/devtools/blend-gen-control --- blends-0.6.99ubuntu1/devtools/blend-gen-control 2017-08-13 18:19:33.000000000 +0000 +++ blends-0.6.100ubuntu1/devtools/blend-gen-control 2017-08-21 21:47:11.000000000 +0000 @@ -271,7 +271,7 @@ my (@depends, @recommends, @suggests); - push @depends, $tasksname.' (= {$source:Version})'; + push @depends, $tasksname.' (= ${source:Version})'; push @depends, '${misc:Depends}'; push @depends, @{$pkglist} if defined $pkglist;