Imported Debian patch 2.5.0-2 debian/2.5.0-2
authorJoel Rosdahl <joel@debian.org>
Sun, 28 Sep 2008 08:14:22 +0000 (10:14 +0200)
committerJoel Rosdahl <joel@debian.org>
Mon, 11 Jan 2010 20:47:03 +0000 (21:47 +0100)
debian/changelog
debian/control
debian/python-pysqlite2-doc.doc-base [new file with mode: 0644]
debian/python-pysqlite2.doc-base [deleted file]
debian/rules

index 9ca367d..e0eb5fb 100644 (file)
@@ -1,3 +1,10 @@
+python-pysqlite2 (2.5.0-2) unstable; urgency=low
+
+  * Moved documentation to a separate package:
+    python-pysqlite2-doc. Closes: #500425.
+
+ -- Joel Rosdahl <joel@debian.org>  Sun, 28 Sep 2008 10:14:22 +0200
+
 python-pysqlite2 (2.5.0-1) unstable; urgency=low
 
   * New upstream release.
index cadf7c7..c8a9c28 100644 (file)
@@ -8,11 +8,11 @@ Standards-Version: 3.8.0
 
 Package: python-pysqlite2
 Architecture: any
-Depends: ${shlibs:Depends}, ${python:Depends}, libjs-jquery
+Depends: ${shlibs:Depends}, ${python:Depends}
 Provides: ${python:Provides}
 Conflicts: python2.3-pysqlite2, python2.4-pysqlite2
 Replaces: python2.3-pysqlite2, python2.4-pysqlite2
-Suggests: python-pysqlite2-dbg
+Suggests: python-pysqlite2-doc, python-pysqlite2-dbg
 XB-Python-Version: ${python:Versions}
 Description: Python interface to SQLite 3
  pysqlite is a DB-API 2.0-compliant database interface for SQLite.
@@ -45,6 +45,15 @@ Description: Python interface to SQLite 3
  or the MSDE, without having any of their license and deployment
  issues.
 
+Package: python-pysqlite2-doc
+Section: doc
+Architecture: all
+Depends: libjs-jquery
+Description: Documentation for python-pysqlite2
+ pysqlite is a DB-API 2.0-compliant database interface for SQLite.
+ .
+ This package contains the documentation.
+
 Package: python-pysqlite2-dbg
 Priority: extra
 Architecture: any
diff --git a/debian/python-pysqlite2-doc.doc-base b/debian/python-pysqlite2-doc.doc-base
new file mode 100644 (file)
index 0000000..0c93abe
--- /dev/null
@@ -0,0 +1,13 @@
+Document: python-pysqlite2-doc
+Title: PySQLite 2 Manual
+Author: Gerhard Haring
+Abstract: Manual for PySQLite 2
+Section: Programming/Python
+
+Format: HTML
+Index: /usr/share/doc/python-pysqlite2-doc/html/index.html
+Files:
+ /usr/share/doc/python-pysqlite2-doc/html/_sources/*
+ /usr/share/doc/python-pysqlite2-doc/html/_static/*
+ /usr/share/doc/python-pysqlite2-doc/html/*.html
+ /usr/share/doc/python-pysqlite2-doc/html/*.json
diff --git a/debian/python-pysqlite2.doc-base b/debian/python-pysqlite2.doc-base
deleted file mode 100644 (file)
index 23e955f..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-Document: python-pysqlite2
-Title: PySQLite 2 Manual
-Author: Gerhard Haring
-Abstract: Manual for PySQLite 2
-Section: Programming/Python
-
-Format: HTML
-Index: /usr/share/doc/python-pysqlite2/manual/index.html
-Files:
- /usr/share/doc/python-pysqlite2/manual/_sources/*
- /usr/share/doc/python-pysqlite2/manual/_static/*
- /usr/share/doc/python-pysqlite2/manual/*.html
- /usr/share/doc/python-pysqlite2/manual/*.json
index e3ff8ff..4cdd3b6 100755 (executable)
@@ -8,7 +8,6 @@ PYVERS = $(shell pyversions -r)
 build: build-stamp
 
 build-stamp: $(PYVERS:%=build-ext-%-stamp) $(PYVERS:%=dbg-build-ext-%-stamp)
-       python setup.py build_docs
        touch $@
 
 build-ext-%-stamp:
@@ -51,24 +50,38 @@ dbg-install-ext-%:
 
 # Build architecture-independent files here.
 binary-indep:
+       dh_testdir
+       dh_testroot
+       dh_prep
+       dh_installdirs -i usr/share/doc/python-pysqlite2-doc/html
+
+       python setup.py build_docs
+       dh_installdocs -i build/doc/*
+       cd debian/python-pysqlite2-doc/usr/share/doc/python-pysqlite2-doc && \
+               mv *.html *.json _static _sources html; \
+               ln -sf ../../../../javascript/jquery/jquery.js html/_static/jquery.js
+
+       dh_installchangelogs -i
+       dh_compress -i -Xjson -Xtxt -Xjs
+       dh_fixperms -i
+       dh_installdeb -i
+       dh_shlibdeps -i
+       dh_gencontrol -i
+       dh_md5sums -i
+       dh_builddeb -i
 
 # Build architecture-dependent files here.
 binary-arch: build install
        dh_testdir -a
        dh_testroot -a
 
-       dh_installdocs -A -a build/doc/*
-       cd debian/python-pysqlite2/usr/share/doc/python-pysqlite2 && \
-               mkdir manual; \
-               mv *.html *.json _static _sources manual; \
-               ln -sf ../../../../javascript/jquery/jquery.js manual/_static/jquery.js
-
+       dh_installdocs -a
        dh_pycentral -a
        dh_installchangelogs -a
        dh_strip -ppython-pysqlite2 --dbg-package=python-pysqlite2-dbg
        rm -rf debian/python-pysqlite2-dbg/usr/share/doc/python-pysqlite2-dbg
        ln -s python-pysqlite2 debian/python-pysqlite2-dbg/usr/share/doc/python-pysqlite2-dbg
-       dh_compress -a -Xjson -Xtxt -Xjs
+       dh_compress -a
        dh_fixperms -a
        dh_installdeb -a
        dh_shlibdeps -a