python-apt (0.7.10) unstable; urgency=low

* Build-Depend on python-debian, use it to get version number from changelog
* Depend on libjs-jquery, and remove internal copy (Closes: #521532)
* apt/package.py:
  - Introduce Version.{uri,uris,fetch_binary()}
* debian/control:
  - Remove mdz from Uploaders (Closes: #521477), add myself.
  - Update Standards-Version to 3.8.1
  - Use ${binary:Version} instead of ${Source-Version}
  - Fix spelling error: python -> Python
* debian/copyright: Switch to machine-interpretable copyright
* Fix documentation building
  - doc/source/conf.py: Only include directories for current python version.
  - debian/control: Build-Depend on python-gtk2, python-vte.
  - setup.py: If pygtk can not be imported, do not build the documentation.
* Breaks: debdelta (<< 0.28~) to avoid more problems due to the internal
  API changes from 0.7.9.

 -- Julian Andres Klode <jak@debian.org> Wed, 01 Apr 2009 15:24:29 +0200

4 files changed, 98 insertions, 17 deletions

diff --git a/debian/changelog b/debian/changelog
index e570733b..04d6a5d5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,24 @@
+python-apt (0.7.10) unstable; urgency=low
+
+  * Build-Depend on python-debian, use it to get version number from changelog
+  * Depend on libjs-jquery, and remove internal copy (Closes: #521532)
+  * apt/package.py:
+    - Introduce Version.{uri,uris,fetch_binary()}
+  * debian/control:
+    - Remove mdz from Uploaders (Closes: #521477), add myself.
+    - Update Standards-Version to 3.8.1
+    - Use ${binary:Version} instead of ${Source-Version}
+    - Fix spelling error: python -> Python
+  * debian/copyright: Switch to machine-interpretable copyright
+  * Fix documentation building
+    - doc/source/conf.py: Only include directories for current python version.
+    - debian/control: Build-Depend on python-gtk2, python-vte.
+    - setup.py: If pygtk can not be imported, do not build the documentation.
+  * Breaks: debdelta (<< 0.28~) to avoid more problems due to the internal
+    API changes from 0.7.9.
+
+ -- Julian Andres Klode <jak@debian.org>  Wed, 01 Apr 2009 15:24:29 +0200
+
 python-apt (0.7.9) unstable; urgency=low
 
   [ Julian Andres Klode ]
@@ -22,7 +43,7 @@ python-apt (0.7.9) unstable; urgency=low
     - add Recommends to iso-codes (for iso_3166.xml)
   * apt/package.py:
     - make sure to set the defaulttimeout back to the
-      original value (in getChangelog(), LP: #314212) 
+      original value (in getChangelog(), LP: #314212)
       Closes: #513315
   * apt/cache.py:
     - when setting a alternative rootdir, read the
diff --git a/debian/control b/debian/control
index 41e3af4a..4c7b542f 100644
--- a/debian/control
+++ b/debian/control
@@ -2,18 +2,30 @@ Source: python-apt
 Section: python
 Priority: optional
 Maintainer: APT Development Team <deity@lists.debian.org>
-Uploaders: Matt Zimmerman <mdz@debian.org>, Michael Vogt <mvo@debian.org>
-Standards-Version: 3.7.2.2
+Uploaders: Michael Vogt <mvo@debian.org>, Julian Andres Klode <jak@debian.org>
+Standards-Version: 3.8.1
 XS-Python-Version: all
-Build-Depends: debhelper (>= 5.0.37.1), libapt-pkg-dev (>= 0.7.10), apt-utils, python-all-dev, python-distutils-extra (>= 1.9.0), cdbs, python-central (>= 0.5), python-all-dbg, python-sphinx (>= 0.5)
+Build-Depends: apt-utils,
+               cdbs,
+               debhelper (>= 5.0.37.1),
+               libapt-pkg-dev (>= 0.7.10),
+               python-all-dbg,
+               python-all-dev,
+               python-central (>= 0.5),
+               python-debian,
+               python-distutils-extra (>= 1.9.0),
+               python-gtk2,
+               python-sphinx (>= 0.5),
+               python-vte
 Vcs-Bzr: http://bzr.debian.org/apt/python-apt/debian-sid
 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
+Depends: ${python:Depends}, ${shlibs:Depends}, ${misc:Depends}, lsb-release,
+         libjs-jquery
 Recommends: iso-codes
-Priority: optional
+Breaks: debdelta (<< 0.28~)
 Provides: ${python:Provides}
 Suggests: python-apt-dbg, python-gtk2, python-vte
 XB-Python-Version: ${python:Versions}
@@ -33,10 +45,12 @@ Description: Python interface to libapt-pkg
 Package: python-apt-dbg
 Priority: extra
 Architecture: any
-Depends: python-dbg, python-apt (= ${Source-Version}), ${shlibs:Depends}
+Section: debug
+Depends: python-dbg, python-apt (= ${binary:Version}), ${shlibs:Depends},
+         ${misc:Depends}
 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
  variety of functions.
  .
- This package contains the extension built for the python debug interpreter.
+ This package contains the extension built for the Python debug interpreter.
diff --git a/debian/copyright b/debian/copyright
index f8463185..8599328a 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,7 +1,53 @@
-APT is free software; you can redistribute them and/or modify them under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; either version 2 of the License, or (at your option) any later
-version.
+Format-Specification: http://wiki.debian.org/Proposals/CopyrightFormat?action=recall&rev=443
 
-On Debian systems, a copy of the GNU General Public License can be
-found in /usr/share/common-licenses/GPL.
+Files: *
+Copyright: © 2004-2009 Canonical Ltd.
+License: GPL-2+
+
+Files: aptsources/*.py
+Copyright: © 2004-2009 Canonical Ltd.
+Copyright: © 2005 Gustavo Noronha Silva
+Copyright: © 2006-2007 Sebastian Heinlein
+License: GPL-2+
+
+Files: doc/source/*
+Copyright: © 2009 Julian Andres Klode <jak@debian.org>
+License: GPL-2+
+
+Files: utils/get_*.py
+Copyright: © 2006 Free Software Foundation Europe
+License: GPL-2+
+
+Files: po/*
+Copyright: © 2006 Canonical Ltd, and Rosetta Contributors 2006
+License: GPL-2+
+
+Files: po/de.po
+Copyright: © 2005 Michiel Sikkes <michiel@eyesopened.nl>
+License: GPL-2+
+
+Files: po/en_CA.po
+Copyright: © 2005 Adam Weinberger and the GNOME Foundation
+License: GPL-2+
+
+Files: po/fi.po
+Copyright: © 2005-2006 Timo Jyrinki
+License: GPL-2+
+
+Files: po/fr.po
+Copyright: © 2007 Hugues NAULET <hnaulet@gmail.com>
+License: GPL-2+
+
+Files: po/hu.po, po/lt.po, po/pt.po, po/ro.po, po/rw.po, po/sv.po, po/uk.po,
+       po/zh_HK.po
+Copyright: © 2005-2006 Free Software Foundation
+License: GPL-2+
+
+License: GPL-2+
+ APT is free software; you can redistribute them and/or modify them under
+ the terms of the GNU General Public License as published by the Free Software
+ Foundation; either version 2 of the License, or (at your option) any later
+ version.
+ .
+ On Debian systems, a copy of the GNU General Public License can be
+ found in /usr/share/common-licenses/GPL-2.
diff --git a/debian/rules b/debian/rules
index 90b48cda..a2802ea7 100755
--- a/debian/rules
+++ b/debian/rules
@@ -22,9 +22,6 @@ build/python-apt-dbg::
 	  python$$i-dbg ./setup.py build; \
 	done
 
-build/python-apt::
-	pydoc -w
-
 install/python-apt-dbg::
 	for i in $(cdbs_python_build_versions); do \
 	  python$$i-dbg ./setup.py install --root $(CURDIR)/debian/python-apt-dbg; \
@@ -33,6 +30,9 @@ install/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
+
 binary-predeb/python-apt-dbg::
 	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