← Back to team overview

launchpad-reviewers team mailing list archive

[Merge] lp:~cjwatson/meta-lp-deps/new-apt into lp:meta-lp-deps

 

Colin Watson has proposed merging lp:~cjwatson/meta-lp-deps/new-apt into lp:meta-lp-deps.

Requested reviews:
  Abel Deuring (adeuring)

For more details, see:
https://code.launchpad.net/~cjwatson/meta-lp-deps/new-apt/+merge/71386

Require new enough versions of python-apt and apt-utils to provide xz .deb compression support and LongDescription support in apt-ftparchive.  This will permit deploying these two branches:

  https://code.launchpad.net/~cjwatson/launchpad/dpkg-xz-support-619152
  https://code.launchpad.net/~cjwatson/launchpad/multiarch-translations

I've taken care to ensure that the versions will be appropriate for all of the series that this package will be built for.  I hope that the code I added to do this will be useful to others in the future as well.
-- 
https://code.launchpad.net/~cjwatson/meta-lp-deps/new-apt/+merge/71386
Your team Launchpad code reviewers is subscribed to branch lp:meta-lp-deps.
=== modified file 'debian/changelog'
--- debian/changelog	2011-07-15 22:39:40 +0000
+++ debian/changelog	2011-08-12 15:40:29 +0000
@@ -1,3 +1,10 @@
+launchpad-dependencies (0.96~lucid1) UNRELEASED; urgency=low
+
+  * Require new enough versions of python-apt and apt-utils to provide xz
+    .deb compression support and LongDescription support in apt-ftparchive.
+
+ -- Colin Watson <cjwatson@xxxxxxxxxx>  Wed, 13 Jul 2011 13:17:47 +0100
+
 launchpad-dependencies (0.95) natty; urgency=low
 
   * Added back python-profiler for older versions of py2.6.

=== modified file 'debian/control'
--- debian/control	2011-07-15 22:39:40 +0000
+++ debian/control	2011-08-12 15:40:29 +0000
@@ -8,7 +8,7 @@
 Package: launchpad-dependencies
 Architecture: all
 Depends: bzr, python-dev, gettext, build-essential,
-  ncompress, python-psycopg2, python-apt, python-geoip,
+  ncompress, python-psycopg2, python-apt (>= ${python-apt-version}), python-geoip,
   libgpgme11-dev (>= 1.1.0), cvs, python-svn,
   python-subversion, python-sqlite, ubuntu-keyring,
   python-imaging, python-feedparser,
@@ -36,7 +36,7 @@
 Architecture: all
 Depends: launchpad-dependencies (= ${source:Version}), dpkg (>= 1.15.4),
   germinate, devscripts,
-  apt-utils (>> 0.7.25.3ubuntu9.3),
+  apt-utils (>= ${apt-utils-version}),
   ${misc:Depends}
 Description: Meta-package for Launchpad Soyuz packages
  This meta-package depends on all of the packages necessary to run Soyuz.

=== modified file 'debian/rules'
--- debian/rules	2009-08-31 11:04:13 +0000
+++ debian/rules	2011-08-12 15:40:29 +0000
@@ -4,6 +4,22 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
+version := $(shell dpkg-parsechangelog | awk '/^Version:/ { print $2 }')
+
+ifneq (,$(findstring lucid,$(version)))
+  apt_utils_version := 0.7.25.3ubuntu9.6+mvo1
+  python_apt_version := 0.7.94.2ubuntu6.4
+else ifneq (,$(findstring maverick,$(version)))
+  apt_utils_version := 0.8.3ubuntu7.1+launchpad1
+  python_apt_version := 0.7.96.1ubuntu11.2+launchpad1
+else ifneq (,$(findstring natty,$(version)))
+  apt_utils_version := 0.8.12
+  python_apt_version := 0.7.100.3ubuntu6.1+launchpad1
+else
+  apt_utils_version := 0.8.12
+  python_apt_version := 0.8.0ubuntu1
+endif
+
 build: build-stamp
 build-stamp:
 	dh_testdir
@@ -38,7 +54,9 @@
 	dh_compress
 	dh_fixperms
 	dh_installdeb
-	dh_gencontrol
+	dh_gencontrol -- \
+		-Vapt-utils-version=$(apt_utils_version) \
+		-Vpython-apt-version=$(python_apt_version)
 	dh_md5sums
 	dh_builddeb
 


Follow ups