summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
Diffstat (limited to 'debian')
-rw-r--r--debian/README.source3
-rw-r--r--debian/changelog366
-rw-r--r--debian/compat2
-rw-r--r--debian/control39
-rw-r--r--debian/gbp.conf1
-rw-r--r--debian/pycompat1
-rw-r--r--debian/python-apt-common.install2
-rw-r--r--debian/python-apt-common.lintian-overrides2
-rw-r--r--debian/python-apt-dev.maintscript1
-rw-r--r--debian/python-apt-doc.links1
-rw-r--r--debian/python-apt-doc.maintscript1
-rwxr-xr-xdebian/python-apt-doc.preinst16
-rw-r--r--debian/python3-apt-dbg.files2
-rwxr-xr-xdebian/rules20
-rw-r--r--debian/tests/control2
-rw-r--r--debian/tests/run-tests2
16 files changed, 419 insertions, 42 deletions
diff --git a/debian/README.source b/debian/README.source
deleted file mode 100644
index ecd31364..00000000
--- a/debian/README.source
+++ /dev/null
@@ -1,3 +0,0 @@
-This package is maintained in bzr and it should be build
-with:
-$ bzr-buildpackage --native
diff --git a/debian/changelog b/debian/changelog
index 5ac830b0..31b12488 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,361 @@
+python-apt (1.0.0~beta3) unstable; urgency=medium
+
+ * tests/test_paths.py: Catch and assert the DeprecationWarning
+ * setup.py: If no version is in the environment, return None
+ * doc/source/library/apt_pkg.rst: Fix an example from old API to new API
+ * apt.cache.FilteredCache: Fix multi-arch package lookups
+ * apt.Cache: Introduce a connect2() callback connector
+ * Break the FilteredCache <-> Cache reference cycle
+ * apt.Cache: Issue a RuntimeWarning in connect()
+ * doc: whatsnew: Document what's new in beta3
+
+ -- Julian Andres Klode <jak@debian.org> Wed, 17 Jun 2015 18:28:44 +0200
+
+python-apt (1.0.0~beta2) unstable; urgency=low
+
+ * debian/control: Build-Depend on apt (>= 1.0.9.4) for Files2()
+ * Handle the symlink to directory transition correctly (Closes: #788571)
+
+ -- Julian Andres Klode <jak@debian.org> Sat, 13 Jun 2015 00:41:30 +0200
+
+python-apt (1.0.0~beta1) unstable; urgency=low
+
+ [ Julian Andres Klode ]
+ * tests/test_tagfile.py: Close files we opened to prevent leakage
+ (Closes: #785337)
+ * doc/source/c++/api.rst: Upgrade syntax to use the new domain stuff
+ * doc/source/library/apt_pkg.rst: Fix indentation (Closes: #736119)
+ * sphinx docs: Fix remaining instances of old C syntax to use domains
+ * python/cache.cc: Handle deprecation of pkgCache::PkgIterator::Section()
+ * doc: Prepare for 1.0 release
+ * TagFile: Provide close() and context manager (Closes: #748922)
+ * doc: Document apt_pkg.TagFile additions
+ * doc: templates: layout: Remove invalid icon links
+ * debian/control: Build-Depend on dh-python
+ * Do not link documentation from Architecture: all to Architecture: any
+ * Use ${python:Depends} and friends for the debug packages
+ * apt.debfile: Fix splitting of multi-lines Binary fields in dsc files
+ (Closes: #751770)
+ * Remove apt.progress.gtk2
+ * apt_pkg.Package: Drop the unset 'auto' attribute (Closes: #565364)
+ * Update POTFILES.in and the pot
+ * apt/cache.py: Work around a cyclic reference from Cache to its methods
+ (Closes: #745487)
+ * apt/debfile.py: Arch-qualify in compare_to_version_in_cache()
+ (Closes: #750189)
+ * apt.package: Only reference Launchpad for missing changelogs on Ubuntu
+ (Closes: #781270)
+ * apt/cache.py: Support :all and other special architecture specifies
+ * apt/debfile: Stop special-casing all when looking for a package in the cache
+ * apt/debfile.py: Allow downgrading packages in check() with a parameter
+ (Closes: #613974)
+ * Acquire: Document that items may have transient errors on run() success
+ (Closes: #680997)
+ * Large file support (Closes: #742885)
+ - python/arfile.cc: Do not allow files larger than SIZE_MAX to be mapped
+ - python/arfile.cc: LFS: Use long long instead of long for file sizes
+ - python/tarfile.cc: LFS: Handle too large file
+ * setup.py: Translate version number from Debian to PEP0440 (LP: #1445949)
+
+ [ Michael Vogt ]
+ * apt_pkg.rst: improve documentation for AcquireFile() hash and add
+ sha512 to the documentation
+ * rename "md5" keyword argument in AcquireFile() to "hash" and add
+ backward compatiblity
+ * Fix apt.Package.installed_files for multi-arch packages (LP: #1313699)
+
+ [ von ]
+ * Remove the "-Wstrict-prototypes" compiler option (Closes: #785261)
+ * Set Standards-Version to 3.9.6 (Closes: #785431)
+ * Fix indentation and docstring problems (Closes: #784910)
+
+ [ Michael Schaller ]
+ * Fixed docstring of BaseDependency.version property.
+ * Improved docstring of the Version.get_dependencies method.
+
+ -- Julian Andres Klode <jak@debian.org> Thu, 11 Jun 2015 22:38:31 +0200
+
+python-apt (0.9.4) unstable; urgency=medium
+
+ [ Michael Vogt ]
+ * add apt_pkg.sha512sum()
+ * Add binding for apt_pkg.maybe_open_clear_signed_file()
+ * apt/debfile.py: use apt_pkg.open_maybe_clear_signed_file() when opening a .dsc file
+ * Update doc/example/action.py for py3 and latest API (closes: #782335)
+ * Add MULTI_ARCH_NO constant and deprecate MULTI_ARCH_NONE (closes: #782802)
+ * Fix dead links in python-apt documentation (Closes: #779426)
+
+ [ Martin Pitt ]
+ * ./data/templates/Ubuntu.info.in: Add Wily template. Don't copy extras.u.c.
+ stanza as that's gone since 15.04.
+
+ [ von ]
+ * Update the print_uris.py example to use the new API (Closes: #779217)
+
+ -- Michael Vogt <mvo@debian.org> Thu, 07 May 2015 18:18:29 +0200
+
+python-apt (0.9.3.11) unstable; urgency=low
+
+ [ Colin Watson ]
+ * Add template for the "Ubuntu-RTM" derived distribution.
+ * Detect whether a system is running Ubuntu-RTM by way of
+ "system-image-cli -i". Not perfect but close enough.
+
+ [ Julian Andres Klode ]
+ * Embed changelog entry date and time instead of build date and time
+ (Closes: #762674)
+
+ [ Michael Vogt ]
+ * python/tarfile.cc: use long long in Process() for APT >= 4.14
+ * Merged UbuntuRTMDistribution detection from ubuntu
+ * Add Ubuntu 15.04 (Vivid Vervet) to the template
+
+ -- Michael Vogt <mvo@debian.org> Fri, 24 Oct 2014 10:16:01 -0400
+
+python-apt (0.9.3.10) unstable; urgency=medium
+
+ * python/tag.cc: ensure that the final \n is there when
+ duplicating section data
+ * apt/debfile.py:
+ - Stop reading after the "Format" stanza in a .dsc file
+ - Add support for apt.debfile.DscSrcPackage.filelist
+ - Read all tags from a dsc file and improve tests
+ * fix tests when gnupg is < 1.4.18
+ * update python-apt.pot
+
+ -- Michael Vogt <mvo@debian.org> Thu, 04 Sep 2014 18:07:41 +0200
+
+python-apt (0.9.3.9) unstable; urgency=medium
+
+ [ Michael Vogt ]
+ * fix another pep8 failure
+
+ [ Julian Andres Klode ]
+ * doc/source/tutorials/apt-get.rst: Remove -s from --print-uris invocation
+ (LP: #1308670)
+
+ [ Mauricio Faria de Oliveira ]
+ * tests/test_pep8.py: --ignore E129 too (fix FTBFS with pep8 >= 1.5)
+ * tests/test_auth.py: update for gnupg 1.4.18 (Closes: #755342)
+
+ -- Michael Vogt <mvo@debian.org> Thu, 28 Aug 2014 14:46:57 -0700
+
+python-apt (0.9.3.8) unstable; urgency=medium
+
+ * pep8 fixes to fix autopkgtest failure with the most recent
+ pep8 package
+
+ -- Michael Vogt <mvo@debian.org> Mon, 30 Jun 2014 13:31:29 +0200
+
+python-apt (0.9.3.7) unstable; urgency=medium
+
+ * Include "Blankon" template (Closes: #747498)
+ * Add apt_pkg.SourceRecords.step() to step through all SrcRecords
+ * debian/control:
+ - update build-dependency for libapt-pkg-dev to 1.0.4 for
+ pkgSourceRecords::Step()
+
+ -- Michael Vogt <mvo@debian.org> Tue, 10 Jun 2014 18:23:33 +0200
+
+python-apt (0.9.3.6) unstable; urgency=medium
+
+ [ Johannes Schauer ]
+ * Add support for build profiles (Closes: 744243)
+
+ [ Michael Vogt ]
+ * debian/control:
+ - update build-depends on libapt-pkg-dev for build-profile support
+ * data/templates/Ubuntu.info.in:
+ - add ubuntu utopic
+
+ -- Michael Vogt <mvo@debian.org> Fri, 25 Apr 2014 13:00:08 +0200
+
+python-apt (0.9.3.5) unstable; urgency=medium
+
+ * utils/get_ubuntu_mirrors.py: Drop, its unused and broken
+ * doc/source/conf.py: Do not use 'u' and 'r' prefixes together
+ * tests: Drop some more Python 2.6 cruft
+ * debian/control: Drop X{B,S}-Python-Version and use X-Python-Version
+ * debian/pycompat: Drop, it's not used anymore
+ * python/tag.cc: Ignore missing 'encoding' attribute in file objects
+ * apt/package.py: Do not shadow _
+
+ -- Julian Andres Klode <jak@debian.org> Wed, 02 Apr 2014 00:37:27 +0200
+
+python-apt (0.9.3.4) unstable; urgency=medium
+
+ * python/progress.cc: Fix InstallProgress to set child_pid (LP: #1177720)
+ * python/progress.cc: Remove invalid checks for mixedCase methods
+ * utils/get_*_mirrors*.py: Ensure failure if no mirrors were read
+ * utils/get_*_mirrors*.py: Use sys.stderr.write instead of print
+ * Support all compressors for data.tar/control.tar (Closes: #718330)
+ * Revert "aptsources/sourceslist.py: ensure that our sources are opened with UTF-8"
+ (Closes: #742118)
+
+ -- Julian Andres Klode <jak@debian.org> Thu, 20 Mar 2014 16:48:12 +0100
+
+python-apt (0.9.3.3) unstable; urgency=medium
+
+ [ Steve Langasek ]
+ * aptsources/sourceslist.py: ensure that our sources are opened with UTF-8
+ encoding, regardless of the current locale, and handle the sources lines
+ as Unicode internally for consistency between python2 and python3.
+ LP: #1069019.
+
+ [ Brian Murray ]
+ * Fix pep8 error.
+
+ -- Julian Andres Klode <jak@debian.org> Sat, 15 Mar 2014 18:53:58 +0100
+
+python-apt (0.9.3.2) unstable; urgency=high
+
+ * Revert "* apt/cache.py:" (rootdir change) (Closes: #741251) (LP: #1288171)
+
+ We cannot reset the configuration when rootdir is specified in
+ apt.Cache(). This reopens: #728274.
+
+ -- Julian Andres Klode <jak@debian.org> Mon, 10 Mar 2014 14:32:53 +0100
+
+python-apt (0.9.3.1) unstable; urgency=medium
+
+ * debian/rules: Do not run dh_sphinxdoc -a
+
+ -- Julian Andres Klode <jak@debian.org> Sat, 22 Feb 2014 20:33:06 +0100
+
+python-apt (0.9.3) unstable; urgency=medium
+
+ * doc/source/conf.py: Python 3 support
+ * debian/rules: Use dh_sphinxdoc integration
+ * utils/doclint.py: Drop, not working anymore.
+ * python/generic.h: Fix MkPyNumber to work if char is unsigned.
+ * data: Add Tanglu distribution information
+ * debian/python3-apt-dbg.files: Fix pattern for kFreeBSD
+ * tests/test_policy.py: Disable, uses system state (FTBFS on ppc64)
+ * tests/data/aptsources/sources.list.testDistribution: Add tanglu
+ * tests/test_policy.py: Fix comment to conform to PEP8
+
+ -- Julian Andres Klode <jak@debian.org> Sat, 22 Feb 2014 19:05:48 +0100
+
+python-apt (0.9.2) unstable; urgency=medium
+
+ [ Michael Vogt ]
+ * apt/cache.py:
+ - when using apt.Cache(rootdir=/some/dir) only read the APT
+ configuration from this rootdir instead of /etc (closes: #728274)
+ * make pep8 test part of the unittests
+ * add pyflakes test
+ * add .travis.yml & update python3 dependency to 3.3
+
+ [ Barry Warsaw ]
+ * debian/tests/control: Add python-all and python3-all as Depends for the
+ autopkgtests so all the supported Python versions are pulled in.
+ (closes: #734500)
+
+ [ Michael Schaller]
+ * apt/cache.py:
+ - Fixed PEP8 issues
+ - Fixed pyflakes issue: Removed unused local variable 'transient'
+ * apt/package.py:
+ - Fixed PEP8 issues
+ - Fixed pyflakes issue: Removed unused import 'warnings'
+ - Improved readability and documentation of BaseDependency.__dstr().
+
+ [ Julian Andres Klode ]
+ * apt/cache.py: Call os.path.abspath() on a supplied rootdir (LP: #792295)
+ * apt/package.py: Fix BaseDependency.__dstr.__ne__()
+ * apt/package.py: Pass an apt_pkg.Dependency to BaseDependency
+ * tests: Add back test_hashsums from old and update
+ * Style fixes:
+ - Style fix: Do not use "is True" / "is False"
+ - debian/control: Replace a tab with spaces
+ - tests/test_deps.py: Remove an invalid blank line
+ * Use a single code base for Python 2 and 3
+ - Use print_function everywhere
+ - Drop support for Python 2.6
+ - tests: Remove checks for Python older than 2.7
+ * Documentation fixes:
+ - apt, doc: Fix the list of comp_type values
+ - Unify list of comparison type values everywhere
+ * Static analysis fixes:
+ - (cppcheck) python/pkgmanager.cc: Do not create temporary CppPyRef
+ * Packaging changes:
+ - debian/README.source: Drop it, it's useless bzr
+ - debian/gbp.conf: Set sign-tags = True
+ - debian/control: Set Standards-Version to 3.9.5
+ - debian/control: Drop python-{unittest2,debian} build deps
+
+ -- Julian Andres Klode <jak@debian.org> Sat, 25 Jan 2014 18:18:38 +0100
+
+python-apt (0.9.1) unstable; urgency=low
+
+ * data/templates/Ubuntu.info.in: It's 'Tahr', not 'Thar'
+ * data/templates/Debian.info.in: Add jessie
+ * data/templates/Debian.info.in: Change wheezy version from 7.0 to 7
+ * python/*.cc: Get rid of the easy-to-replace deprecated APT functions
+ * python/{depcache.cc,string.cc}: Ignore deprecation warnings for some calls
+ * python/depcache.cc: Add more error handling to PkgDepCacheCommit
+ * python/cache.cc: Remove a check for an unsigned long value < 0
+ * python/arfile.cc: (C++11) Explicitly cast unsigned long to time_t in {}
+ * python/apt_instmodule.cc: Make RETURN(x) be return on Python 2
+ * python/policy.cc: (scan-build): Fix a dead assignment
+ * python/progress.cc: (scan-build): Fix some uninitialized values
+ * debian: Upgrade to debhelper 9 (and dpkg-buildflags)
+ * debian/python-apt-doc.links: Replace bundled underscore.js by symlink
+ * po: Update the template
+
+ -- Julian Andres Klode <jak@debian.org> Wed, 23 Oct 2013 20:32:40 +0200
+
+python-apt (0.9.0) unstable; urgency=low
+
+ [ Michael Vogt ]
+ * some fixes from the "coverity" scan
+ * merge from Ubuntu:
+ - data/templates/Ubuntu.info.in: add "Saucy Salamander" to
+ - debian/control: add "Multi-Arch: allowed"
+
+ [ Julian Andres Klode ]
+ * Completely remove all old-API support code
+ * Accept bytes object for file names (Closes: #680971)
+ * aptsources/sourceslist.py
+ - Document correct use of uniq and hide it using __all__ (Closes: #723815)
+ - Correctly parse multiple options (LP: #1103200)
+ * python/apt_pkgmodule.cc:
+ - Fix documentation of version_compare (Closes: #680891)
+ * python/cache.cc:
+ - Set NoDelete=true when creating Policy, fixes segfault in destructor
+ * apt/package.py:
+ - Add a Package.has_config_files property (Closes: #712749)
+ * tests:
+ - Do not set dir::etc::sourceparts to /tmp
+ * apt, aptsources:
+ - Only call init_config() if not already initialized (Closes: #686403)
+ * apt/debfile.py:
+ - Pass strip_multi_arch=False to parse_depends. Patch by Michael, tests
+ derived from the ones provided by the reporter.
+ Closes: #717859. Closes: #717861.
+ * doc/source/examples/dpkg-info.py:
+ - Use apt_inst.DebFile (Closes: #671784)
+ * doc/examples/*.py:
+ - Update examples to the new API (Closes: #639022)
+ * tests/old/*.py:
+ - Update to new API as well
+ * data/templates/Ubuntu.info.in:
+ - Add "Trusty Thar"
+ * debian/control:
+ - Set Standards-Version to 3.9.4
+
+ [ Jeremy Bicha ]
+ * data/templates/Ubuntu.info.in: add 'devel' series (Closes: #722961)
+
+ [ Jakub Wilk ]
+ * python-apt: formatting error in library/index.rst (Closes: #692484)
+
+ [ Daniel Hartwig ]
+ * apt/package.py:
+ - mark_upgrade misuses FromUser to set auto-installed (Closes: #686726)
+
+ -- Julian Andres Klode <jak@debian.org> Mon, 21 Oct 2013 20:53:17 +0200
+
python-apt (0.8.9.2+dyson1) unstable; urgency=low
[ Michael Vogt ]
@@ -96,14 +454,6 @@ python-apt (0.8.9~exp1) experimental; urgency=low
-- Michael Vogt <mvo@debian.org> Wed, 13 Mar 2013 18:36:37 +0100
-python-apt (0.8.8.3) UNRELEASED; urgency=low
-
- * aptsources/distro.py:
- - include the missing ID in the NoDistroTemplateException() error,
- thanks to Brian Murray
-
- -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 30 Apr 2013 18:37:24 +0200
-
python-apt (0.8.8.2) unstable; urgency=low
[ David Prévot ]
diff --git a/debian/compat b/debian/compat
index 7f8f011e..ec635144 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-7
+9
diff --git a/debian/control b/debian/control
index 945d49d5..64f9d7d9 100644
--- a/debian/control
+++ b/debian/control
@@ -3,28 +3,30 @@ Section: python
Priority: standard
Maintainer: APT Development Team <deity@lists.debian.org>
Uploaders: Michael Vogt <mvo@debian.org>, Julian Andres Klode <jak@debian.org>
-Standards-Version: 3.9.3
-XS-Python-Version: >= 2.6
-X-Python3-Version: >= 3.1
-Build-Depends: apt (>= 0.9.6),
+Standards-Version: 3.9.6
+X-Python-Version: >= 2.7
+X-Python3-Version: >= 3.3
+Build-Depends: apt (>= 1.0.9.4),
apt-utils,
- debhelper (>= 7.3.5),
+ debhelper (>= 9),
+ dh-python,
fakeroot,
- libapt-pkg-dev (>= 0.8.11),
- python-all-dev (>= 2.6.6-3~),
+ libapt-pkg-dev (>= 1.0.4~),
+ python-all-dev (>= 2.7),
python-all-dbg,
- python3-all-dev (>= 3.1.2-10~),
- python3-all-dbg (>= 3.1.2-6~),
+ python3-all-dev (>= 3.3),
+ python3-all-dbg (>= 3.3),
python-distutils-extra (>= 2.0),
python-sphinx (>= 0.5),
- python-debian,
- python-unittest2
+ pep8,
+ pyflakes
Vcs-Git: git://anonscm.debian.org/apt/python-apt.git
Vcs-Browser: http://anonscm.debian.org/gitweb/?p=apt/python-apt.git
XS-Testsuite: autopkgtest
Package: python-apt
Architecture: any
+Multi-Arch: allowed
Depends: ${python:Depends}, ${shlibs:Depends}, ${misc:Depends}, python-apt-common
Recommends: lsb-release, iso-codes, xz-utils
Breaks: packagekit-backend-apt (<= 0.4.8-0ubuntu4),
@@ -56,8 +58,7 @@ Breaks: packagekit-backend-apt (<= 0.4.8-0ubuntu4),
update-notifier (<< 0.99.3debian9),
wajig (<< 2.0.46)
Provides: ${python:Provides}
-Suggests: python-apt-dbg, python-gtk2, python-vte, python-apt-doc
-XB-Python-Version: ${python:Versions}
+Suggests: python-apt-dbg, python-apt-doc
Description: Python interface to libapt-pkg
The apt_pkg Python interface will provide full access to the internal
libapt-pkg structures allowing Python programs to easily perform a
@@ -75,7 +76,7 @@ Package: python-apt-doc
Priority: optional
Architecture: all
Section: doc
-Depends: libjs-jquery, ${misc:Depends}
+Depends: libjs-jquery, libjs-underscore, ${misc:Depends}, ${sphinxdoc:Depends}
Enhances: python-apt
Replaces: python-apt (<< 0.7.94)
Description: Python interface to libapt-pkg (API documentation)
@@ -88,10 +89,11 @@ Description: Python interface to libapt-pkg (API documentation)
Package: python-apt-dbg
Priority: extra
Architecture: any
+Multi-Arch: allowed
Section: debug
-Depends: python-dbg, python-apt (= ${binary:Version}), ${shlibs:Depends},
+Depends: ${python:Depends}, python-apt (= ${binary:Version}), ${shlibs:Depends},
${misc:Depends}
-XB-Python-Version: ${python:Versions}
+Provides: ${python:Provides}
Description: Python interface to libapt-pkg (debug extension)
The apt_pkg Python interface will provide full access to the internal
libapt-pkg structures allowing Python programs to easily perform a
@@ -130,6 +132,7 @@ Description: Python interface to libapt-pkg (locales)
Package: python3-apt
Priority: optional
Architecture: any
+Multi-Arch: allowed
Depends: ${python3:Depends}, ${shlibs:Depends}, ${misc:Depends}, python-apt-common
Recommends: lsb-release, iso-codes
Provides: ${python3:Provides}
@@ -152,11 +155,13 @@ Description: Python 3 interface to libapt-pkg
Package: python3-apt-dbg
Priority: extra
Architecture: any
+Multi-Arch: allowed
Section: debug
Breaks: python-apt (<< 0.7.98+nmu1)
Replaces: python-apt (<< 0.7.98+nmu1)
-Depends: python3-dbg, python3-apt (= ${binary:Version}), ${shlibs:Depends},
+Depends: ${python3:Depends}, python3-apt (= ${binary:Version}), ${shlibs:Depends},
${misc:Depends}
+Provides: ${python3:Provides}
Description: Python 3 interface to libapt-pkg (debug extension)
The apt_pkg Python 3 interface will provide full access to the internal
libapt-pkg structures allowing Python 3 programs to easily perform a
diff --git a/debian/gbp.conf b/debian/gbp.conf
index 9a5cb4f8..e9f2f7c0 100644
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@ -3,3 +3,4 @@ prebuild = ./pre-build.sh
export-dir = ../build-area
debian-branch = debian/sid
debian-tag = %(version)s
+sign-tags = True
diff --git a/debian/pycompat b/debian/pycompat
deleted file mode 100644
index 0cfbf088..00000000
--- a/debian/pycompat
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/debian/python-apt-common.install b/debian/python-apt-common.install
index bea48037..d21f9b8e 100644
--- a/debian/python-apt-common.install
+++ b/debian/python-apt-common.install
@@ -1,4 +1,2 @@
usr/share/locale
usr/share/python-apt
-# Install the migration helper
-utils/migrate-0.8.py usr/share/python-apt
diff --git a/debian/python-apt-common.lintian-overrides b/debian/python-apt-common.lintian-overrides
deleted file mode 100644
index f0eddf6b..00000000
--- a/debian/python-apt-common.lintian-overrides
+++ /dev/null
@@ -1,2 +0,0 @@
-# package depends on python | python3
-python-script-but-no-python-dep usr/share/python-apt/migrate-0.8.py
diff --git a/debian/python-apt-dev.maintscript b/debian/python-apt-dev.maintscript
new file mode 100644
index 00000000..95afb26e
--- /dev/null
+++ b/debian/python-apt-dev.maintscript
@@ -0,0 +1 @@
+symlink_to_dir /usr/share/doc/python-apt-dev python-apt 1.0.0~beta2~
diff --git a/debian/python-apt-doc.links b/debian/python-apt-doc.links
index 40f834f2..d43d0018 100644
--- a/debian/python-apt-doc.links
+++ b/debian/python-apt-doc.links
@@ -1 +1,2 @@
usr/share/javascript/jquery/jquery.js usr/share/doc/python-apt-doc/html/_static/jquery.js
+usr/share/javascript/underscore/underscore.js usr/share/doc/python-apt-doc/html/_static/underscore.js
diff --git a/debian/python-apt-doc.maintscript b/debian/python-apt-doc.maintscript
new file mode 100644
index 00000000..5deb7bd1
--- /dev/null
+++ b/debian/python-apt-doc.maintscript
@@ -0,0 +1 @@
+symlink_to_dir /usr/share/doc/python-apt-doc python-apt 1.0.0~beta2~
diff --git a/debian/python-apt-doc.preinst b/debian/python-apt-doc.preinst
new file mode 100755
index 00000000..2c467dd2
--- /dev/null
+++ b/debian/python-apt-doc.preinst
@@ -0,0 +1,16 @@
+#!/bin/sh
+
+set -e
+
+# Remove files that remained
+if [ "$1" = "upgrade" ]; then
+ if test -d /usr/share/doc/python-apt/html; then
+ rm -r /usr/share/doc/python-apt/html
+ fi
+
+ if test -d /usr/share/doc/python-apt/examples; then
+ rm -r /usr/share/doc/python-apt/examples
+ fi
+fi
+
+#DEBHELPER#
diff --git a/debian/python3-apt-dbg.files b/debian/python3-apt-dbg.files
index 88cbfcb0..90856651 100644
--- a/debian/python3-apt-dbg.files
+++ b/debian/python3-apt-dbg.files
@@ -1 +1 @@
-usr/lib/python3*/*/*d*.so
+usr/lib/python3*/*/*dm-*.so
diff --git a/debian/rules b/debian/rules
index c6c3e053..abf92519 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,13 +1,18 @@
#!/usr/bin/make -f
# Should be include-links, but that somehow fails.
export DEBVER=$(shell dpkg-parsechangelog | sed -n -e 's/^Version: //p')
-# For compatibility, add -DCOMPAT_0_7
-export CFLAGS=-Wno-write-strings
+export DATETIME:=$(shell dpkg-parsechangelog | sed -n -e 's/^Date: //p')
+export DATE_CMD:=env TZ=UTC LC_ALL=C.UTF-8 date
+export DATE:=$(shell $(DATE_CMD) --date="$(DATETIME)" "+%b %_d %Y")
+export TIME:=$(shell $(DATE_CMD) --date="$(DATETIME)" "+%H:%M:%S")
+export DEB_CFLAGS_MAINT_APPEND=-Wno-write-strings \
+ -DDATE=\""$(DATE)"\" \
+ -DTIME=\""$(TIME)"\"
export PATH := $(CURDIR)/utils:$(PATH)
export pyversions := $(CURDIR)/utils/pyversions
%:
- dh --with python2,python3 $@
+ dh $@ --with python2,python3,sphinxdoc
override_dh_auto_build:
dh_auto_build
@@ -16,15 +21,20 @@ override_dh_install:
dh_movefiles
dh_install
+override_dh_sphinxdoc:
+ set -e; if [ -z $(filter -a,$(DH_INTERNAL_OPTIONS)) ]; then \
+ dh_sphinxdoc; \
+ fi
+
override_dh_installdocs:
set -e; if [ -z $(filter -a,$(DH_INTERNAL_OPTIONS)) ]; then \
python setup.py build_sphinx; \
dh_installdirs -ppython-apt-doc usr/share/doc/python-apt; \
fi
dh_installdirs -ppython-apt-dev usr/share/doc/python-apt
- dh_installdocs -Npython-apt-common -Npython3-apt -Npython3-apt-dbg --link-doc=python-apt
+ dh_installdocs -p python-apt -p python-apt-dbg --link-doc=python-apt
dh_installdocs -p python3-apt -p python3-apt-dbg --link-doc=python3-apt
- dh_installdocs -p python-apt-common
+ dh_installdocs --remaining-packages
override_dh_strip:
dh_strip -p python-apt --dbg-package=python-apt-dbg
diff --git a/debian/tests/control b/debian/tests/control
index 2ca0a401..9c92c35d 100644
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -1,2 +1,2 @@
Tests: run-tests
-Depends: @, apt-utils, python-debian, fakeroot, intltool
+Depends: @, apt-utils, python-debian, python-all, python3-all, fakeroot, intltool, pep8, pyflakes
diff --git a/debian/tests/run-tests b/debian/tests/run-tests
index bb980c6b..7d7a4bf3 100644
--- a/debian/tests/run-tests
+++ b/debian/tests/run-tests
@@ -3,6 +3,6 @@
set -e
# from debian/rules
-for python in $(utils/pyversions -r); do
+for python in $(utils/pyversions -r); do
$python tests/test_all.py -q
done
generated by cgit v1.2.3 (git 2.46.0) at 2026-05-28 14:51:09 +0000