r26492 - in /desktop/unstable/pessulus/debian: changelog patches/01_scp-integration.patch patches/70_mandatory-autoconf.patch
dktrkranz at users.alioth.debian.org
dktrkranz at users.alioth.debian.org
Tue Feb 8 22:14:15 UTC 2011
Author: dktrkranz
Date: Tue Feb 8 22:14:08 2011
New Revision: 26492
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=26492
Log:
Refresh patches for new upstream release
Modified:
desktop/unstable/pessulus/debian/changelog
desktop/unstable/pessulus/debian/patches/01_scp-integration.patch
desktop/unstable/pessulus/debian/patches/70_mandatory-autoconf.patch
Modified: desktop/unstable/pessulus/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/pessulus/debian/changelog?rev=26492&op=diff
==============================================================================
--- desktop/unstable/pessulus/debian/changelog [utf-8] (original)
+++ desktop/unstable/pessulus/debian/changelog [utf-8] Tue Feb 8 22:14:08 2011
@@ -1,4 +1,4 @@
-pessulus (2.30.4-1) UNRELEASED; urgency=low
+pessulus (2.30.4-1) unstable; urgency=low
[ Sebastien Bacher ]
* debian/control.in: don't depend on python-glade2 since it uses gtkbuilder.
@@ -6,10 +6,13 @@
[ Luca Falavigna ]
* New upstream bugfix release.
+ * Refresh patches for new upstream release:
+ - debian/patches/01_scp-integration.patch
+ - debian/patches/70_mandatory-autoconf.patch
* debian/control.in:
- Build-depend on intltool (>= 0.40.0).
- -- Luca Falavigna <dktrkranz at debian.org> Tue, 08 Feb 2011 23:04:51 +0100
+ -- Luca Falavigna <dktrkranz at debian.org> Tue, 08 Feb 2011 23:13:41 +0100
pessulus (2.30.2-1) unstable; urgency=low
Modified: desktop/unstable/pessulus/debian/patches/01_scp-integration.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/pessulus/debian/patches/01_scp-integration.patch?rev=26492&op=diff
==============================================================================
--- desktop/unstable/pessulus/debian/patches/01_scp-integration.patch [utf-8] (original)
+++ desktop/unstable/pessulus/debian/patches/01_scp-integration.patch [utf-8] Tue Feb 8 22:14:08 2011
@@ -4,7 +4,7 @@
===================================================================
--- pessulus-2.30.2.orig/Pessulus/Makefile.in 2010-06-22 20:10:09.391412340 +0200
+++ pessulus-2.30.2/Pessulus/Makefile.in 2010-06-22 20:09:53.287410877 +0200
-@@ -207,6 +207,7 @@
+@@ -209,6 +209,7 @@
icons.py \
globalvar.py \
lockdownappliergconf.py \
Modified: desktop/unstable/pessulus/debian/patches/70_mandatory-autoconf.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/pessulus/debian/patches/70_mandatory-autoconf.patch?rev=26492&op=diff
==============================================================================
--- desktop/unstable/pessulus/debian/patches/70_mandatory-autoconf.patch [utf-8] (original)
+++ desktop/unstable/pessulus/debian/patches/70_mandatory-autoconf.patch [utf-8] Tue Feb 8 22:14:08 2011
@@ -1,34 +1,42 @@
Generated with autoconf && rm -rf autom4te.cache
-Index: pessulus-2.30.2/configure
+Index: pessulus-2.30.4/configure
===================================================================
---- pessulus-2.30.2.orig/configure 2010-06-22 20:11:15.907408125 +0200
-+++ pessulus-2.30.2/configure 2010-06-22 20:11:12.115408462 +0200
-@@ -671,9 +671,6 @@
+--- pessulus-2.30.4.orig/configure 2011-02-08 23:12:45.745877213 +0100
++++ pessulus-2.30.4/configure 2011-02-08 23:12:43.154673769 +0100
+@@ -671,11 +671,6 @@
CFLAGS
CC
GETTEXT_PACKAGE
-PESSULUS_LIBS
-PESSULUS_CFLAGS
+-PKG_CONFIG_LIBDIR
+-PKG_CONFIG_PATH
-PKG_CONFIG
ACLOCAL_AMFLAGS
MAINT
MAINTAINER_MODE_FALSE
-@@ -753,9 +750,6 @@
+@@ -755,11 +750,6 @@
ac_precious_vars='build_alias
host_alias
target_alias
-PKG_CONFIG
+-PKG_CONFIG_PATH
+-PKG_CONFIG_LIBDIR
-PESSULUS_CFLAGS
-PESSULUS_LIBS
CC
CFLAGS
LDFLAGS
-@@ -1392,11 +1386,6 @@
+@@ -1397,15 +1387,6 @@
The GConf source of the mandatory values
Some influential environment variables:
- PKG_CONFIG path to pkg-config utility
+- PKG_CONFIG_PATH
+- directories to add to pkg-config's search path
+- PKG_CONFIG_LIBDIR
+- path overriding pkg-config's built-in search path
- PESSULUS_CFLAGS
- C compiler flags for PESSULUS, overriding pkg-config
- PESSULUS_LIBS
@@ -36,10 +44,82 @@
CC C compiler command
CFLAGS C compiler flags
LDFLAGS linker flags, e.g. -L<lib dir> if you have libraries in a
-@@ -2733,209 +2722,6 @@
+@@ -1684,7 +1665,7 @@
+ $as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
+ ( $as_echo "## ----------------------------------------------------------------------- ##
+ ## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=pessulus ##
+-## ----------------------------------------------------------------------- ##"[]
++## ----------------------------------------------------------------------- ##"
+ ) | sed "s/^/$as_me: WARNING: /" >&2
+ ;;
+ esac
+@@ -1963,7 +1944,7 @@
+
+ $as_echo "## ---------------- ##
+ ## Cache variables. ##
+-## ---------------- ##"[]
++## ---------------- ##"
+ echo
+ # The following way of writing the cache mishandles newlines in values,
+ (
+@@ -1999,7 +1980,7 @@
+
+ $as_echo "## ----------------- ##
+ ## Output variables. ##
+-## ----------------- ##"[]
++## ----------------- ##"
+ echo
+ for ac_var in $ac_subst_vars
+ do
+@@ -2014,7 +1995,7 @@
+ if test -n "$ac_subst_files"; then
+ $as_echo "## ------------------- ##
+ ## File substitutions. ##
+-## ------------------- ##"[]
++## ------------------- ##"
+ echo
+ for ac_var in $ac_subst_files
+ do
+@@ -2030,7 +2011,7 @@
+ if test -s confdefs.h; then
+ $as_echo "## ----------- ##
+ ## confdefs.h. ##
+-## ----------- ##"[]
++## ----------- ##"
+ echo
+ cat confdefs.h
+ echo
+@@ -2109,7 +2090,7 @@
+ || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+ as_fn_error $? "failed to load site script $ac_site_file
+-See \`config.log' for more details" "$LINENO" 5; }
++See \`config.log' for more details" "$LINENO" 5 ; }
+ fi
+ done
+
+@@ -2334,11 +2315,11 @@
+ '
+ case `pwd` in
+ *[\\\"\#\$\&\'\`$am_lf]*)
+- as_fn_error $? "unsafe absolute working directory name" "$LINENO" 5;;
++ as_fn_error $? "unsafe absolute working directory name" "$LINENO" 5 ;;
+ esac
+ case $srcdir in
+ *[\\\"\#\$\&\'\`$am_lf\ \ ]*)
+- as_fn_error $? "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;;
++ as_fn_error $? "unsafe srcdir value: \`$srcdir'" "$LINENO" 5 ;;
+ esac
+
+ # Do `set' in a subshell so we don't clobber the current shell's
+@@ -2747,215 +2728,6 @@
ACLOCAL_AMFLAGS="$ACLOCAL_FLAGS"
+-
+-
+-
+-
-
-
-if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
@@ -154,7 +234,6 @@
-$as_echo "no" >&6; }
- PKG_CONFIG=""
- fi
--
-fi
-
-pkg_failed=no
@@ -197,6 +276,8 @@
-
-
-if test $pkg_failed = yes; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
-
-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
- _pkg_short_errors_supported=yes
@@ -211,38 +292,129 @@
- # Put the nasty error message in config.log where it belongs
- echo "$PESSULUS_PKG_ERRORS" >&5
-
-- as_fn_error "Package requirements (pygtk-2.0 >= 2.13.0) were not met:
+- as_fn_error $? "Package requirements (pygtk-2.0 >= 2.13.0) were not met:
-
-$PESSULUS_PKG_ERRORS
-
-Consider adjusting the PKG_CONFIG_PATH environment variable if you
-installed software in a non-standard prefix.
+-
+-Alternatively, you may set the environment variables PESSULUS_CFLAGS
+-and PESSULUS_LIBS to avoid the need to call pkg-config.
+-See the pkg-config man page for more details." "$LINENO" 5
+-elif test $pkg_failed = untried; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it
+-is in your PATH or set the PKG_CONFIG environment variable to the full
+-path to pkg-config.
-
-Alternatively, you may set the environment variables PESSULUS_CFLAGS
-and PESSULUS_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.
--" "$LINENO" 5
--elif test $pkg_failed = untried; then
-- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
--$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
--as_fn_error "The pkg-config script could not be found or is too old. Make sure it
--is in your PATH or set the PKG_CONFIG environment variable to the full
--path to pkg-config.
--
--Alternatively, you may set the environment variables PESSULUS_CFLAGS
--and PESSULUS_LIBS to avoid the need to call pkg-config.
--See the pkg-config man page for more details.
-
-To get pkg-config, see <http://pkg-config.freedesktop.org/>.
--See \`config.log' for more details." "$LINENO" 5; }
+-See \`config.log' for more details" "$LINENO" 5; }
-else
- PESSULUS_CFLAGS=$pkg_cv_PESSULUS_CFLAGS
- PESSULUS_LIBS=$pkg_cv_PESSULUS_LIBS
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-- :
+-
-fi
-
GETTEXT_PACKAGE=pessulus
+@@ -3326,7 +3098,7 @@
+ test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+ as_fn_error $? "no acceptable C compiler found in \$PATH
+-See \`config.log' for more details" "$LINENO" 5; }
++See \`config.log' for more details" "$LINENO" 5 ; }
+
+ # Provide some information about the compiler.
+ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
+@@ -3441,7 +3213,7 @@
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+ as_fn_error 77 "C compiler cannot create executables
+-See \`config.log' for more details" "$LINENO" 5; }
++See \`config.log' for more details" "$LINENO" 5 ; }
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ $as_echo "yes" >&6; }
+@@ -3484,7 +3256,7 @@
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+ as_fn_error $? "cannot compute suffix of executables: cannot compile and link
+-See \`config.log' for more details" "$LINENO" 5; }
++See \`config.log' for more details" "$LINENO" 5 ; }
+ fi
+ rm -f conftest conftest$ac_cv_exeext
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
+@@ -3543,7 +3315,7 @@
+ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+ as_fn_error $? "cannot run C compiled programs.
+ If you meant to cross compile, use \`--host'.
+-See \`config.log' for more details" "$LINENO" 5; }
++See \`config.log' for more details" "$LINENO" 5 ; }
+ fi
+ fi
+ fi
+@@ -3595,7 +3367,7 @@
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+ as_fn_error $? "cannot compute suffix of object files: cannot compile
+-See \`config.log' for more details" "$LINENO" 5; }
++See \`config.log' for more details" "$LINENO" 5 ; }
+ fi
+ rm -f conftest.$ac_cv_objext conftest.$ac_ext
+ fi
+@@ -4071,7 +3843,7 @@
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+ as_fn_error $? "C preprocessor \"$CPP\" fails sanity check
+-See \`config.log' for more details" "$LINENO" 5; }
++See \`config.log' for more details" "$LINENO" 5 ; }
+ fi
+
+ ac_ext=c
+@@ -6590,7 +6362,7 @@
+ "data/pessulus.desktop.in") CONFIG_FILES="$CONFIG_FILES data/pessulus.desktop.in" ;;
+ "po/stamp-it") CONFIG_COMMANDS="$CONFIG_COMMANDS po/stamp-it" ;;
+
+- *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
++ *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5 ;;
+ esac
+ done
+
+@@ -6797,7 +6569,7 @@
+ esac
+ case $ac_mode$ac_tag in
+ :[FHL]*:*);;
+- :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;;
++ :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5 ;;
+ :[FH]-) ac_tag=-:-;;
+ :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
+ esac
+@@ -6825,7 +6597,7 @@
+ [\\/$]*) false;;
+ *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
+ esac ||
+- as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;;
++ as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5 ;;
+ esac
+ case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
+ as_fn_append ac_file_inputs " '$ac_f'"
+@@ -6852,7 +6624,7 @@
+
+ case $ac_tag in
+ *:-:* | *:-) cat >"$tmp/stdin" \
+- || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;;
++ || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;;
+ esac
+ ;;
+ esac
More information about the pkg-gnome-commits
mailing list