[Python-modules-commits] r20886 - in packages/pymilter/trunk/debian (7 files)

[kitterman at users.alioth.debian.org]

    Date: Monday, March 19, 2012 @ 22:08:23
  Author: kitterman
Revision: 20886

  * Add quilt as patch system (d/rules, d/control (build-dep), and
    README.source
  * Add debian/patches/BSD-have-ipv6.diff to fix 'initialization makes pointer
    from integer without a cast' warning on kFreeBSD

Added:
  packages/pymilter/trunk/debian/README.source
  packages/pymilter/trunk/debian/patches/
  packages/pymilter/trunk/debian/patches/BSD-have-ipv6.diff
  packages/pymilter/trunk/debian/patches/series
Modified:
  packages/pymilter/trunk/debian/changelog
  packages/pymilter/trunk/debian/control
  packages/pymilter/trunk/debian/rules

Added: packages/pymilter/trunk/debian/README.source
===================================================================
--- packages/pymilter/trunk/debian/README.source	                        (rev 0)
+++ packages/pymilter/trunk/debian/README.source	2012-03-19 22:08:23 UTC (rev 20886)
@@ -0,0 +1,5 @@
+This package uses quilt for patches.  dpkg-source -x does produce source
+ready for building with dpkg-buildpackage.  It does not procude source ready
+for editing.  See /usr/share/doc/quilt/README.source for information on using
+quilt.
+

Modified: packages/pymilter/trunk/debian/changelog
===================================================================
--- packages/pymilter/trunk/debian/changelog	2012-03-19 21:16:19 UTC (rev 20885)
+++ packages/pymilter/trunk/debian/changelog	2012-03-19 22:08:23 UTC (rev 20886)
@@ -1,3 +1,12 @@
+pymilter (0.9.5-3) UNRELEASED; urgency=low
+
+  * Add quilt as patch system (d/rules, d/control (build-dep), and
+    README.source
+  * Add debian/patches/BSD-have-ipv6.diff to fix 'initialization makes pointer
+    from integer without a cast' warning on kFreeBSD
+
+ -- Scott Kitterman <scott at kitterman.com>  Mon, 19 Mar 2012 17:41:32 -0400
+
 pymilter (0.9.5-2) unstable; urgency=low
 
   * Update debian/copyright

Modified: packages/pymilter/trunk/debian/control
===================================================================
--- packages/pymilter/trunk/debian/control	2012-03-19 21:16:19 UTC (rev 20885)
+++ packages/pymilter/trunk/debian/control	2012-03-19 22:08:23 UTC (rev 20886)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Scott Kitterman <scott at kitterman.com>
 Uploaders: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
-Build-Depends: debhelper (>= 7.3.16), python-all-dev (>= 2.6.5-2~), libmilter-dev, doxygen
+Build-Depends: debhelper (>= 7.3.16), python-all-dev (>= 2.6.5-2~), libmilter-dev, doxygen, quilt (>= 0.46-7)
 Standards-Version: 3.9.3
 X-Python-Version: >= 2.6
 Homepage: http://sourceforge.net/projects/pymilter/

Added: packages/pymilter/trunk/debian/patches/BSD-have-ipv6.diff
===================================================================
--- packages/pymilter/trunk/debian/patches/BSD-have-ipv6.diff	                        (rev 0)
+++ packages/pymilter/trunk/debian/patches/BSD-have-ipv6.diff	2012-03-19 22:08:23 UTC (rev 20886)
@@ -0,0 +1,19 @@
+Patch suggested by upstream since kFreeBSD has IPv6 support.  Should fix
+'initialization makes pointer from integer without a cast' warning.
+Index: pymilter-0.9.5/miltermodule.c
+===================================================================
+--- pymilter-0.9.5.orig/miltermodule.c	2012-03-19 17:36:31.305556712 -0400
++++ pymilter-0.9.5/miltermodule.c	2012-03-19 17:37:51.777554604 -0400
+@@ -263,10 +263,10 @@
+  * published.  Unfortunately I know of now good way to do this
+  * other than with OS-specific tests.
+  */
+-#ifdef linux
++//ifdef linux
+ #define HAVE_IPV6_RFC2553
+ #include <arpa/inet.h>
+-#endif
++//endif
+ #ifdef __HPUX
+ /* only HP-UX 11.1 or greater supports IPv6 */
+ #define HAVE_IPV6_RFC2553

Added: packages/pymilter/trunk/debian/patches/series
===================================================================
--- packages/pymilter/trunk/debian/patches/series	                        (rev 0)
+++ packages/pymilter/trunk/debian/patches/series	2012-03-19 22:08:23 UTC (rev 20886)
@@ -0,0 +1 @@
+BSD-have-ipv6.diff

Modified: packages/pymilter/trunk/debian/rules
===================================================================
--- packages/pymilter/trunk/debian/rules	2012-03-19 21:16:19 UTC (rev 20885)
+++ packages/pymilter/trunk/debian/rules	2012-03-19 22:08:23 UTC (rev 20886)
@@ -1,7 +1,7 @@
 #!/usr/bin/make -f
 
 %:
-	dh $@ --with python2
+	dh $@ --with python2,quilt
 
 override_dh_auto_clean:
 	set -e && for pyvers in $(shell pyversions -vr); do \