[Python-modules-commits] r20272 - in packages/psycopg2/trunk/debian (7 files)

kitterman at users.alioth.debian.org kitterman at users.alioth.debian.org
Thu Feb 2 20:29:51 UTC 2012 

    Date: Thursday, February 2, 2012 @ 20:29:48
  Author: kitterman
Revision: 20272

* Team upload
* Fix debian/rules so python3-psycopg2-dbg so files are properly marked as
  debug versions (Closes: #658219)
* Use local Python objects.inv instead of downloading from python.org
  - Add python2.7-doc and python-3.2-doc to Build-Depends-Indep
  - Add Quilt use to debian/rules and README.source
  - Add debian/patches/local_inventory

Added:
  packages/psycopg2/trunk/debian/README.source
  packages/psycopg2/trunk/debian/patches/
  packages/psycopg2/trunk/debian/patches/local_inventory
  packages/psycopg2/trunk/debian/patches/series
Modified:
  packages/psycopg2/trunk/debian/changelog
  packages/psycopg2/trunk/debian/control
  packages/psycopg2/trunk/debian/rules

Added: packages/psycopg2/trunk/debian/README.source
===================================================================
--- packages/psycopg2/trunk/debian/README.source	                        (rev 0)
+++ packages/psycopg2/trunk/debian/README.source	2012-02-02 20:29:48 UTC (rev 20272)
@@ -0,0 +1,58 @@
+This package uses quilt to manage all modifications to the upstream
+source.  Changes are stored in the source package as diffs in
+debian/patches and applied during the build.
+
+To configure quilt to use debian/patches instead of patches, you want
+either to export QUILT_PATCHES=debian/patches in your environment
+or use this snippet in your ~/.quiltrc:
+
+    for where in ./ ../ ../../ ../../../ ../../../../ ../../../../../; do
+        if [ -e ${where}debian/rules -a -d ${where}debian/patches ]; then
+                export QUILT_PATCHES=debian/patches
+                break
+        fi
+    done
+
+To get the fully patched source after unpacking the source package, cd to
+the root level of the source package and run:
+
+    quilt push -a
+
+The last patch listed in debian/patches/series will become the current
+patch.
+
+To add a new set of changes, first run quilt push -a, and then run:
+
+    quilt new <patch>
+
+where <patch> is a descriptive name for the patch, used as the filename in
+debian/patches.  Then, for every file that will be modified by this patch,
+run:
+
+    quilt add <file>
+
+before editing those files.  You must tell quilt with quilt add what files
+will be part of the patch before making changes or quilt will not work
+properly.  After editing the files, run:
+
+    quilt refresh
+
+to save the results as a patch.
+
+Alternately, if you already have an external patch and you just want to
+add it to the build system, run quilt push -a and then:
+
+    quilt import -P <patch> /path/to/patch
+    quilt push -a
+
+(add -p 0 to quilt import if needed). <patch> as above is the filename to
+use in debian/patches.  The last quilt push -a will apply the patch to
+make sure it works properly.
+
+To remove an existing patch from the list of patches that will be applied,
+run:
+
+    quilt delete <patch>
+
+You may need to run quilt pop -a to unapply patches first before running
+this command.

Modified: packages/psycopg2/trunk/debian/changelog
===================================================================
--- packages/psycopg2/trunk/debian/changelog	2012-02-02 20:09:04 UTC (rev 20271)
+++ packages/psycopg2/trunk/debian/changelog	2012-02-02 20:29:48 UTC (rev 20272)
@@ -1,3 +1,15 @@
+psycopg2 (2.4.4-3) unstable; urgency=low
+
+  * Team upload
+  * Fix debian/rules so python3-psycopg2-dbg so files are properly marked as
+    debug versions (Closes: #658219)
+  * Use local Python objects.inv instead of downloading from python.org
+    - Add python2.7-doc and python-3.2-doc to Build-Depends-Indep
+    - Add Quilt use to debian/rules and README.source
+    - Add debian/patches/local_inventory
+
+ -- Scott Kitterman <scott at kitterman.com>  Thu, 02 Feb 2012 09:04:44 -0500
+
 psycopg2 (2.4.4-2) unstable; urgency=low
 
   * Team upload

Modified: packages/psycopg2/trunk/debian/control
===================================================================
--- packages/psycopg2/trunk/debian/control	2012-02-02 20:09:04 UTC (rev 20271)
+++ packages/psycopg2/trunk/debian/control	2012-02-02 20:29:48 UTC (rev 20272)
@@ -1,8 +1,10 @@
 Source: psycopg2
 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-egenix-mx-base-dev, libpq-dev, python-sphinx (>= 1.0.7+dfsg-1~)
+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-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: Fabio Tranchitella <kobold at debian.org>
 Uploaders: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
 Standards-Version: 3.9.2

Added: packages/psycopg2/trunk/debian/patches/local_inventory
===================================================================
--- packages/psycopg2/trunk/debian/patches/local_inventory	                        (rev 0)
+++ packages/psycopg2/trunk/debian/patches/local_inventory	2012-02-02 20:29:48 UTC (rev 20272)
@@ -0,0 +1,18 @@
+Use local copies of object.inv for building documentation.
+Doesn't need forwarding.
+Patch by Scott Kitterman <scott at kitterman.com> Feb 2, 2012
+Index: psycopg2-2.4.4/doc/src/conf.py
+===================================================================
+--- psycopg2-2.4.4.orig/doc/src/conf.py	2012-02-02 15:07:12.370516809 -0500
++++ psycopg2-2.4.4/doc/src/conf.py	2012-02-02 15:08:07.238515187 -0500
+@@ -61,8 +61,8 @@
+     release = version
+ 
+ intersphinx_mapping = {
+-    'py': ('http://docs.python.org/', None),
+-    'py3': ('http://docs.python.org/3.2', None),
++    'py': ('/usr/share/doc/python2.7-doc/html', None),
++    'py3': ('/usr/share/doc/python3.2-doc/html', None),
+     }
+ 
+ # The language for content autogenerated by Sphinx. Refer to documentation

Added: packages/psycopg2/trunk/debian/patches/series
===================================================================
--- packages/psycopg2/trunk/debian/patches/series	                        (rev 0)
+++ packages/psycopg2/trunk/debian/patches/series	2012-02-02 20:29:48 UTC (rev 20272)
@@ -0,0 +1 @@
+local_inventory

Modified: packages/psycopg2/trunk/debian/rules
===================================================================
--- packages/psycopg2/trunk/debian/rules	2012-02-02 20:09:04 UTC (rev 20271)
+++ packages/psycopg2/trunk/debian/rules	2012-02-02 20:29:48 UTC (rev 20272)
@@ -18,6 +18,7 @@
 configure: configure-stamp
 configure-stamp:
 	dh_testdir
+	dh_quilt_patch
 	rm -f configure
 	touch configure-stamp
 
@@ -49,6 +50,7 @@
 		$$python3 setup.py clean ; \
 	done
 	rm -rf $(CURDIR)/doc/src/_build
+	dh_quilt_unpatch
 	dh_clean
 
 build-arch: build
@@ -78,7 +80,7 @@
 		--root=$(CURDIR)/debian/python-psycopg2-dbg --no-compile $(py_setup_install_args); \
 	done
 	for python3 in $(PY3VERS); do \
-		$$python3 setup.py install \
+		$$python3-dbg setup.py install \
 			--root=$(CURDIR)/debian/python3-psycopg2-dbg --no-compile --install-layout=deb; \
 	done
 	find debian/python-*-dbg ! -type d ! -name '*.so' | xargs rm -f

More information about the Python-modules-commits mailing list