From 72e6ef284a460c497eec3964b0eeddbdf24a4b5a Mon Sep 17 00:00:00 2001
From: Julian Andres Klode <jak@debian.org>
Date: Wed, 10 Mar 2010 15:58:50 +0100
Subject: Move documentation into python-apt-doc (Closes: #572617)

---
 debian/changelog               |  1 +
 debian/control                 | 16 ++++++++++++++--
 debian/python-apt-doc.doc-base |  8 ++++++++
 debian/python-apt-doc.docs     |  1 +
 debian/python-apt.doc-base     |  8 --------
 debian/python-apt.docs         |  1 -
 debian/rules                   |  2 +-
 7 files changed, 25 insertions(+), 12 deletions(-)
 create mode 100644 debian/python-apt-doc.doc-base
 create mode 100644 debian/python-apt-doc.docs
 delete mode 100644 debian/python-apt.doc-base

(limited to 'debian')

diff --git a/debian/changelog b/debian/changelog
index 5c6e6895..b0e6657b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
 python-apt (0.7.93.4) unstable; urgency=low
 
+  * Move documentation into python-apt-doc (Closes: #572617)
   * python/acquire-item.cc:
     - Add AcquireItem.partialsize member.
   * python/apt_pkgmodule.cc:
diff --git a/debian/control b/debian/control
index 4db6c164..8e7605e6 100644
--- a/debian/control
+++ b/debian/control
@@ -23,10 +23,10 @@ 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}
-Recommends: lsb-release, iso-codes, libjs-jquery
+Recommends: lsb-release, iso-codes
 Breaks: debdelta (<< 0.28~), packagekit-backend-apt (<= 0.4.8-0ubuntu4)
 Provides: ${python:Provides}
-Suggests: python-apt-dbg, python-gtk2, python-vte
+Suggests: python-apt-dbg, python-gtk2, python-vte, python-apt-doc
 XB-Python-Version: ${python:Versions}
 Description: Python interface to libapt-pkg
  The apt_pkg Python interface will provide full access to the internal
@@ -41,6 +41,18 @@ Description: Python interface to libapt-pkg
  The included 'aptsources' Python interface provides an abstraction of
  the sources.list configuration on the repository and the distro level.
 
+Package: python-apt-doc
+Architecture: all
+Section: doc
+Depends: libjs-jquery, ${misc:Depends}
+Enhances: python-apt
+Description: Python interface to libapt-pkg (API documentation)
+ 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 API documentation of python-apt.
+
 Package: python-apt-dbg
 Priority: extra
 Architecture: any
diff --git a/debian/python-apt-doc.doc-base b/debian/python-apt-doc.doc-base
new file mode 100644
index 00000000..4f3c4d31
--- /dev/null
+++ b/debian/python-apt-doc.doc-base
@@ -0,0 +1,8 @@
+Document: python-apt-api-reference
+Title: Python APT: API reference manual
+Abstract: API reference manual for Python bindings to libapt-pkg
+Section: Programming/Python
+
+Format: HTML
+Index: /usr/share/doc/python-apt-doc/html/index.html
+Files: /usr/share/doc/python-apt-doc/html/*
diff --git a/debian/python-apt-doc.docs b/debian/python-apt-doc.docs
new file mode 100644
index 00000000..f85adafd
--- /dev/null
+++ b/debian/python-apt-doc.docs
@@ -0,0 +1 @@
+build/sphinx/html/
diff --git a/debian/python-apt.doc-base b/debian/python-apt.doc-base
deleted file mode 100644
index e9b2040c..00000000
--- a/debian/python-apt.doc-base
+++ /dev/null
@@ -1,8 +0,0 @@
-Document: python-apt-api-reference
-Title: Python APT: API reference manual
-Abstract: API reference manual for Python bindings to libapt-pkg
-Section: Programming/Python
-
-Format: HTML
-Index: /usr/share/doc/python-apt/html/index.html
-Files: /usr/share/doc/python-apt/html/*
diff --git a/debian/python-apt.docs b/debian/python-apt.docs
index 1bfc7c1c..a53a1ccc 100644
--- a/debian/python-apt.docs
+++ b/debian/python-apt.docs
@@ -3,4 +3,3 @@ AUTHORS
 TODO
 apt/README.apt
 data/templates/README.templates
-build/sphinx/html/
diff --git a/debian/rules b/debian/rules
index 24d0952e..3711080c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -10,7 +10,7 @@ export CFLAGS=-Wno-write-strings -DCOMPAT_0_7
 override_dh_installdocs:
 	dh_installdocs
 	ln -sf ../../../../javascript/jquery/jquery.js \
-	       debian/python-apt/usr/share/doc/python-apt/html/_static/jquery.js
+	      debian/python-apt-doc/usr/share/doc/python-apt-doc/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
 
-- 
cgit v1.2.3