[Python-apps-commits] r4449 - in packages/kupfer/trunk/debian (7 files)

Sun Jan 3 15:30:56 UTC 2010

Date: Sunday, January 3, 2010 @ 15:30:39
  Author: dktrkranz
Revision: 4449

Switch to format 3.0 (quilt)

Added:
  packages/kupfer/trunk/debian/source/
  packages/kupfer/trunk/debian/source/format
Modified:
  packages/kupfer/trunk/debian/changelog
  packages/kupfer/trunk/debian/control
  packages/kupfer/trunk/debian/patches/debian_path.patch
  packages/kupfer/trunk/debian/rules
Deleted:
  packages/kupfer/trunk/debian/README.source

Deleted: packages/kupfer/trunk/debian/README.source
===================================================================

--- packages/kupfer/trunk/debian/README.source	2010-01-03 15:23:08 UTC (rev 4448)
+++ packages/kupfer/trunk/debian/README.source	2010-01-03 15:30:39 UTC (rev 4449)
@@ -1,58 +0,0 @@
-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/kupfer/trunk/debian/changelog
===================================================================
--- packages/kupfer/trunk/debian/changelog	2010-01-03 15:23:08 UTC (rev 4448)
+++ packages/kupfer/trunk/debian/changelog	2010-01-03 15:30:39 UTC (rev 4449)
@@ -1,8 +1,9 @@
 kupfer (0+c19.1-1) UNRELEASED; urgency=low
 
   * New upstream release.
+  * Switch to format 3.0 (quilt).
 
- -- Luca Falavigna <dktrkranz at debian.org>  Sun, 03 Jan 2010 16:22:37 +0100
+ -- Luca Falavigna <dktrkranz at debian.org>  Sun, 03 Jan 2010 16:29:35 +0100
 
 kupfer (0+c19-1) unstable; urgency=low
   

Modified: packages/kupfer/trunk/debian/control
===================================================================
--- packages/kupfer/trunk/debian/control	2010-01-03 15:23:08 UTC (rev 4448)
+++ packages/kupfer/trunk/debian/control	2010-01-03 15:30:39 UTC (rev 4449)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Luca Falavigna <dktrkranz at debian.org>
 Uploaders: Python Applications Packaging Team <python-apps-team at lists.alioth.debian.org>
-Build-Depends: debhelper (>= 7.0.50), waf, quilt (>= 0.46-7)
+Build-Depends: debhelper (>= 7.0.50), waf
 Build-Depends-Indep: python-support (>= 0.5.3), python (>= 2.5), gettext, intltool, python-docutils, rst2man
 Standards-Version: 3.8.3
 XS-Python-Version: >= 2.5

Modified: packages/kupfer/trunk/debian/patches/debian_path.patch
===================================================================
--- packages/kupfer/trunk/debian/patches/debian_path.patch	2010-01-03 15:23:08 UTC (rev 4448)
+++ packages/kupfer/trunk/debian/patches/debian_path.patch	2010-01-03 15:30:39 UTC (rev 4449)
@@ -19,7 +19,7 @@
 ===================================================================
 --- kupfer-0+c17.orig/wscript	2009-11-01 21:28:37.120208071 +0100
 +++ kupfer-0+c17/wscript	2009-11-01 21:29:10.472194771 +0100
-@@ -168,7 +168,7 @@
+@@ -190,7 +190,7 @@
  	binary_subst_file = "kupfer-activate.sh"
  	bin = bld.new_task_gen("subst",
  		source = binary_subst_file,
@@ -27,4 +27,4 @@
 +		target = "data/kupfer-activate.sh",
  		install_path = "${BINDIR}",
  		chmod = 0755,
- 		dict = {"PYTHON": bld.env["PYTHON"]}
+ 		dict = _dict_slice(bld.env, "PYTHON PYTHONDIR".split())

Modified: packages/kupfer/trunk/debian/rules
===================================================================
--- packages/kupfer/trunk/debian/rules	2010-01-03 15:23:08 UTC (rev 4448)
+++ packages/kupfer/trunk/debian/rules	2010-01-03 15:30:39 UTC (rev 4449)
@@ -1,12 +1,12 @@
 #!/usr/bin/make -f
 
 %:
-	dh --with quilt $@
+	dh $@
 
 clean:
 	waf distclean
 	rm -fr build
-	dh --with quilt $@
+	dh $@
 
 override_dh_auto_configure:
 	PYTHONDIR=/usr/share/kupfer waf configure --prefix=/usr --bindir=/usr/share/kupfer --no-runtime-deps

Added: packages/kupfer/trunk/debian/source/format
===================================================================
--- packages/kupfer/trunk/debian/source/format	                        (rev 0)
+++ packages/kupfer/trunk/debian/source/format	2010-01-03 15:30:39 UTC (rev 4449)
@@ -0,0 +1 @@
+3.0 (quilt)


