[Python-modules-commits] r10610 - in packages/gamera/trunk/debian (7 files)

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

    Date: Friday, November 27, 2009 @ 16:21:19
  Author: jwilk-guest
Revision: 10610

Switch to source format 3.0 (quilt). Refresh the fix-paths.diff patch.

Added:
  packages/gamera/trunk/debian/source/
  packages/gamera/trunk/debian/source/format
Modified:
  packages/gamera/trunk/debian/changelog
  packages/gamera/trunk/debian/control
  packages/gamera/trunk/debian/patches/fix-paths.diff
  packages/gamera/trunk/debian/rules
Deleted:
  packages/gamera/trunk/debian/README.source

Deleted: packages/gamera/trunk/debian/README.source
===================================================================
--- packages/gamera/trunk/debian/README.source	2009-11-27 16:11:04 UTC (rev 10609)
+++ packages/gamera/trunk/debian/README.source	2009-11-27 16:21:19 UTC (rev 10610)
@@ -1,9 +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.  Please see:
-
-    /usr/share/doc/quilt/README.source
-
-for more information on how to apply the patches, modify patches, or
-remove a patch.
-

Modified: packages/gamera/trunk/debian/changelog
===================================================================
--- packages/gamera/trunk/debian/changelog	2009-11-27 16:11:04 UTC (rev 10609)
+++ packages/gamera/trunk/debian/changelog	2009-11-27 16:21:19 UTC (rev 10610)
@@ -1,6 +1,8 @@
 gamera (3.2.3-2) UNRELEASED; urgency=low
 
   * Provide detached symbols in the *-dbg package.
+  * Switch to source format 3.0 (quilt).
+  * Refresh the fix-paths.diff patch.
 
  -- Jakub Wilk <ubanus at users.sf.net>  Tue, 10 Nov 2009 22:35:38 +0100
 

Modified: packages/gamera/trunk/debian/control
===================================================================
--- packages/gamera/trunk/debian/control	2009-11-27 16:11:04 UTC (rev 10609)
+++ packages/gamera/trunk/debian/control	2009-11-27 16:21:19 UTC (rev 10610)
@@ -5,7 +5,7 @@
 Uploaders: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
 Vcs-Svn: svn://svn.debian.org/python-modules/packages/gamera/trunk
 Vcs-Browser: http://svn.debian.org/viewsvn/python-modules/packages/gamera/trunk/
-Build-Depends: debhelper (>= 7.3.5~), quilt (>= 0.46-7~),
+Build-Depends: debhelper (>= 7.3.5~),
  python-support (>= 0.90), python-all-dev, python-all-dbg,
  libtiff4-dev, libpng12-dev,
  libvigraimpex-dev (>= 1.6.0-1~),

Modified: packages/gamera/trunk/debian/patches/fix-paths.diff
===================================================================
--- packages/gamera/trunk/debian/patches/fix-paths.diff	2009-11-27 16:11:04 UTC (rev 10609)
+++ packages/gamera/trunk/debian/patches/fix-paths.diff	2009-11-27 16:21:19 UTC (rev 10610)
@@ -1,14 +1,15 @@
 Description: Make plugin/toolkit/test paths compatible with python-support.
  Fix documentation generator to look for test files in the build directory.
+Author: Jakub Wilk <ubanus at users.sf.net>
 
-Index: gamera-3.2.0+svn1154/doc/gendoc.py
+Index: gamera-3.2.3/doc/gendoc.py
 ===================================================================
---- gamera-3.2.0+svn1154.orig/doc/gendoc.py	2009-09-04 20:20:45.000000000 +0200
-+++ gamera-3.2.0+svn1154/doc/gendoc.py	2009-09-04 20:21:22.000000000 +0200
-@@ -5,6 +5,12 @@
- import wxversion
- wxversion.select(["2.8", "2.6", "2.5", "2.4"])
+--- gamera-3.2.3.orig/doc/gendoc.py	2009-11-27 17:13:56.000000000 +0100
++++ gamera-3.2.3/doc/gendoc.py	2009-11-27 17:14:01.000000000 +0100
+@@ -7,6 +7,12 @@
  
+ import draw_text_helper
+ 
 +import sys
 +import os
 +import gamera.paths
@@ -18,10 +19,10 @@
  if __name__ == "__main__":
     core.init_gamera()
     gendoc.gendoc(classes=[
-Index: gamera-3.2.0+svn1154/gamera/paths.py
+Index: gamera-3.2.3/gamera/paths.py
 ===================================================================
---- gamera-3.2.0+svn1154.orig/gamera/paths.py	2009-09-04 19:30:06.000000000 +0200
-+++ gamera-3.2.0+svn1154/gamera/paths.py	2009-09-04 20:20:48.000000000 +0200
+--- gamera-3.2.3.orig/gamera/paths.py	2009-09-30 09:49:13.000000000 +0200
++++ gamera-3.2.3/gamera/paths.py	2009-11-27 17:14:01.000000000 +0100
 @@ -22,11 +22,7 @@
  from __future__ import generators
  import os, sys, dircache, glob, imp  # Python standard library

Modified: packages/gamera/trunk/debian/rules
===================================================================
--- packages/gamera/trunk/debian/rules	2009-11-27 16:11:04 UTC (rev 10609)
+++ packages/gamera/trunk/debian/rules	2009-11-27 16:21:19 UTC (rev 10610)
@@ -1,7 +1,5 @@
 #!/usr/bin/make -f
 
-export DH_OPTIONS = --with=quilt
-
 PYTHONPATH = $(wildcard $(CURDIR)/build/lib.*-$(shell pyversions -dv))
 VERSION = $(shell dpkg-parsechangelog | grep ^Version | cut -d ' ' -f 2)
 
@@ -75,10 +73,6 @@
 binary-indep: install-indep
 	dh binary-indep
 
-.PHONY: patch unpatch
-patch unpatch:
-	dh_quilt_$(@)
-
 .PHONY: override_dh_strip
 override_dh_strip:
 	dh_strip --dbg-package=python-gamera-dbg

Added: packages/gamera/trunk/debian/source/format
===================================================================
--- packages/gamera/trunk/debian/source/format	                        (rev 0)
+++ packages/gamera/trunk/debian/source/format	2009-11-27 16:21:19 UTC (rev 10610)
@@ -0,0 +1 @@
+3.0 (quilt)