From 13e0a6ca024397dba39ad66bcb0fd80138b1bd55 Mon Sep 17 00:00:00 2001 From: Julian Andres Klode Date: Thu, 30 Jul 2009 14:12:24 +0200 Subject: debian/control: Only recommend libjs-jquery (Closes: #527543) --- debian/control | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'debian/control') diff --git a/debian/control b/debian/control index 4c7b542f..17084419 100644 --- a/debian/control +++ b/debian/control @@ -22,9 +22,8 @@ Vcs-Browser: http://bzr.debian.org/loggerhead/apt/python-apt/debian-sid/changes Package: python-apt Architecture: any -Depends: ${python:Depends}, ${shlibs:Depends}, ${misc:Depends}, lsb-release, - libjs-jquery -Recommends: iso-codes +Depends: ${python:Depends}, ${shlibs:Depends}, ${misc:Depends}, lsb-release +Recommends: iso-codes, libjs-jquery Breaks: debdelta (<< 0.28~) Provides: ${python:Provides} Suggests: python-apt-dbg, python-gtk2, python-vte -- cgit v1.2.3 From a33de8e29160276e3dbd6a11812c7ec7dd532997 Mon Sep 17 00:00:00 2001 From: Julian Andres Klode Date: Thu, 30 Jul 2009 14:17:31 +0200 Subject: * debian/control: Build-depend on libapt-pkg-dev (>= 0.7.22~) Enhances needs it. --- debian/changelog | 4 +++- debian/control | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) (limited to 'debian/control') diff --git a/debian/changelog b/debian/changelog index 74224c32..b12c156e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,7 +3,9 @@ python-apt (0.7.11.2) unstable; urgency=low [ Julian Andres Klode ] * python/cache.cc: - Support Breaks, Enhances dependency types (Closes: #416247) - * debian/control: Only recommend libjs-jquery (Closes: #527543) + * debian/control: + - Only recommend libjs-jquery (Closes: #527543) + - Build-depend on libapt-pkg-dev (>= 0.7.22~) [ Stefano Zacchiroli ] * debian/python-apt.doc-base: register the documentation with the diff --git a/debian/control b/debian/control index 17084419..234eaaad 100644 --- a/debian/control +++ b/debian/control @@ -8,7 +8,7 @@ XS-Python-Version: all Build-Depends: apt-utils, cdbs, debhelper (>= 5.0.37.1), - libapt-pkg-dev (>= 0.7.10), + libapt-pkg-dev (>= 0.7.22~), python-all-dbg, python-all-dev, python-central (>= 0.5), -- cgit v1.2.3 From eadd9977838ee990a06d5f5702313f81c824d51d Mon Sep 17 00:00:00 2001 From: Julian Andres Klode Date: Thu, 30 Jul 2009 14:31:04 +0200 Subject: debian/control: Update Standards-Version to 3.8.2 --- debian/changelog | 1 + debian/control | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) (limited to 'debian/control') diff --git a/debian/changelog b/debian/changelog index 66f2c052..e95a3fe2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,6 +6,7 @@ python-apt (0.7.11.2) unstable; urgency=low * debian/control: - Only recommend libjs-jquery (Closes: #527543) - Build-depend on libapt-pkg-dev (>= 0.7.22~) + - Update Standards-Version to 3.8.2 * apt/cache.py: - Correctly handle rootdir on second and later invocations of open(), by calling InitSystem again. (LP: #320665). diff --git a/debian/control b/debian/control index 234eaaad..83b2e421 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Section: python Priority: optional Maintainer: APT Development Team Uploaders: Michael Vogt , Julian Andres Klode -Standards-Version: 3.8.1 +Standards-Version: 3.8.2 XS-Python-Version: all Build-Depends: apt-utils, cdbs, -- cgit v1.2.3 From 5441b32e4b56bfc79610bd32b4fe3c4c4b5671dc Mon Sep 17 00:00:00 2001 From: Julian Andres Klode Date: Thu, 30 Jul 2009 15:55:35 +0200 Subject: Use debhelper 7 instead of CDBS --- debian/changelog | 3 ++- debian/compat | 2 +- debian/control | 7 +++---- debian/python-apt-dbg.install | 1 + debian/python-apt.docs | 2 ++ debian/python-apt.install | 9 +++++--- debian/rules | 48 ++++++++++++------------------------------- 7 files changed, 28 insertions(+), 44 deletions(-) create mode 100644 debian/python-apt-dbg.install (limited to 'debian/control') diff --git a/debian/changelog b/debian/changelog index 298c0ac6..2c27b23d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -python-apt (0.7.11.2) unstable; urgency=low +python-apt (0.7.12.0) unstable; urgency=low [ Julian Andres Klode ] * python/cache.cc: @@ -18,6 +18,7 @@ python-apt (0.7.11.2) unstable; urgency=low - Allow to set the candidate of a package (Closes: #523997) + Support assignments to the 'candidate' property of Package objects. + Initial patch by Sebastian Heinlein + * Use debhelper 7 instead of CDBS [ Stefano Zacchiroli ] * debian/python-apt.doc-base: register the documentation with the diff --git a/debian/compat b/debian/compat index 7ed6ff82..7f8f011e 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -5 +7 diff --git a/debian/control b/debian/control index 83b2e421..1d3a9dd3 100644 --- a/debian/control +++ b/debian/control @@ -6,11 +6,10 @@ Uploaders: Michael Vogt , Julian Andres Klode Standards-Version: 3.8.2 XS-Python-Version: all Build-Depends: apt-utils, - cdbs, - debhelper (>= 5.0.37.1), + debhelper (>= 7.3.5), libapt-pkg-dev (>= 0.7.22~), - python-all-dbg, - python-all-dev, + python-all-dbg (>= 2.5.4-1), + python-all-dev (>= 2.5.4-1), python-central (>= 0.5), python-debian, python-distutils-extra (>= 1.9.0), diff --git a/debian/python-apt-dbg.install b/debian/python-apt-dbg.install new file mode 100644 index 00000000..1bbba721 --- /dev/null +++ b/debian/python-apt-dbg.install @@ -0,0 +1 @@ +usr/lib/python*/*/*_d.so diff --git a/debian/python-apt.docs b/debian/python-apt.docs index 6ba083f5..177b5837 100644 --- a/debian/python-apt.docs +++ b/debian/python-apt.docs @@ -1,4 +1,6 @@ README +AUTHORS +TODO apt/README.apt data/templates/README.templates build/doc/html/ diff --git a/debian/python-apt.install b/debian/python-apt.install index 4910e8ed..ca86ed11 100644 --- a/debian/python-apt.install +++ b/debian/python-apt.install @@ -1,3 +1,6 @@ -debian/tmp/usr/lib/python* -debian/tmp/usr/share/locale -debian/tmp/usr/share/python-apt +usr/lib/python*/*/apt_pkg.so +usr/lib/python*/*/apt_inst.so +usr/lib/python*/*/*/ +usr/lib/python*/*/*.egg-info +usr/share/locale +usr/share/python-apt diff --git a/debian/rules b/debian/rules index 6d709ecd..6e2204cf 100755 --- a/debian/rules +++ b/debian/rules @@ -1,42 +1,20 @@ #!/usr/bin/make -f - -DEB_AUTO_CLEANUP_RCS := yes -DEB_PYTHON_SYSTEM=pycentral - export DH_PYCENTRAL=nomove +export DEBVER=$(shell dpkg-parsechangelog | sed -n -e 's/^Version: //p') +export CFLAGS=-Wno-write-strings -DEB_PYTHON_PACKAGES_EXCLUDE=python-apt-dbg - -# Add here any variable or target overrides you need -include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/python-distutils.mk - -PKG=python-apt -DEBVER=$(shell dpkg-parsechangelog |sed -n -e '/^Version:/s/^Version: //p') -DEB_COMPRESS_EXCLUDE:=.html .js _static/* _sources/* _sources/*/* .inv -DEB_BUILD_PROG:=debuild --preserve-envvar PATH --preserve-envvar CCACHE_DIR -us -uc $(DEB_BUILD_PROG_OPTS) -export DEBVER - -build/python-apt-dbg:: - set -e; \ - for i in $(cdbs_python_build_versions); do \ - python$$i-dbg ./setup.py build; \ - done - -install/python-apt-dbg:: - for i in $(cdbs_python_build_versions); do \ - python$$i-dbg ./setup.py install --root $(CURDIR)/debian/python-apt-dbg; \ - done - find debian/python-apt-dbg \ - ! -type d ! -name '*_d.so' | xargs rm -f - find debian/python-apt-dbg -depth -empty -exec rmdir {} \; - -binary-predeb/python-apt:: - ln -sf ../../../../javascript/jquery/jquery.js debian/python-apt/usr/share/doc/python-apt/html/_static/jquery.js +%: + dh --with python-central $@ -binary-predeb/python-apt-dbg:: +override_dh_installdocs: + dh_installdocs + ln -sf ../../../../javascript/jquery/jquery.js \ + debian/python-apt/usr/share/doc/python-apt/html/_static/jquery.js rm -rf debian/python-apt-dbg/usr/share/doc/python-apt-dbg ln -s python-apt debian/python-apt-dbg/usr/share/doc/python-apt-dbg -clean:: - rm -rf build/lib* build/temp* +override_dh_strip: + dh_strip --dbg-package=python-apt-dbg + +override_dh_compress: + dh_compress -X.js -X_static/* -X _sources/* -X_sources/*/* -X.inv -- cgit v1.2.3 From 1d67c8142d295004c894473df5457b8ce9ed6197 Mon Sep 17 00:00:00 2001 From: Julian Andres Klode Date: Thu, 30 Jul 2009 19:07:33 +0200 Subject: debian/control: Do not use versioned build-deps on python-all-{dev,dbg}. Debhelper should conflict against older versions, as it uses --install-layout. But we should'nt do debhelper's work here. --- debian/control | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'debian/control') diff --git a/debian/control b/debian/control index 1d3a9dd3..6d27549a 100644 --- a/debian/control +++ b/debian/control @@ -8,8 +8,8 @@ XS-Python-Version: all Build-Depends: apt-utils, debhelper (>= 7.3.5), libapt-pkg-dev (>= 0.7.22~), - python-all-dbg (>= 2.5.4-1), - python-all-dev (>= 2.5.4-1), + python-all-dbg, + python-all-dev, python-central (>= 0.5), python-debian, python-distutils-extra (>= 1.9.0), -- cgit v1.2.3