[Python-modules-commits] r12802 - in packages/utidylib/trunk/debian (7 files)

[nijel at users.alioth.debian.org]

    Date: Tuesday, May 4, 2010 @ 15:25:26
  Author: nijel
Revision: 12802

Convert patch to quilt and use 3.0 source format.

Added:
  packages/utidylib/trunk/debian/patches/fix_libtidy_import.patch
    (from rev 12799, packages/utidylib/trunk/debian/patches/01_fix_libtidy_import.dpatch)
  packages/utidylib/trunk/debian/patches/series
    (from rev 12799, packages/utidylib/trunk/debian/patches/00list)
Modified:
  packages/utidylib/trunk/debian/changelog
  packages/utidylib/trunk/debian/control
  packages/utidylib/trunk/debian/rules
Deleted:
  packages/utidylib/trunk/debian/patches/00list
  packages/utidylib/trunk/debian/patches/01_fix_libtidy_import.dpatch

Modified: packages/utidylib/trunk/debian/changelog
===================================================================
--- packages/utidylib/trunk/debian/changelog	2010-05-04 15:20:22 UTC (rev 12801)
+++ packages/utidylib/trunk/debian/changelog	2010-05-04 15:25:26 UTC (rev 12802)
@@ -2,8 +2,9 @@
 
   * New maintainer.
   * Remove depdency on python-ctypes (Closes: #580215).
+  * Convert patch to quilt and use 3.0 source format.
 
- -- Michal ÄŒihaÅ™ <nijel at debian.org>  Tue, 04 May 2010 17:19:53 +0200
+ -- Michal ÄŒihaÅ™ <nijel at debian.org>  Tue, 04 May 2010 17:24:15 +0200
 
 utidylib (0.2-3.2) unstable; urgency=low
 

Modified: packages/utidylib/trunk/debian/control
===================================================================
--- packages/utidylib/trunk/debian/control	2010-05-04 15:20:22 UTC (rev 12801)
+++ packages/utidylib/trunk/debian/control	2010-05-04 15:25:26 UTC (rev 12802)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Python Applications Packaging Team <python-apps-team at lists.alioth.debian.org>
 Uploaders: Michal ÄŒihaÅ™ <nijel at debian.org>
-Build-Depends: debhelper (>= 5.0.37.2), cdbs (>= 0.4.43), python-all-dev (>= 2.3.5-11), dpatch
+Build-Depends: debhelper (>= 5.0.37.2), cdbs (>= 0.4.43), python-all-dev (>= 2.3.5-11)
 Build-Depends-Indep: python-support (>= 0.3)
 Standards-Version: 3.7.2
 

Deleted: packages/utidylib/trunk/debian/patches/00list
===================================================================
--- packages/utidylib/trunk/debian/patches/00list	2010-05-04 15:20:22 UTC (rev 12801)
+++ packages/utidylib/trunk/debian/patches/00list	2010-05-04 15:25:26 UTC (rev 12802)
@@ -1 +0,0 @@
-01_fix_libtidy_import

Deleted: packages/utidylib/trunk/debian/patches/01_fix_libtidy_import.dpatch
===================================================================
--- packages/utidylib/trunk/debian/patches/01_fix_libtidy_import.dpatch	2010-05-04 15:20:22 UTC (rev 12801)
+++ packages/utidylib/trunk/debian/patches/01_fix_libtidy_import.dpatch	2010-05-04 15:25:26 UTC (rev 12802)
@@ -1,37 +0,0 @@
-#! /bin/sh -e
-## 01_fix_libtidy_import by Igor Stroh <jenner at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Add 'tidy' to the list of lib names, so it can be imported
-## DP: correctly in debian
-
-if [ $# -lt 1 ]; then
-    echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
-    exit 1
-fi
-
-[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
-patch_opts="${patch_opts:--f --no-backup-if-mismatch} ${2:+-d $2}"
-
-case "$1" in
-    -patch) patch -p1 ${patch_opts} < $0;;
-    -unpatch) patch -R -p1 ${patch_opts} < $0;;
-    *)
-        echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
-        exit 1;;
-esac
-
-exit 0
-
- at DPATCH@
---- utidylib-0.2.old/tidy/lib.py	2005-08-21 11:21:38.000000000 +0200
-+++ utidylib-0.2/tidy/lib.py	2005-08-21 11:20:06.000000000 +0200
-@@ -22,7 +22,7 @@
- # directory too
- thelib=None
- os.environ['PATH'] = "%s%s%s" % (packagedir, os.pathsep, os.environ['PATH'])
--for libname in ('cygtidy-0-99-0', 'libtidy', 'libtidy.so',
-+for libname in ('tidy', 'cygtidy-0-99-0', 'libtidy', 'libtidy.so',
-                 'libtidy-0.99.so.0', 'tidylib'):
-     try:
-         thelib = getattr(ctypes.cdll, libname)

Copied: packages/utidylib/trunk/debian/patches/fix_libtidy_import.patch (from rev 12799, packages/utidylib/trunk/debian/patches/01_fix_libtidy_import.dpatch)
===================================================================
--- packages/utidylib/trunk/debian/patches/fix_libtidy_import.patch	                        (rev 0)
+++ packages/utidylib/trunk/debian/patches/fix_libtidy_import.patch	2010-05-04 15:25:26 UTC (rev 12802)
@@ -0,0 +1,14 @@
+From: Igor Stroh <jenner at debian.org>
+Subject: Add 'tidy' to the list of lib names, so it can be imported correctly in debian
+
+--- utidylib-0.2.old/tidy/lib.py	2005-08-21 11:21:38.000000000 +0200
++++ utidylib-0.2/tidy/lib.py	2005-08-21 11:20:06.000000000 +0200
+@@ -22,7 +22,7 @@
+ # directory too
+ thelib=None
+ os.environ['PATH'] = "%s%s%s" % (packagedir, os.pathsep, os.environ['PATH'])
+-for libname in ('cygtidy-0-99-0', 'libtidy', 'libtidy.so',
++for libname in ('tidy', 'cygtidy-0-99-0', 'libtidy', 'libtidy.so',
+                 'libtidy-0.99.so.0', 'tidylib'):
+     try:
+         thelib = getattr(ctypes.cdll, libname)

Copied: packages/utidylib/trunk/debian/patches/series (from rev 12799, packages/utidylib/trunk/debian/patches/00list)
===================================================================
--- packages/utidylib/trunk/debian/patches/series	                        (rev 0)
+++ packages/utidylib/trunk/debian/patches/series	2010-05-04 15:25:26 UTC (rev 12802)
@@ -0,0 +1 @@
+fix_libtidy_import.patch

Modified: packages/utidylib/trunk/debian/rules
===================================================================
--- packages/utidylib/trunk/debian/rules	2010-05-04 15:20:22 UTC (rev 12801)
+++ packages/utidylib/trunk/debian/rules	2010-05-04 15:25:26 UTC (rev 12802)
@@ -10,7 +10,6 @@
 DEB_PYTHON_SYSTEM = pysupport
 
 include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/rules/dpatch.mk
 include /usr/share/cdbs/1/class/python-distutils.mk
 
 clean::