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

Proposed by Colin Watson
Status: Merged
Merged at revision: 120
Proposed branch: lp:~cjwatson/meta-lp-deps/new-apt
Merge into: lp:meta-lp-deps
Diff against target: 73 lines (+28/-3)
3 files modified
debian/changelog (+7/-0)
debian/control (+2/-2)
debian/rules (+19/-1)
To merge this branch: bzr merge lp:~cjwatson/meta-lp-deps/new-apt
Reviewer Review Type Date Requested Status
Abel Deuring (community) code Approve
Review via email: mp+71386@code.launchpad.net

Description of the change

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.

To post a comment you must log in.
Revision history for this message
Abel Deuring (adeuring) :
review: Approve (code)
lp:~cjwatson/meta-lp-deps/new-apt updated
120. By Colin Watson

release

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2011-07-15 22:39:40 +0000
3+++ debian/changelog 2011-08-12 17:25:25 +0000
4@@ -1,3 +1,10 @@
5+launchpad-dependencies (0.96) natty; urgency=low
6+
7+ * Require new enough versions of python-apt and apt-utils to provide xz
8+ .deb compression support and LongDescription support in apt-ftparchive.
9+
10+ -- Colin Watson <cjwatson@ubuntu.com> Fri, 12 Aug 2011 18:24:11 +0100
11+
12 launchpad-dependencies (0.95) natty; urgency=low
13
14 * Added back python-profiler for older versions of py2.6.
15
16=== modified file 'debian/control'
17--- debian/control 2011-07-15 22:39:40 +0000
18+++ debian/control 2011-08-12 17:25:25 +0000
19@@ -8,7 +8,7 @@
20 Package: launchpad-dependencies
21 Architecture: all
22 Depends: bzr, python-dev, gettext, build-essential,
23- ncompress, python-psycopg2, python-apt, python-geoip,
24+ ncompress, python-psycopg2, python-apt (>= ${python-apt-version}), python-geoip,
25 libgpgme11-dev (>= 1.1.0), cvs, python-svn,
26 python-subversion, python-sqlite, ubuntu-keyring,
27 python-imaging, python-feedparser,
28@@ -36,7 +36,7 @@
29 Architecture: all
30 Depends: launchpad-dependencies (= ${source:Version}), dpkg (>= 1.15.4),
31 germinate, devscripts,
32- apt-utils (>> 0.7.25.3ubuntu9.3),
33+ apt-utils (>= ${apt-utils-version}),
34 ${misc:Depends}
35 Description: Meta-package for Launchpad Soyuz packages
36 This meta-package depends on all of the packages necessary to run Soyuz.
37
38=== modified file 'debian/rules'
39--- debian/rules 2009-08-31 11:04:13 +0000
40+++ debian/rules 2011-08-12 17:25:25 +0000
41@@ -4,6 +4,22 @@
42 # Uncomment this to turn on verbose mode.
43 #export DH_VERBOSE=1
44
45+version := $(shell dpkg-parsechangelog | awk '/^Version:/ { print $2 }')
46+
47+ifneq (,$(findstring lucid,$(version)))
48+ apt_utils_version := 0.7.25.3ubuntu9.6+mvo1
49+ python_apt_version := 0.7.94.2ubuntu6.4
50+else ifneq (,$(findstring maverick,$(version)))
51+ apt_utils_version := 0.8.3ubuntu7.1+launchpad1
52+ python_apt_version := 0.7.96.1ubuntu11.2+launchpad1
53+else ifneq (,$(findstring natty,$(version)))
54+ apt_utils_version := 0.8.12
55+ python_apt_version := 0.7.100.3ubuntu6.1+launchpad1
56+else
57+ apt_utils_version := 0.8.12
58+ python_apt_version := 0.8.0ubuntu1
59+endif
60+
61 build: build-stamp
62 build-stamp:
63 dh_testdir
64@@ -38,7 +54,9 @@
65 dh_compress
66 dh_fixperms
67 dh_installdeb
68- dh_gencontrol
69+ dh_gencontrol -- \
70+ -Vapt-utils-version=$(apt_utils_version) \
71+ -Vpython-apt-version=$(python_apt_version)
72 dh_md5sums
73 dh_builddeb
74

Subscribers

People subscribed via source and target branches