[Python-modules-commits] r31835 - in packages/psycopg2/trunk/debian (5 files)

[kitterman at users.alioth.debian.org]

    Date: Tuesday, February 10, 2015 @ 01:49:22
  Author: kitterman
Revision: 31835

* New upstream release
  - Adapt debian/rules build-indep and binary targets  as well as
    python-psycopg2-doc.install for adjustments in upstream documentation
    build system
* Add dh-python to build-depends
* Update debian/watch to use the new pypi.debian.net redirector so that new
  releases are detected and to account for no longer needing to mangle the
  version since a +dfsg tarball is no longer required

Modified:
  packages/psycopg2/trunk/debian/changelog
  packages/psycopg2/trunk/debian/control
  packages/psycopg2/trunk/debian/python-psycopg2-doc.install
  packages/psycopg2/trunk/debian/rules
  packages/psycopg2/trunk/debian/watch

Modified: packages/psycopg2/trunk/debian/changelog
===================================================================
--- packages/psycopg2/trunk/debian/changelog	2015-02-09 00:04:37 UTC (rev 31834)
+++ packages/psycopg2/trunk/debian/changelog	2015-02-10 01:49:22 UTC (rev 31835)
@@ -1,3 +1,16 @@
+psycopg2 (2.6-1) experimental; urgency=medium
+
+  * New upstream release
+    - Adapt debian/rules build-indep and binary targets  as well as
+      python-psycopg2-doc.install for adjustments in upstream documentation
+      build system
+  * Add dh-python to build-depends
+  * Update debian/watch to use the new pypi.debian.net redirector so that new
+    releases are detected and to account for no longer needing to mangle the
+    version since a +dfsg tarball is no longer required
+
+ -- Scott Kitterman <scott at kitterman.com>  Mon, 09 Feb 2015 18:53:58 -0500
+
 psycopg2 (2.5.4+dfsg-1) unstable; urgency=medium
 
   * New upstream release

Modified: packages/psycopg2/trunk/debian/control
===================================================================
--- packages/psycopg2/trunk/debian/control	2015-02-09 00:04:37 UTC (rev 31834)
+++ packages/psycopg2/trunk/debian/control	2015-02-10 01:49:22 UTC (rev 31835)
@@ -2,7 +2,7 @@
 Section: python
 Priority: optional
 Build-Depends: debhelper (>= 5.0.37.2), python-all-dev (>= 2.6.6-3~),
- python-all-dbg (>= 2.6.6-3~), python3-all-dev, python3-all-dbg,
+ python-all-dbg (>= 2.6.6-3~), python3-all-dev, python3-all-dbg, dh-python,
  python-egenix-mx-base-dev, libpq-dev, python-sphinx (>= 1.0.7+dfsg-1~), quilt (>= 0.46-7)
 Build-Depends-Indep: python-doc, python3-doc
 Maintainer: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>

Modified: packages/psycopg2/trunk/debian/python-psycopg2-doc.install
===================================================================
--- packages/psycopg2/trunk/debian/python-psycopg2-doc.install	2015-02-09 00:04:37 UTC (rev 31834)
+++ packages/psycopg2/trunk/debian/python-psycopg2-doc.install	2015-02-10 01:49:22 UTC (rev 31835)
@@ -1,4 +1,3 @@
-doc/html usr/share/doc/python-psycopg2-doc/
-doc/psycopg2.txt usr/share/doc/python-psycopg2-doc/
-doc/HACKING usr/share/doc/python-psycopg2-doc/
+doc/src/_build/html usr/share/doc/python-psycopg2-doc/
+doc/src/_build/text usr/share/doc/python-psycopg2-doc/
 doc/pep-0249.txt usr/share/doc/python-psycopg2-doc/

Modified: packages/psycopg2/trunk/debian/rules
===================================================================
--- packages/psycopg2/trunk/debian/rules	2015-02-09 00:04:37 UTC (rev 31834)
+++ packages/psycopg2/trunk/debian/rules	2015-02-10 01:49:22 UTC (rev 31835)
@@ -55,11 +55,10 @@
 
 build-arch: build
 build-indep:
-	mv $(CURDIR)/doc/psycopg2.txt $(CURDIR)/doc/psycopg2.txt.old
-	mv $(CURDIR)/doc/html $(CURDIR)/doc/html.old
 	export PYTHONPATH=$(CURDIR)/$(DEFAULT_BUILDIR)/; \
-	cd $(CURDIR)/doc; \
-	make -f Makefile
+	cd $(CURDIR)/doc/src; \
+	make -f Makefile html; \
+	make -f Makefile text
 
 install-arch: build-arch
 	dh_testdir
@@ -97,12 +96,9 @@
 binary-indep: build install-indep
 	dh_testdir
 	dh_testroot
-	dh_installdocs -i README AUTHORS
+	dh_installdocs -i README.rst AUTHORS
 	dh_installchangelogs NEWS
 	dh_sphinxdoc -i
-	rm -rf $(CURDIR)/doc/html
-	mv $(CURDIR)/doc/psycopg2.txt.old $(CURDIR)/doc/psycopg2.txt
-	mv $(CURDIR)/doc/html.old $(CURDIR)/doc/html
 	dh_link -i
 	dh_compress -i
 	dh_fixperms -i
@@ -115,8 +111,8 @@
 binary-arch: build install-arch
 	dh_testdir
 	dh_testroot
-	dh_installdocs -a README AUTHORS NEWS
-	dh_installchangelogs
+	dh_installdocs -a README.rst AUTHORS
+	dh_installchangelogs NEWS
 	dh_link -a
 	dh_strip -ppython-psycopg2 --dbg-package=python-psycopg2-dbg
 	rm -rf debian/python-psycopg2-dbg/usr/share/doc/python-psycopg2-dbg

Modified: packages/psycopg2/trunk/debian/watch
===================================================================
--- packages/psycopg2/trunk/debian/watch	2015-02-09 00:04:37 UTC (rev 31834)
+++ packages/psycopg2/trunk/debian/watch	2015-02-10 01:49:22 UTC (rev 31835)
@@ -1,3 +1,2 @@
 version=3
-opts=dversionmangle=s/\+dfsg// \
-http://pypi.python.org/packages/source/p/psycopg2/psycopg2-([0-9][0-9\.\-]*).tar.gz debian uupdate
+http://pypi.debian.net/psycopg2/psycopg2-([0-9][0-9\.\-]*).tar.gz debian uupdate