[Python-modules-commits] r9933 - in packages/migrate/trunk/debian (7 files)

jandd at users.alioth.debian.org jandd at users.alioth.debian.org
Sat Oct 3 19:37:13 UTC 2009 

    Date: Saturday, October 3, 2009 @ 19:37:12
  Author: jandd
Revision: 9933

fix templates bug (#549488) and documentation build

Added:
  packages/migrate/trunk/debian/README.source
  packages/migrate/trunk/debian/patches/
  packages/migrate/trunk/debian/patches/keep_empty_modules.patch
  packages/migrate/trunk/debian/patches/series
Modified:
  packages/migrate/trunk/debian/changelog
  packages/migrate/trunk/debian/control
  packages/migrate/trunk/debian/rules

Added: packages/migrate/trunk/debian/README.source
===================================================================
--- packages/migrate/trunk/debian/README.source	                        (rev 0)
+++ packages/migrate/trunk/debian/README.source	2009-10-03 19:37:12 UTC (rev 9933)
@@ -0,0 +1,57 @@
+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
+        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/migrate/trunk/debian/changelog
===================================================================
--- packages/migrate/trunk/debian/changelog	2009-10-03 18:35:10 UTC (rev 9932)
+++ packages/migrate/trunk/debian/changelog	2009-10-03 19:37:12 UTC (rev 9933)
@@ -3,10 +3,17 @@
   * debian/control:
     - use Debian email address
     - bump Standards-Version to 3.8.3 (no changes needed)
+    - add quilt to Build-Depends
+    - add python-decorator to Build-Depends indep to fix documentation build
   * debian/copyright:
     - add Domen Kožar to upstream authors
     - update upstream URL
     - use Debian email address
+  * add debian/patches/keep_empty_modules.patch to prevent python-
+    support from deleting the required empty __init__.py files in the
+    templates module (Closes: #549488)
+  * add debian/README.source to document quilt usage
+  * debian/rules: add quilt macros
 
  -- Jan Dittberner <jandd at debian.org>  Sat, 03 Oct 2009 20:06:44 +0200
 

Modified: packages/migrate/trunk/debian/control
===================================================================
--- packages/migrate/trunk/debian/control	2009-10-03 18:35:10 UTC (rev 9932)
+++ packages/migrate/trunk/debian/control	2009-10-03 19:37:12 UTC (rev 9933)
@@ -3,10 +3,10 @@
 Priority: optional
 Maintainer: Jan Dittberner <jandd at debian.org>
 Uploaders: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
-Build-Depends: debhelper (>= 5.0.38)
+Build-Depends: debhelper (>= 5.0.38), quilt
 Build-Depends-Indep: python (>= 2.5.4-1~), python-support (>= 0.6.4),
  python-setuptools (>= 0.6b3), python-codespeak-lib,
- python-sphinx (>= 0.6.1), python-sqlalchemy (>= 0.5.1)
+ python-sphinx (>= 0.6.1), python-sqlalchemy (>= 0.5.1), python-decorator
 Standards-Version: 3.8.3
 XS-Python-Version: >= 2.4
 Homepage: http://code.google.com/p/sqlalchemy-migrate/

Added: packages/migrate/trunk/debian/patches/keep_empty_modules.patch
===================================================================
--- packages/migrate/trunk/debian/patches/keep_empty_modules.patch	                        (rev 0)
+++ packages/migrate/trunk/debian/patches/keep_empty_modules.patch	2009-10-03 19:37:12 UTC (rev 9933)
@@ -0,0 +1,21 @@
+Add comments to the empty __init__.py files to keep python-support from removing them
+--- /dev/null
++++ b/migrate/versioning/templates/__init__.py
+@@ -0,0 +1 @@
++# template module
+--- /dev/null
++++ b/migrate/versioning/templates/repository/__init__.py
+@@ -0,0 +1 @@
++# template repository module
+--- /dev/null
++++ b/migrate/versioning/templates/repository/default/__init__.py
+@@ -0,0 +1 @@
++# template repository default module
+--- /dev/null
++++ b/migrate/versioning/templates/repository/default/versions/__init__.py
+@@ -0,0 +1 @@
++# template repository default versions module
+--- /dev/null
++++ b/migrate/versioning/templates/script/__init__.py
+@@ -0,0 +1 @@
++# templates script module

Added: packages/migrate/trunk/debian/patches/series
===================================================================
--- packages/migrate/trunk/debian/patches/series	                        (rev 0)
+++ packages/migrate/trunk/debian/patches/series	2009-10-03 19:37:12 UTC (rev 9933)
@@ -0,0 +1 @@
+keep_empty_modules.patch

Modified: packages/migrate/trunk/debian/rules
===================================================================
--- packages/migrate/trunk/debian/rules	2009-10-03 18:35:10 UTC (rev 9932)
+++ packages/migrate/trunk/debian/rules	2009-10-03 19:37:12 UTC (rev 9933)
@@ -2,12 +2,13 @@
 
 #export DH_VERBOSE=1
 include /usr/share/python/python.mk
+include /usr/share/quilt/quilt.make
 
 DEB_UPSTREAM_VERSION=$(shell dpkg-parsechangelog \
 	| sed -rne 's,^Version: ([^-]+).*,\1,p')
 DOCS=$(shell find docs/ -name "*.rst" -printf "%p ")
 
-clean:
+clean: unpatch
 	dh_testdir
 	dh_testroot
 	rm -rf dist build
@@ -15,7 +16,7 @@
 	rm -f docs/reference.txt
 	dh_clean build-*
 
-build: build-indep
+build: $(QUILT_STAMPFN) build-indep
 
 build-indep:
 	dh_installdirs -i

More information about the Python-modules-commits mailing list