[Python-apps-commits] r10082 - in packages/svnmailer (9 files)
anbe at users.alioth.debian.org
anbe at users.alioth.debian.org
Tue Oct 15 22:25:56 UTC 2013
Date: Tuesday, October 15, 2013 @ 22:25:55
Author: anbe
Revision: 10082
switch from dpatch to source format 3.0 (quilt)
Added:
packages/svnmailer/trunk/debian/patches/01_restore_pristine_code.patch
(from rev 10077, packages/svnmailer/trunk/debian/patches/01_restore_pristine_code.dpatch)
packages/svnmailer/trunk/debian/patches/series
Modified:
packages/svnmailer/trunk/ (properties)
packages/svnmailer/trunk/debian/changelog
packages/svnmailer/trunk/debian/control
packages/svnmailer/trunk/debian/rules
packages/svnmailer/trunk/debian/source/format
Deleted:
packages/svnmailer/trunk/debian/patches/00list
packages/svnmailer/trunk/debian/patches/01_restore_pristine_code.dpatch
Property changes on: packages/svnmailer/trunk
___________________________________________________________________
Added: svn:ignore
+ .pc
Modified: packages/svnmailer/trunk/debian/changelog
===================================================================
--- packages/svnmailer/trunk/debian/changelog 2013-10-15 22:22:08 UTC (rev 10081)
+++ packages/svnmailer/trunk/debian/changelog 2013-10-15 22:25:55 UTC (rev 10082)
@@ -3,6 +3,7 @@
* QA upload.
* Revert SVN_STREAM_CHUNK_SIZE int vs. long workaround, this has been fixed
in python-subversion (see #683188).
+ * Switch from dpatch to source format 3.0 (quilt).
-- Andreas Beckmann <anbe at debian.org> Tue, 15 Oct 2013 23:39:38 +0200
Modified: packages/svnmailer/trunk/debian/control
===================================================================
--- packages/svnmailer/trunk/debian/control 2013-10-15 22:22:08 UTC (rev 10081)
+++ packages/svnmailer/trunk/debian/control 2013-10-15 22:25:55 UTC (rev 10082)
@@ -3,7 +3,9 @@
Priority: optional
Maintainer: Python Applications Packaging Team <python-apps-team at lists.alioth.debian.org>
Uploaders: Debian QA Group <packages at qa.debian.org>
-Build-Depends: debhelper (>= 5.0.38), dpatch, python (>= 2.5.4-1~)
+Build-Depends:
+ debhelper (>= 7.0.50~),
+ python (>= 2.5.4-1~),
Build-Depends-Indep: python-support (>= 0.3)
Standards-Version: 3.8.4
Homepage: http://opensource.perlig.de/svnmailer/
Deleted: packages/svnmailer/trunk/debian/patches/00list
===================================================================
--- packages/svnmailer/trunk/debian/patches/00list 2013-10-15 22:22:08 UTC (rev 10081)
+++ packages/svnmailer/trunk/debian/patches/00list 2013-10-15 22:25:55 UTC (rev 10082)
@@ -1 +0,0 @@
-01_restore_pristine_code
Deleted: packages/svnmailer/trunk/debian/patches/01_restore_pristine_code.dpatch
===================================================================
--- packages/svnmailer/trunk/debian/patches/01_restore_pristine_code.dpatch 2013-10-15 22:22:08 UTC (rev 10081)
+++ packages/svnmailer/trunk/debian/patches/01_restore_pristine_code.dpatch 2013-10-15 22:25:55 UTC (rev 10082)
@@ -1,53 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 01_restore_pristine_code.dpatch by Sandro Tosi <morph at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: New patch generated from svnmailer 1.0.8-10 diff.gz
-
- at DPATCH@
-
---- svnmailer-1.0.8.orig/src/lib/svnmailer/notifier/_base.py
-+++ svnmailer-1.0.8/src/lib/svnmailer/notifier/_base.py
-@@ -345,7 +345,6 @@
- @return: The two encodings
- @rtype: C{tuple} of C{str}
- """
-- from encodings import exceptions
-
- enc1 = enc2 = default
- if not change.wasAdded() or change.wasCopied():
-@@ -353,7 +352,7 @@
- enc1 = self._getContentEncoding(
- change.getBasePath(), change.getBaseRevision()
- )
-- except exceptions.LookupError:
-+ except LookupError:
- # fall back
- pass
-
-@@ -364,7 +363,7 @@
- enc2 = self._getContentEncoding(
- change.path, change.revision
- )
-- except exceptions.LookupError:
-+ except LookupError:
- # fall back
- pass
-
-@@ -389,7 +388,6 @@
- @exception encodings.exception.LookupError: The specified encoding
- is not implemented or no encoding was specified
- """
-- from encodings import exceptions
-
- # first try the svn:mime-type
- enc = self.getEncodingFromMimeType(path, revision)
-@@ -427,7 +425,7 @@
- codecs.lookup(enc)
- return enc
-
-- raise exceptions.LookupError("No Encoding configured")
-+ raise LookupError("No Encoding configured")
-
-
- def getEncodingFromMimeType(self, path, revision):
Copied: packages/svnmailer/trunk/debian/patches/01_restore_pristine_code.patch (from rev 10077, packages/svnmailer/trunk/debian/patches/01_restore_pristine_code.dpatch)
===================================================================
--- packages/svnmailer/trunk/debian/patches/01_restore_pristine_code.patch (rev 0)
+++ packages/svnmailer/trunk/debian/patches/01_restore_pristine_code.patch 2013-10-15 22:25:55 UTC (rev 10082)
@@ -0,0 +1,47 @@
+Author: Sandro Tosi <morph at debian.org>
+Description: New patch generated from svnmailer 1.0.8-10 diff.gz
+--- a/src/lib/svnmailer/notifier/_base.py
++++ b/src/lib/svnmailer/notifier/_base.py
+@@ -345,7 +345,6 @@
+ @return: The two encodings
+ @rtype: C{tuple} of C{str}
+ """
+- from encodings import exceptions
+
+ enc1 = enc2 = default
+ if not change.wasAdded() or change.wasCopied():
+@@ -353,7 +352,7 @@
+ enc1 = self._getContentEncoding(
+ change.getBasePath(), change.getBaseRevision()
+ )
+- except exceptions.LookupError:
++ except LookupError:
+ # fall back
+ pass
+
+@@ -364,7 +363,7 @@
+ enc2 = self._getContentEncoding(
+ change.path, change.revision
+ )
+- except exceptions.LookupError:
++ except LookupError:
+ # fall back
+ pass
+
+@@ -389,7 +388,6 @@
+ @exception encodings.exception.LookupError: The specified encoding
+ is not implemented or no encoding was specified
+ """
+- from encodings import exceptions
+
+ # first try the svn:mime-type
+ enc = self.getEncodingFromMimeType(path, revision)
+@@ -427,7 +425,7 @@
+ codecs.lookup(enc)
+ return enc
+
+- raise exceptions.LookupError("No Encoding configured")
++ raise LookupError("No Encoding configured")
+
+
+ def getEncodingFromMimeType(self, path, revision):
Added: packages/svnmailer/trunk/debian/patches/series
===================================================================
--- packages/svnmailer/trunk/debian/patches/series (rev 0)
+++ packages/svnmailer/trunk/debian/patches/series 2013-10-15 22:25:55 UTC (rev 10082)
@@ -0,0 +1 @@
+01_restore_pristine_code.patch
Modified: packages/svnmailer/trunk/debian/rules
===================================================================
--- packages/svnmailer/trunk/debian/rules 2013-10-15 22:22:08 UTC (rev 10081)
+++ packages/svnmailer/trunk/debian/rules 2013-10-15 22:25:55 UTC (rev 10082)
@@ -4,11 +4,10 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
-include /usr/share/dpatch/dpatch.make
include /usr/share/python/python.mk
build: build-stamp
-build-stamp: patch-stamp
+build-stamp:
dh_testdir
# Add here commands to compile the package.
@@ -16,7 +15,7 @@
touch build-stamp
-clean: unpatch
+clean:
dh_testdir
dh_testroot
Modified: packages/svnmailer/trunk/debian/source/format
===================================================================
--- packages/svnmailer/trunk/debian/source/format 2013-10-15 22:22:08 UTC (rev 10081)
+++ packages/svnmailer/trunk/debian/source/format 2013-10-15 22:25:55 UTC (rev 10082)
@@ -1 +1 @@
-1.0
+3.0 (quilt)
More information about the Python-apps-commits
mailing list