[Python-modules-commits] r4969 - in packages/pythonmagick/trunk/debian (4 files)

azatoth-guest at users.alioth.debian.org azatoth-guest at users.alioth.debian.org
Wed Apr 2 15:56:55 UTC 2008 

    Date: Wednesday, April 2, 2008 @ 15:56:53
  Author: azatoth-guest
Revision: 4969

using static patch, no more rebootstrapping

Added:
  packages/pythonmagick/trunk/debian/patches/01_python2.4.dpatch
Modified:
  packages/pythonmagick/trunk/debian/patches/00list
  packages/pythonmagick/trunk/debian/rules
Deleted:
  packages/pythonmagick/trunk/debian/patches/01python2.4fix.dpatch

Modified: packages/pythonmagick/trunk/debian/patches/00list
===================================================================
--- packages/pythonmagick/trunk/debian/patches/00list	2008-04-01 22:59:44 UTC (rev 4968)
+++ packages/pythonmagick/trunk/debian/patches/00list	2008-04-02 15:56:53 UTC (rev 4969)
@@ -1 +1 @@
-01python2.4fix.dpatch
+01_python2.4.dpatch

Added: packages/pythonmagick/trunk/debian/patches/01_python2.4.dpatch
===================================================================
--- packages/pythonmagick/trunk/debian/patches/01_python2.4.dpatch	                        (rev 0)
+++ packages/pythonmagick/trunk/debian/patches/01_python2.4.dpatch	2008-04-02 15:56:53 UTC (rev 4969)
@@ -0,0 +1,146 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## build.dpatch by Carl Fürstenberg <azatoth at gmail.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad pythonmagick~/aclocal.m4 pythonmagick/aclocal.m4
+--- pythonmagick~/aclocal.m4	2007-08-02 22:57:04.000000000 +0200
++++ pythonmagick/aclocal.m4	2008-04-02 17:49:45.000000000 +0200
+@@ -18,7 +18,7 @@
+ 
+ # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
+ 
+-# serial 51 Debian 1.5.24-1 AC_PROG_LIBTOOL
++# serial 51 Debian 1.5.24-2 AC_PROG_LIBTOOL
+ 
+ 
+ # AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
+diff -urNad pythonmagick~/config.guess pythonmagick/config.guess
+--- pythonmagick~/config.guess	2007-08-02 22:57:07.000000000 +0200
++++ pythonmagick/config.guess	2008-04-02 17:49:45.000000000 +0200
+@@ -4,7 +4,7 @@
+ #   2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
+ #   Inc.
+ 
+-timestamp='2007-03-06'
++timestamp='2007-07-22'
+ 
+ # This file is free software; you can redistribute it and/or modify it
+ # under the terms of the GNU General Public License as published by
+@@ -330,7 +330,7 @@
+     sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
+ 	echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+ 	exit ;;
+-    i86pc:SunOS:5.*:*)
++    i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
+ 	echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+ 	exit ;;
+     sun4*:SunOS:6*:*)
+@@ -793,7 +793,7 @@
+ 	exit ;;
+     *:Interix*:[3456]*)
+     	case ${UNAME_MACHINE} in
+-	    x86) 
++	    x86)
+ 		echo i586-pc-interix${UNAME_RELEASE}
+ 		exit ;;
+ 	    EM64T | authenticamd)
+diff -urNad pythonmagick~/config.sub pythonmagick/config.sub
+--- pythonmagick~/config.sub	2007-08-02 22:57:07.000000000 +0200
++++ pythonmagick/config.sub	2008-04-02 17:49:45.000000000 +0200
+@@ -4,7 +4,7 @@
+ #   2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
+ #   Inc.
+ 
+-timestamp='2007-01-18'
++timestamp='2007-06-28'
+ 
+ # This file is (in principle) common to ALL GNU software.
+ # The presence of a machine in this file suggests that SOME GNU software
+@@ -475,8 +475,8 @@
+ 		basic_machine=craynv-cray
+ 		os=-unicosmp
+ 		;;
+-	cr16c)
+-		basic_machine=cr16c-unknown
++	cr16)
++		basic_machine=cr16-unknown
+ 		os=-elf
+ 		;;
+ 	crds | unos)
+@@ -683,6 +683,10 @@
+ 		basic_machine=i386-pc
+ 		os=-mingw32
+ 		;;
++	mingw32ce)
++		basic_machine=arm-unknown
++		os=-mingw32ce
++		;;
+ 	miniframe)
+ 		basic_machine=m68000-convergent
+ 		;;
+diff -urNad pythonmagick~/configure pythonmagick/configure
+--- pythonmagick~/configure	2007-08-02 22:57:09.000000000 +0200
++++ pythonmagick/configure	2008-04-02 17:49:45.000000000 +0200
+@@ -19521,12 +19521,12 @@
+ 
+         if test -n "$PYTHON"; then
+       # If the user set $PYTHON, use it and don't search something else.
+-      { echo "$as_me:$LINENO: checking whether $PYTHON version >= 2.5" >&5
+-echo $ECHO_N "checking whether $PYTHON version >= 2.5... $ECHO_C" >&6; }
++      { echo "$as_me:$LINENO: checking whether $PYTHON version >= 2.4" >&5
++echo $ECHO_N "checking whether $PYTHON version >= 2.4... $ECHO_C" >&6; }
+       prog="import sys, string
+ # split strings by '.' and convert to numeric.  Append some zeros
+ # because we need at least 4 digits for the hex conversion.
+-minver = map(int, string.split('2.5', '.')) + [0, 0, 0]
++minver = map(int, string.split('2.4', '.')) + [0, 0, 0]
+ minverhex = 0
+ for i in xrange(0, 4): minverhex = (minverhex << 8) + minver[i]
+ sys.exit(sys.hexversion < minverhex)"
+@@ -19547,8 +19547,8 @@
+     else
+       # Otherwise, try each interpreter until we find one that satisfies
+       # VERSION.
+-      { echo "$as_me:$LINENO: checking for a Python interpreter with version >= 2.5" >&5
+-echo $ECHO_N "checking for a Python interpreter with version >= 2.5... $ECHO_C" >&6; }
++      { echo "$as_me:$LINENO: checking for a Python interpreter with version >= 2.4" >&5
++echo $ECHO_N "checking for a Python interpreter with version >= 2.4... $ECHO_C" >&6; }
+ if test "${am_cv_pathless_PYTHON+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -19558,7 +19558,7 @@
+ 	  prog="import sys, string
+ # split strings by '.' and convert to numeric.  Append some zeros
+ # because we need at least 4 digits for the hex conversion.
+-minver = map(int, string.split('2.5', '.')) + [0, 0, 0]
++minver = map(int, string.split('2.4', '.')) + [0, 0, 0]
+ minverhex = 0
+ for i in xrange(0, 4): minverhex = (minverhex << 8) + minver[i]
+ sys.exit(sys.hexversion < minverhex)"
+diff -urNad pythonmagick~/configure.ac pythonmagick/configure.ac
+--- pythonmagick~/configure.ac	2007-08-02 22:31:28.000000000 +0200
++++ pythonmagick/configure.ac	2008-04-02 17:49:45.000000000 +0200
+@@ -15,7 +15,7 @@
+ AC_PROG_LN_S
+ AC_PROG_MAKE_SET
+ AC_PROG_LIBTOOL
+-AM_PATH_PYTHON(2.5)
++AM_PATH_PYTHON(2.4)
+ 
+ # Checks for libraries.
+ AX_BOOST_BASE
+diff -urNad pythonmagick~/ltmain.sh pythonmagick/ltmain.sh
+--- pythonmagick~/ltmain.sh	2007-07-11 23:11:42.000000000 +0200
++++ pythonmagick/ltmain.sh	2008-04-02 17:49:45.000000000 +0200
+@@ -43,7 +43,7 @@
+ 
+ PROGRAM=ltmain.sh
+ PACKAGE=libtool
+-VERSION="1.5.24 Debian 1.5.24-1"
++VERSION="1.5.24 Debian 1.5.24-2"
+ TIMESTAMP=" (1.1220.2.456 2007/06/24 02:25:32)"
+ 
+ # Be Bourne compatible (taken from Autoconf:_AS_BOURNE_COMPATIBLE).


