launchpad-reviewers team mailing list archive

[Colin Watson <cjwatson@xxxxxxxxxxxxx>]

Colin Watson has proposed merging lp:~cjwatson/meta-lp-deps/fix-target-detection into lp:meta-lp-deps.

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~cjwatson/meta-lp-deps/fix-target-detection/+merge/71840

IS uploads of this package to the CAT repository apparently drop the "~lucid1" etc. suffix from the version number.  Instead of trying to detect which versions to depend on using the version number, use the upload target, which is more accurate.
-- 
https://code.launchpad.net/~cjwatson/meta-lp-deps/fix-target-detection/+merge/71840
Your team Launchpad code reviewers is requested to review the proposed merge of lp:~cjwatson/meta-lp-deps/fix-target-detection into lp:meta-lp-deps.

=== modified file 'debian/changelog'
--- debian/changelog	2011-08-12 17:24:24 +0000
+++ debian/changelog	2011-08-17 09:58:30 +0000
@@ -1,3 +1,12 @@
+launchpad-dependencies (0.97) natty; urgency=low
+
+  * IS uploads of this package to the CAT repository apparently drop the
+    "~lucid1" etc. suffix from the version number.  Instead of trying to
+    detect which versions to depend on using the version number, use the
+    upload target, which is more accurate.
+
+ -- Colin Watson <cjwatson@xxxxxxxxxx>  Wed, 17 Aug 2011 10:48:49 +0100
+
 launchpad-dependencies (0.96) natty; urgency=low
 
   * Require new enough versions of python-apt and apt-utils to provide xz

=== modified file 'debian/rules'
--- debian/rules	2011-08-12 15:36:10 +0000
+++ debian/rules	2011-08-17 09:58:30 +0000
@@ -4,15 +4,15 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-version := $(shell dpkg-parsechangelog | awk '/^Version:/ { print $2 }')
+target := $(shell dpkg-parsechangelog | awk '/^Distribution:/ { print $2 }')
 
-ifneq (,$(findstring lucid,$(version)))
+ifneq (,$(findstring lucid,$(target)))
   apt_utils_version := 0.7.25.3ubuntu9.6+mvo1
   python_apt_version := 0.7.94.2ubuntu6.4
-else ifneq (,$(findstring maverick,$(version)))
+else ifneq (,$(findstring maverick,$(target)))
   apt_utils_version := 0.8.3ubuntu7.1+launchpad1
   python_apt_version := 0.7.96.1ubuntu11.2+launchpad1
-else ifneq (,$(findstring natty,$(version)))
+else ifneq (,$(findstring natty,$(target)))
   apt_utils_version := 0.8.12
   python_apt_version := 0.7.100.3ubuntu6.1+launchpad1
 else