[Pkg-mono-svn-commits] rev 2475 - in non-group/beagle/trunk/debian:
. patches
Jose Carlos Garcia Sogo
jsogo at costa.debian.org
Sun Apr 23 18:14:03 UTC 2006
Author: jsogo
Date: 2006-04-23 18:14:02 +0000 (Sun, 23 Apr 2006)
New Revision: 2475
Added:
non-group/beagle/trunk/debian/patches/use-python2.4.dpatch
Modified:
non-group/beagle/trunk/debian/changelog
non-group/beagle/trunk/debian/patches/00list
non-group/beagle/trunk/debian/patches/relibtoolize.dpatch
non-group/beagle/trunk/debian/rules
Log:
use-python2.4: patch to force using python2.4 for python-beagle
Modified: non-group/beagle/trunk/debian/changelog
===================================================================
--- non-group/beagle/trunk/debian/changelog 2006-04-23 18:08:45 UTC (rev 2474)
+++ non-group/beagle/trunk/debian/changelog 2006-04-23 18:14:02 UTC (rev 2475)
@@ -15,9 +15,11 @@
* Compile using python2.4 (Closes: #363929)
* Move beagle-backend-evolution to Suggests in beagle package.
* debian/rules: set $sysconfdir to /etc (Closes: #363968)
- * debian/patches: update relibtoolize.dpatch.
+ * debian/patches:
+ + python2.4: new. Needed to compile python-beagle with python2.4
+ + update relibtoolize.dpatch.
- -- Jose Carlos Garcia Sogo <jsogo at debian.org> Sat, 22 Apr 2006 17:49:52 +0200
+ -- Jose Carlos Garcia Sogo <jsogo at debian.org> Sun, 23 Apr 2006 20:10:57 +0200
beagle (0.2.4-1) unstable; urgency=low
Modified: non-group/beagle/trunk/debian/patches/00list
===================================================================
--- non-group/beagle/trunk/debian/patches/00list 2006-04-23 18:08:45 UTC (rev 2474)
+++ non-group/beagle/trunk/debian/patches/00list 2006-04-23 18:14:02 UTC (rev 2475)
@@ -1,4 +1,5 @@
beagle-settings.dpatch
beagle-status_watch.dpatch
usebash.dpatch
+use-python2.4.dpatch
relibtoolize.dpatch
Modified: non-group/beagle/trunk/debian/patches/relibtoolize.dpatch
===================================================================
--- non-group/beagle/trunk/debian/patches/relibtoolize.dpatch 2006-04-23 18:08:45 UTC (rev 2474)
+++ non-group/beagle/trunk/debian/patches/relibtoolize.dpatch 2006-04-23 18:14:02 UTC (rev 2475)
@@ -7,7 +7,7 @@
@DPATCH@
diff -urNad beagle-0.2.5~/aclocal.m4 beagle-0.2.5/aclocal.m4
--- beagle-0.2.5~/aclocal.m4 2006-04-20 17:57:12.000000000 +0200
-+++ beagle-0.2.5/aclocal.m4 2006-04-22 17:44:56.000000000 +0200
++++ beagle-0.2.5/aclocal.m4 2006-04-22 18:21:00.000000000 +0200
@@ -11,27 +11,429 @@
# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
# PARTICULAR PURPOSE.
@@ -1666,7 +1666,7 @@
;;
diff -urNad beagle-0.2.5~/configure beagle-0.2.5/configure
--- beagle-0.2.5~/configure 2006-04-20 17:57:29.000000000 +0200
-+++ beagle-0.2.5/configure 2006-04-22 17:46:22.000000000 +0200
++++ beagle-0.2.5/configure 2006-04-22 18:21:06.000000000 +0200
@@ -463,7 +463,7 @@
# include <unistd.h>
#endif"
@@ -2720,11 +2720,11 @@
-# Remove file type tags (using []) from po/POTFILES.
-
-
--
-
+-
-# Manually sed perl in so people don't have to put the intltool scripts in AC_OUTPUT.
-
ac_config_commands="$ac_config_commands intltool"
@@ -3166,7 +3166,96 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -26330,9 +26235,8 @@
+@@ -25793,12 +25698,67 @@
+
+
+
+- # Find any Python interpreter.
+- if test -z "$PYTHON"; then
+- for ac_prog in python python2 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 python1.6 python1.5
+-do
+- # Extract the first word of "$ac_prog", so it can be a program name with args.
+-set dummy $ac_prog; ac_word=$2
++ 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.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.4', '.')) + [0, 0, 0]
++minverhex = 0
++for i in xrange(0, 4): minverhex = (minverhex << 8) + minver[i]
++sys.exit(sys.hexversion < minverhex)"
++ if { echo "$as_me:$LINENO: $PYTHON -c "$prog"" >&5
++ ($PYTHON -c "$prog") >&5 2>&5
++ ac_status=$?
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); }; then
++ echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6
++else
++ { { echo "$as_me:$LINENO: error: too old" >&5
++echo "$as_me: error: too old" >&2;}
++ { (exit 1); exit 1; }; }
++fi
++
++ am_display_PYTHON=$PYTHON
++ else
++ # Otherwise, try each interpreter until we find one that satisfies
++ # VERSION.
++ 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
++
++ for am_cv_pathless_PYTHON in python python2 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 python1.6 python1.5 none; do
++ test "$am_cv_pathless_PYTHON" = none && break
++ 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.4', '.')) + [0, 0, 0]
++minverhex = 0
++for i in xrange(0, 4): minverhex = (minverhex << 8) + minver[i]
++sys.exit(sys.hexversion < minverhex)"
++ if { echo "$as_me:$LINENO: $am_cv_pathless_PYTHON -c "$prog"" >&5
++ ($am_cv_pathless_PYTHON -c "$prog") >&5 2>&5
++ ac_status=$?
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); }; then
++ break
++fi
++
++ done
++fi
++echo "$as_me:$LINENO: result: $am_cv_pathless_PYTHON" >&5
++echo "${ECHO_T}$am_cv_pathless_PYTHON" >&6
++ # Set $PYTHON to the absolute path of $am_cv_pathless_PYTHON.
++ if test "$am_cv_pathless_PYTHON" = none; then
++ PYTHON=:
++ else
++ # Extract the first word of "$am_cv_pathless_PYTHON", so it can be a program name with args.
++set dummy $am_cv_pathless_PYTHON; ac_word=$2
+ echo "$as_me:$LINENO: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_path_PYTHON+set}" = set; then
+@@ -25836,12 +25796,9 @@
+ echo "${ECHO_T}no" >&6
+ fi
+
+- test -n "$PYTHON" && break
+-done
+-test -n "$PYTHON" || PYTHON=":"
+-
++ fi
++ am_display_PYTHON=$am_cv_pathless_PYTHON
+ fi
+- am_display_PYTHON=python
+
+
+ if test "$PYTHON" = :; then
+@@ -26330,9 +26287,8 @@
{ (exit 1); exit 1; }; }
fi
@@ -3178,7 +3267,7 @@
if test -z "${HAS_LIBXSS_TRUE}" && test -z "${HAS_LIBXSS_FALSE}"; then
{ { echo "$as_me:$LINENO: error: conditional \"HAS_LIBXSS\" was never defined.
-@@ -26887,10 +26791,11 @@
+@@ -26887,10 +26843,11 @@
#
AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"
@@ -3194,7 +3283,7 @@
_ACEOF
-@@ -26931,6 +26836,7 @@
+@@ -26931,6 +26888,7 @@
"depfiles" ) CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
"intltool" ) CONFIG_COMMANDS="$CONFIG_COMMANDS intltool" ;;
"default-1" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;;
@@ -3202,7 +3291,7 @@
"config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
*) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
-@@ -27125,6 +27031,7 @@
+@@ -27125,6 +27083,7 @@
s, at INTLTOOL_CAVES_RULE@,$INTLTOOL_CAVES_RULE,;t t
s, at INTLTOOL_SCHEMAS_RULE@,$INTLTOOL_SCHEMAS_RULE,;t t
s, at INTLTOOL_THEME_RULE@,$INTLTOOL_THEME_RULE,;t t
@@ -3210,7 +3299,7 @@
s, at INTLTOOL_EXTRACT@,$INTLTOOL_EXTRACT,;t t
s, at INTLTOOL_MERGE@,$INTLTOOL_MERGE,;t t
s, at INTLTOOL_UPDATE@,$INTLTOOL_UPDATE,;t t
-@@ -27148,6 +27055,7 @@
+@@ -27148,6 +27107,7 @@
s, at PO_IN_DATADIR_FALSE@,$PO_IN_DATADIR_FALSE,;t t
s, at POFILES@,$POFILES,;t t
s, at POSUB@,$POSUB,;t t
@@ -3218,7 +3307,7 @@
s, at SQLITE_CFLAGS@,$SQLITE_CFLAGS,;t t
s, at SQLITE_LIBS@,$SQLITE_LIBS,;t t
s, at SQLITE3_CFLAGS@,$SQLITE3_CFLAGS,;t t
-@@ -27420,11 +27328,6 @@
+@@ -27420,11 +27380,6 @@
*) ac_INSTALL=$ac_top_builddir$INSTALL ;;
esac
@@ -3230,7 +3319,7 @@
# Let's still pretend it is `configure' which instantiates (i.e., don't
# use $as_me), people would be surprised to read:
# /* config.h. Generated by config.status. */
-@@ -27463,6 +27366,12 @@
+@@ -27463,6 +27418,12 @@
fi;;
esac
done` || { (exit 1); exit 1; }
@@ -3243,7 +3332,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
sed "$ac_vpsub
-@@ -27938,47 +27847,51 @@
+@@ -27938,47 +27899,51 @@
;;
intltool )
Added: non-group/beagle/trunk/debian/patches/use-python2.4.dpatch
===================================================================
--- non-group/beagle/trunk/debian/patches/use-python2.4.dpatch 2006-04-23 18:08:45 UTC (rev 2474)
+++ non-group/beagle/trunk/debian/patches/use-python2.4.dpatch 2006-04-23 18:14:02 UTC (rev 2475)
@@ -0,0 +1,28 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## use-python2.4.dpatch by Jose Carlos Garcia Sogo <jsogo at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad beagle-0.2.5~/configure.in beagle-0.2.5/configure.in
+--- beagle-0.2.5~/configure.in 2006-04-20 17:56:44.000000000 +0200
++++ beagle-0.2.5/configure.in 2006-04-22 18:13:53.000000000 +0200
+@@ -551,7 +551,7 @@
+
+ dnl ----------------------------------------------
+
+-dnl Python 2.3
++dnl Python 2.4
+
+ AC_ARG_ENABLE(python,
+ AC_HELP_STRING([--disable-python], [Disable python support (default auto)]),
+@@ -565,7 +565,7 @@
+ have_pygtk_deps=no
+ have_pygtk_codegen=no
+
+- AM_PATH_PYTHON()
++ AM_PATH_PYTHON(2.4,,)
+
+ if test -z "$PYTHON"; then
+ AC_MSG_WARN([Python not found])
Property changes on: non-group/beagle/trunk/debian/patches/use-python2.4.dpatch
___________________________________________________________________
Name: svn:executable
+ *
Modified: non-group/beagle/trunk/debian/rules
===================================================================
--- non-group/beagle/trunk/debian/rules 2006-04-23 18:08:45 UTC (rev 2474)
+++ non-group/beagle/trunk/debian/rules 2006-04-23 18:14:02 UTC (rev 2475)
@@ -25,20 +25,6 @@
configure-stamp: patch
dh_testdir
- ( if [ -f config.sub.old ]; then \
- rm -f config.sub ; \
- else \
- mv config.sub config.sub.old ; \
- fi ; \
- if [ -f config.guess.old ]; then \
- rm -f config.guess ; \
- else \
- mv config.guess config.guess.old ; \
- fi )
-
- ln -sf /usr/share/misc/config.sub .
- ln -sf /usr/share/misc/config.guess .
-
CFLAGS="$(CFLAGS)" ./configure --host=$(DEB_HOST_GNU_TYPE) \
--build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man \
--sysconfdir=/etc --localstatedir=/var \
@@ -60,15 +46,7 @@
-$(MAKE) distclean
- ( if [ -f config.sub.old ]; then \
- mv config.sub.old config.sub; \
- fi; \
- if [ -f config.guess.old ]; then \
- mv config.guess.old config.guess; \
- fi; )
-
rm -rf $(MONO_SHARED_DIR)/.wapi
- rm -rf $(CURDIR)/beagle/etc/xdg
rm -rf debian/patched
More information about the Pkg-mono-svn-commits
mailing list