Property changes on: packages/pythonmagick/trunk/debian/patches/01_python2.4.dpatch
___________________________________________________________________
Name: svn:executable
   + *

Deleted: packages/pythonmagick/trunk/debian/patches/01python2.4fix.dpatch
===================================================================
--- packages/pythonmagick/trunk/debian/patches/01python2.4fix.dpatch	2008-04-01 22:59:44 UTC (rev 4968)
+++ packages/pythonmagick/trunk/debian/patches/01python2.4fix.dpatch	2008-04-02 15:56:53 UTC (rev 4969)
@@ -1,19 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## python2.4fix.dpatch by Carl Fürstenberg <azatoth at gmail.com>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Fix the python version to 2.4.
-
- at DPATCH@
-diff -urNad pythonmagick-0.7~/configure.ac pythonmagick-0.7/configure.ac
---- pythonmagick-0.7~/configure.ac	2007-08-02 22:31:28.000000000 +0200
-+++ pythonmagick-0.7/configure.ac	2007-08-18 16:33:24.000000000 +0200
-@@ -15,7 +15,7 @@
- AC_PROG_LN_S
- AC_PROG_MAKE_SET
- AC_PROG_LIBTOOL
--AM_PATH_PYTHON(2.5)
-+AM_PATH_PYTHON(2.4)
- 
- # Checks for libraries.
- AX_BOOST_BASE

Modified: packages/pythonmagick/trunk/debian/rules
===================================================================
--- packages/pythonmagick/trunk/debian/rules	2008-04-01 22:59:44 UTC (rev 4968)
+++ packages/pythonmagick/trunk/debian/rules	2008-04-02 15:56:53 UTC (rev 4969)
@@ -5,12 +5,11 @@
 include /usr/share/cdbs/1/class/autotools.mk
 
 # per patch 01, we need to rebuild it all, though it will probably fail clean
-post-patches::
-	./autogen.pl
-	./configure --prefix=/usr
+#post-patches::
+#	./configure --prefix=/usr
 
 binary-install/python-pythonmagick::
 	dh_pysupport -ppython-pythonmagick
 
-clean::
-	rm -f autogen.log
+#clean::
+#	rm -f autogen.log

More information about the Python-modules-commits mailing list