[Python-apps-commits] r6459 - in packages/ibid/trunk/debian (7 files)

[stefanor-guest at users.alioth.debian.org]

    Date: Monday, January 3, 2011 @ 21:34:08
  Author: stefanor-guest
Revision: 6459

* Switch to dh_python2, and use X-Python-Version.
* Bump Standards-Version to 3.9.1 (no changes needed).
* Reorganise docs: Install rst as Sphinx _sources, so searching works.

Modified:
  packages/ibid/trunk/debian/changelog
  packages/ibid/trunk/debian/control
  packages/ibid/trunk/debian/doc-base
  packages/ibid/trunk/debian/docs
  packages/ibid/trunk/debian/links
  packages/ibid/trunk/debian/rules
Deleted:
  packages/ibid/trunk/debian/dirs

Modified: packages/ibid/trunk/debian/changelog
===================================================================
--- packages/ibid/trunk/debian/changelog	2011-01-03 20:17:14 UTC (rev 6458)
+++ packages/ibid/trunk/debian/changelog	2011-01-03 21:34:08 UTC (rev 6459)
@@ -6,9 +6,11 @@
   [ Stefano Rivera ]
   * Don't compress objects.inv. Thanks to Michael Fladischer for the report.
     (Closes: #608753)
-  * Switch to dh_python2, and use X-Python-Version
+  * Switch to dh_python2, and use X-Python-Version.
+  * Bump Standards-Version to 3.9.1 (no changes needed).
+  * Reorganise docs: Install rst as Sphinx _sources, so searching works.
 
- -- Stefano Rivera <stefano at rivera.za.net>  Mon, 03 Jan 2011 19:42:13 +0200
+ -- Stefano Rivera <stefano at rivera.za.net>  Mon, 03 Jan 2011 23:25:37 +0200
 
 ibid (0.1.0+dfsg-2) unstable; urgency=low
 

Modified: packages/ibid/trunk/debian/control
===================================================================
--- packages/ibid/trunk/debian/control	2011-01-03 20:17:14 UTC (rev 6458)
+++ packages/ibid/trunk/debian/control	2011-01-03 21:34:08 UTC (rev 6459)
@@ -19,7 +19,7 @@
  python-sqlalchemy (>= 0.5),
  python-twisted-core,
  python-twisted-web
-Standards-Version: 3.8.4
+Standards-Version: 3.9.1
 Homepage: http://ibid.omnia.za.net/
 Vcs-Svn: svn://svn.debian.org/python-apps/packages/ibid/trunk/
 Vcs-Browser: http://svn.debian.org/viewsvn/python-apps/packages/ibid/trunk/

Deleted: packages/ibid/trunk/debian/dirs
===================================================================
--- packages/ibid/trunk/debian/dirs	2011-01-03 20:17:14 UTC (rev 6458)
+++ packages/ibid/trunk/debian/dirs	2011-01-03 21:34:08 UTC (rev 6459)
@@ -1 +0,0 @@
-/usr/share/ibid

Modified: packages/ibid/trunk/debian/doc-base
===================================================================
--- packages/ibid/trunk/debian/doc-base	2011-01-03 20:17:14 UTC (rev 6458)
+++ packages/ibid/trunk/debian/doc-base	2011-01-03 21:34:08 UTC (rev 6459)
@@ -5,5 +5,5 @@
 Section: Programming/Python
 
 Format: HTML
-Index: /usr/share/doc/ibid/docs/html/index.html
-Files: /usr/share/doc/ibid/docs/html/*.html
+Index: /usr/share/doc/ibid/html/index.html
+Files: /usr/share/doc/ibid/html/*.html

Modified: packages/ibid/trunk/debian/docs
===================================================================
--- packages/ibid/trunk/debian/docs	2011-01-03 20:17:14 UTC (rev 6458)
+++ packages/ibid/trunk/debian/docs	2011-01-03 21:34:08 UTC (rev 6459)
@@ -1 +1 @@
-docs
+build/docs

Modified: packages/ibid/trunk/debian/links
===================================================================
--- packages/ibid/trunk/debian/links	2011-01-03 20:17:14 UTC (rev 6458)
+++ packages/ibid/trunk/debian/links	2011-01-03 21:34:08 UTC (rev 6459)
@@ -1 +1,2 @@
-/usr/share/javascript/jquery/jquery.js /usr/share/doc/ibid/docs/html/_static/jquery.js
+/usr/share/javascript/jquery/jquery.js /usr/share/doc/ibid/html/_static/jquery.js
+/usr/share/doc/ibid/html/_sources      /usr/share/doc/ibid/rst

Modified: packages/ibid/trunk/debian/rules
===================================================================
--- packages/ibid/trunk/debian/rules	2011-01-03 20:17:14 UTC (rev 6458)
+++ packages/ibid/trunk/debian/rules	2011-01-03 21:34:08 UTC (rev 6459)
@@ -19,7 +19,7 @@
 	dh_auto_build
 	# Old sphinx-builds (lenny) are picky
 	mkdir -p docs/html docs/_static
-	sphinx-build -N -bhtml docs/ docs/html/
+	sphinx-build -N -bhtml docs/ build/docs
 
 override_dh_auto_install:
 	dh_auto_install
@@ -28,21 +28,20 @@
 
 override_dh_auto_clean:
 	dh_auto_clean
-	rm -rf docs/html
 	rm -rf *.egg-info
 	rm -rf _trial_temp
 	find . -name dropin.cache -delete
 
 override_dh_installdocs:
-	dh_installdocs -Xdocs/html/_sources -Xdocs/_build -Xdocs/html/.doctrees \
-	               -Xdocs/html/_static/jquery.js
+	dh_installdocs -Xdocs/.buildinfo -Xdocs/.doctrees -Xdocs/_static/jquery.js
+	cd $(PKGDIR)/usr/share/doc/ibid && mv docs html
 
 override_dh_installexamples:
 	dh_installexamples
 	cd $(PKGDIR)/usr/share/doc/ibid/examples/factpacks && rm -f *.py *.sh
 
 override_dh_compress:
-	dh_compress -X.js -X.inv
+	dh_compress -X.js -X.inv -X.txt
 
 override_dh_python2:
 	dh_python2 --no-guessing-deps