r22601 - in /desktop/unstable/nautilus/debian: changelog control patches/90_relibtoolize.patch
ah at users.alioth.debian.org
ah at users.alioth.debian.org
Tue Dec 15 13:45:01 UTC 2009
Author: ah
Date: Tue Dec 15 13:45:01 2009
New Revision: 22601
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=22601
Log:
New upstream release.
Modified:
desktop/unstable/nautilus/debian/changelog
desktop/unstable/nautilus/debian/control
desktop/unstable/nautilus/debian/patches/90_relibtoolize.patch
Modified: desktop/unstable/nautilus/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/nautilus/debian/changelog?rev=22601&op=diff
==============================================================================
--- desktop/unstable/nautilus/debian/changelog [utf-8] (original)
+++ desktop/unstable/nautilus/debian/changelog [utf-8] Tue Dec 15 13:45:01 2009
@@ -1,3 +1,10 @@
+nautilus (2.28.4-1) unstable; urgency=low
+
+ * New upstream bugfix release.
+ * Regenerate relibtoolize patch to apply.
+
+ -- Andreas Henriksson <andreas at fatal.se> Tue, 15 Dec 2009 14:28:56 +0100
+
nautilus (2.28.3-1) unstable; urgency=low
[ Josselin Mouette ]
Modified: desktop/unstable/nautilus/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/nautilus/debian/control?rev=22601&op=diff
==============================================================================
--- desktop/unstable/nautilus/debian/control [utf-8] (original)
+++ desktop/unstable/nautilus/debian/control [utf-8] Tue Dec 15 13:45:01 2009
@@ -7,7 +7,7 @@
Section: gnome
Priority: optional
Maintainer: Josselin Mouette <joss at debian.org>
-Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Emilio Pozuelo Monfort <pochu at debian.org>
+Uploaders: Andreas Henriksson <andreas at fatal.se>, Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Emilio Pozuelo Monfort <pochu at debian.org>
Build-Depends: debhelper (>= 5),
cdbs (>= 0.4.41),
quilt,
Modified: desktop/unstable/nautilus/debian/patches/90_relibtoolize.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/nautilus/debian/patches/90_relibtoolize.patch?rev=22601&op=diff
==============================================================================
--- desktop/unstable/nautilus/debian/patches/90_relibtoolize.patch [utf-8] (original)
+++ desktop/unstable/nautilus/debian/patches/90_relibtoolize.patch [utf-8] Tue Dec 15 13:45:01 2009
@@ -6,8 +6,10 @@
autoconf
rm -rf autom4te.cache config.h.in~
---- a/aclocal.m4
-+++ b/aclocal.m4
+Index: quilt-bEU2iR/aclocal.m4
+===================================================================
+--- quilt-bEU2iR.orig/aclocal.m4 2009-12-15 10:12:53.000000000 +0100
++++ quilt-bEU2iR/aclocal.m4 2009-12-15 14:38:29.000000000 +0100
@@ -13,1664 +13,1666 @@
m4_ifndef([AC_AUTOCONF_VERSION],
@@ -3158,8 +3160,10 @@
m4_include([m4/gtk-doc.m4])
m4_include([m4/intltool.m4])
---- a/config.guess
-+++ b/config.guess
+Index: quilt-bEU2iR/config.guess
+===================================================================
+--- quilt-bEU2iR.orig/config.guess 2009-12-15 10:12:56.000000000 +0100
++++ quilt-bEU2iR/config.guess 2009-12-15 14:38:32.000000000 +0100
@@ -1,10 +1,10 @@
#! /bin/sh
# Attempt to guess a canonical system name.
@@ -3289,8 +3293,10 @@
echo powerpc-unknown-lynxos${UNAME_RELEASE}
exit ;;
SM[BE]S:UNIX_SV:*:*)
---- a/config.h.in
-+++ b/config.h.in
+Index: quilt-bEU2iR/config.h.in
+===================================================================
+--- quilt-bEU2iR.orig/config.h.in 2009-12-15 10:12:56.000000000 +0100
++++ quilt-bEU2iR/config.h.in 2009-12-15 14:38:10.000000000 +0100
@@ -160,6 +160,9 @@
/* Define to the one symbol short name of this package. */
#undef PACKAGE_TARNAME
@@ -3301,13 +3307,15 @@
/* Define to the version of this package. */
#undef PACKAGE_VERSION
---- a/configure
-+++ b/configure
+Index: quilt-bEU2iR/configure
+===================================================================
+--- quilt-bEU2iR.orig/configure 2009-12-15 10:12:55.000000000 +0100
++++ quilt-bEU2iR/configure 2009-12-15 14:38:40.000000000 +0100
@@ -1,20 +1,24 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
--# Generated by GNU Autoconf 2.63 for nautilus 2.28.3.
-+# Generated by GNU Autoconf 2.65 for nautilus 2.28.3.
+-# Generated by GNU Autoconf 2.63 for nautilus 2.28.4.
++# Generated by GNU Autoconf 2.65 for nautilus 2.28.4.
#
# Report bugs to <http://bugzilla.gnome.org/enter_bug.cgi?product=nautilus>.
#
@@ -4113,8 +4121,8 @@
# Identity of this package.
PACKAGE_NAME='nautilus'
@@ -748,6 +705,7 @@
- PACKAGE_VERSION='2.28.3'
- PACKAGE_STRING='nautilus 2.28.3'
+ PACKAGE_VERSION='2.28.4'
+ PACKAGE_STRING='nautilus 2.28.4'
PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=nautilus'
+PACKAGE_URL=''
@@ -4286,7 +4294,7 @@
@@ -1846,21 +1794,378 @@
if $ac_init_version; then
cat <<\_ACEOF
- nautilus configure 2.28.3
+ nautilus configure 2.28.4
-generated by GNU Autoconf 2.63
+generated by GNU Autoconf 2.65
@@ -4660,7 +4668,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
- It was created by nautilus $as_me 2.28.3, which was
+ It was created by nautilus $as_me 2.28.4, which was
-generated by GNU Autoconf 2.63. Invocation command line was
+generated by GNU Autoconf 2.65. Invocation command line was
@@ -19043,7 +19051,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
- This file was extended by nautilus $as_me 2.28.3, which was
+ This file was extended by nautilus $as_me 2.28.4, which was
-generated by GNU Autoconf 2.63. Invocation command line was
+generated by GNU Autoconf 2.65. Invocation command line was
@@ -19079,7 +19087,7 @@
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
- nautilus config.status 2.28.3
+ nautilus config.status 2.28.4
-configured by $0, generated by GNU Autoconf 2.63,
- with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
+configured by $0, generated by GNU Autoconf 2.65,
@@ -19555,8 +19563,10 @@
$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
fi
---- a/cut-n-paste-code/libegg/Makefile.in
-+++ b/cut-n-paste-code/libegg/Makefile.in
+Index: quilt-bEU2iR/cut-n-paste-code/libegg/Makefile.in
+===================================================================
+--- quilt-bEU2iR.orig/cut-n-paste-code/libegg/Makefile.in 2009-12-15 10:12:57.000000000 +0100
++++ quilt-bEU2iR/cut-n-paste-code/libegg/Makefile.in 2009-12-15 14:38:32.000000000 +0100
@@ -188,6 +188,7 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
@@ -19565,8 +19575,10 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PANGO_REQUIRED = @PANGO_REQUIRED@
PATH_SEPARATOR = @PATH_SEPARATOR@
---- a/cut-n-paste-code/Makefile.in
-+++ b/cut-n-paste-code/Makefile.in
+Index: quilt-bEU2iR/cut-n-paste-code/Makefile.in
+===================================================================
+--- quilt-bEU2iR.orig/cut-n-paste-code/Makefile.in 2009-12-15 10:12:57.000000000 +0100
++++ quilt-bEU2iR/cut-n-paste-code/Makefile.in 2009-12-15 14:38:32.000000000 +0100
@@ -199,6 +199,7 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
@@ -19575,8 +19587,10 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PANGO_REQUIRED = @PANGO_REQUIRED@
PATH_SEPARATOR = @PATH_SEPARATOR@
---- a/data/icons/Makefile.in
-+++ b/data/icons/Makefile.in
+Index: quilt-bEU2iR/data/icons/Makefile.in
+===================================================================
+--- quilt-bEU2iR.orig/data/icons/Makefile.in 2009-12-15 10:12:57.000000000 +0100
++++ quilt-bEU2iR/data/icons/Makefile.in 2009-12-15 14:38:33.000000000 +0100
@@ -161,6 +161,7 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
@@ -19585,8 +19599,10 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PANGO_REQUIRED = @PANGO_REQUIRED@
PATH_SEPARATOR = @PATH_SEPARATOR@
---- a/data/Makefile.in
-+++ b/data/Makefile.in
+Index: quilt-bEU2iR/data/Makefile.in
+===================================================================
+--- quilt-bEU2iR.orig/data/Makefile.in 2009-12-15 10:12:57.000000000 +0100
++++ quilt-bEU2iR/data/Makefile.in 2009-12-15 14:38:32.000000000 +0100
@@ -235,6 +235,7 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
@@ -19595,8 +19611,10 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PANGO_REQUIRED = @PANGO_REQUIRED@
PATH_SEPARATOR = @PATH_SEPARATOR@
---- a/data/patterns/Makefile.in
-+++ b/data/patterns/Makefile.in
+Index: quilt-bEU2iR/data/patterns/Makefile.in
+===================================================================
+--- quilt-bEU2iR.orig/data/patterns/Makefile.in 2009-12-15 10:12:57.000000000 +0100
++++ quilt-bEU2iR/data/patterns/Makefile.in 2009-12-15 14:38:33.000000000 +0100
@@ -183,6 +183,7 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
@@ -19605,8 +19623,10 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PANGO_REQUIRED = @PANGO_REQUIRED@
PATH_SEPARATOR = @PATH_SEPARATOR@
---- a/docs/Makefile.in
-+++ b/docs/Makefile.in
+Index: quilt-bEU2iR/docs/Makefile.in
+===================================================================
+--- quilt-bEU2iR.orig/docs/Makefile.in 2009-12-15 10:12:57.000000000 +0100
++++ quilt-bEU2iR/docs/Makefile.in 2009-12-15 14:38:33.000000000 +0100
@@ -224,6 +224,7 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
@@ -19615,8 +19635,10 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PANGO_REQUIRED = @PANGO_REQUIRED@
PATH_SEPARATOR = @PATH_SEPARATOR@
---- a/docs/reference/libnautilus-extension/Makefile.in
-+++ b/docs/reference/libnautilus-extension/Makefile.in
+Index: quilt-bEU2iR/docs/reference/libnautilus-extension/Makefile.in
+===================================================================
+--- quilt-bEU2iR.orig/docs/reference/libnautilus-extension/Makefile.in 2009-12-15 10:12:57.000000000 +0100
++++ quilt-bEU2iR/docs/reference/libnautilus-extension/Makefile.in 2009-12-15 14:38:33.000000000 +0100
@@ -166,6 +166,7 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
@@ -19822,8 +19844,10 @@
.PHONY : dist-hook-local docs
---- a/docs/reference/Makefile.in
-+++ b/docs/reference/Makefile.in
+Index: quilt-bEU2iR/docs/reference/Makefile.in
+===================================================================
+--- quilt-bEU2iR.orig/docs/reference/Makefile.in 2009-12-15 10:12:57.000000000 +0100
++++ quilt-bEU2iR/docs/reference/Makefile.in 2009-12-15 14:38:33.000000000 +0100
@@ -199,6 +199,7 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
@@ -19832,8 +19856,10 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PANGO_REQUIRED = @PANGO_REQUIRED@
PATH_SEPARATOR = @PATH_SEPARATOR@
---- a/eel/Makefile.in
-+++ b/eel/Makefile.in
+Index: quilt-bEU2iR/eel/Makefile.in
+===================================================================
+--- quilt-bEU2iR.orig/eel/Makefile.in 2009-12-15 10:12:58.000000000 +0100
++++ quilt-bEU2iR/eel/Makefile.in 2009-12-15 14:38:33.000000000 +0100
@@ -52,7 +52,9 @@
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
@@ -19863,8 +19889,10 @@
$(CORE_LIBS) \
$(RENDER_LIBS) \
$(X_LIBS) \
---- a/icons/Makefile.in
-+++ b/icons/Makefile.in
+Index: quilt-bEU2iR/icons/Makefile.in
+===================================================================
+--- quilt-bEU2iR.orig/icons/Makefile.in 2009-12-15 10:12:58.000000000 +0100
++++ quilt-bEU2iR/icons/Makefile.in 2009-12-15 14:38:33.000000000 +0100
@@ -183,6 +183,7 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
@@ -19873,8 +19901,10 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PANGO_REQUIRED = @PANGO_REQUIRED@
PATH_SEPARATOR = @PATH_SEPARATOR@
---- a/INSTALL
-+++ b/INSTALL
+Index: quilt-bEU2iR/INSTALL
+===================================================================
+--- quilt-bEU2iR.orig/INSTALL 2009-05-23 20:14:13.000000000 +0200
++++ quilt-bEU2iR/INSTALL 2009-12-15 14:38:34.000000000 +0100
@@ -2,15 +2,15 @@
*************************
@@ -20074,8 +20104,10 @@
`configure' also accepts some other, not widely useful, options. Run
`configure --help' for more details.
---- a/libnautilus-extension/Makefile.in
-+++ b/libnautilus-extension/Makefile.in
+Index: quilt-bEU2iR/libnautilus-extension/Makefile.in
+===================================================================
+--- quilt-bEU2iR.orig/libnautilus-extension/Makefile.in 2009-12-15 10:12:58.000000000 +0100
++++ quilt-bEU2iR/libnautilus-extension/Makefile.in 2009-12-15 14:38:33.000000000 +0100
@@ -222,6 +222,7 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
@@ -20084,8 +20116,10 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PANGO_REQUIRED = @PANGO_REQUIRED@
PATH_SEPARATOR = @PATH_SEPARATOR@
---- a/libnautilus-private/Makefile.in
-+++ b/libnautilus-private/Makefile.in
+Index: quilt-bEU2iR/libnautilus-private/Makefile.in
+===================================================================
+--- quilt-bEU2iR.orig/libnautilus-private/Makefile.in 2009-12-15 10:12:58.000000000 +0100
++++ quilt-bEU2iR/libnautilus-private/Makefile.in 2009-12-15 14:38:34.000000000 +0100
@@ -341,6 +341,7 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
@@ -20094,8 +20128,10 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PANGO_REQUIRED = @PANGO_REQUIRED@
PATH_SEPARATOR = @PATH_SEPARATOR@
---- a/ltmain.sh
-+++ b/ltmain.sh
+Index: quilt-bEU2iR/ltmain.sh
+===================================================================
+--- quilt-bEU2iR.orig/ltmain.sh 2009-12-15 10:12:49.000000000 +0100
++++ quilt-bEU2iR/ltmain.sh 2009-12-15 14:38:18.000000000 +0100
@@ -1,6 +1,6 @@
# Generated from ltmain.m4sh.
@@ -20185,8 +20221,10 @@
esac
;;
no)
---- a/Makefile.in
-+++ b/Makefile.in
+Index: quilt-bEU2iR/Makefile.in
+===================================================================
+--- quilt-bEU2iR.orig/Makefile.in 2009-12-15 10:12:59.000000000 +0100
++++ quilt-bEU2iR/Makefile.in 2009-12-15 14:38:34.000000000 +0100
@@ -216,6 +216,7 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
@@ -20195,8 +20233,10 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PANGO_REQUIRED = @PANGO_REQUIRED@
PATH_SEPARATOR = @PATH_SEPARATOR@
---- a/src/file-manager/Makefile.in
-+++ b/src/file-manager/Makefile.in
+Index: quilt-bEU2iR/src/file-manager/Makefile.in
+===================================================================
+--- quilt-bEU2iR.orig/src/file-manager/Makefile.in 2009-12-15 10:12:59.000000000 +0100
++++ quilt-bEU2iR/src/file-manager/Makefile.in 2009-12-15 14:38:34.000000000 +0100
@@ -223,6 +223,7 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
@@ -20205,8 +20245,10 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PANGO_REQUIRED = @PANGO_REQUIRED@
PATH_SEPARATOR = @PATH_SEPARATOR@
---- a/src/Makefile.in
-+++ b/src/Makefile.in
+Index: quilt-bEU2iR/src/Makefile.in
+===================================================================
+--- quilt-bEU2iR.orig/src/Makefile.in 2009-12-15 10:12:58.000000000 +0100
++++ quilt-bEU2iR/src/Makefile.in 2009-12-15 14:38:34.000000000 +0100
@@ -342,6 +342,7 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
@@ -20215,8 +20257,10 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PANGO_REQUIRED = @PANGO_REQUIRED@
PATH_SEPARATOR = @PATH_SEPARATOR@
---- a/test/Makefile.in
-+++ b/test/Makefile.in
+Index: quilt-bEU2iR/test/Makefile.in
+===================================================================
+--- quilt-bEU2iR.orig/test/Makefile.in 2009-12-15 10:12:59.000000000 +0100
++++ quilt-bEU2iR/test/Makefile.in 2009-12-15 14:38:34.000000000 +0100
@@ -271,6 +271,7 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
@@ -20225,8 +20269,10 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PANGO_REQUIRED = @PANGO_REQUIRED@
PATH_SEPARATOR = @PATH_SEPARATOR@
---- a/gtk-doc.make
-+++ b/gtk-doc.make
+Index: quilt-bEU2iR/gtk-doc.make
+===================================================================
+--- quilt-bEU2iR.orig/gtk-doc.make 2009-12-15 10:12:49.000000000 +0100
++++ quilt-bEU2iR/gtk-doc.make 2009-12-15 14:38:16.000000000 +0100
@@ -5,13 +5,13 @@
####################################
@@ -20429,8 +20475,10 @@
+ gtkdoc-rebase --online --relative --html-dir=$(distdir)/html
.PHONY : dist-hook-local docs
---- a/config.sub
-+++ b/config.sub
+Index: quilt-bEU2iR/config.sub
+===================================================================
+--- quilt-bEU2iR.orig/config.sub 2009-12-15 10:12:56.000000000 +0100
++++ quilt-bEU2iR/config.sub 2009-12-15 14:38:32.000000000 +0100
@@ -1,10 +1,10 @@
#! /bin/sh
# Configuration validation subroutine script.
@@ -20483,8 +20531,10 @@
vendor=ibm
;;
-beos*)
---- a/m4/Makefile.in
-+++ b/m4/Makefile.in
+Index: quilt-bEU2iR/m4/Makefile.in
+===================================================================
+--- quilt-bEU2iR.orig/m4/Makefile.in 2009-12-15 10:12:58.000000000 +0100
++++ quilt-bEU2iR/m4/Makefile.in 2009-12-15 14:38:34.000000000 +0100
@@ -160,6 +160,7 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
@@ -20493,8 +20543,10 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PANGO_REQUIRED = @PANGO_REQUIRED@
PATH_SEPARATOR = @PATH_SEPARATOR@
---- a/m4/libtool.m4
-+++ b/m4/libtool.m4
+Index: quilt-bEU2iR/m4/libtool.m4
+===================================================================
+--- quilt-bEU2iR.orig/m4/libtool.m4 2009-12-15 10:12:49.000000000 +0100
++++ quilt-bEU2iR/m4/libtool.m4 2009-12-15 14:38:18.000000000 +0100
@@ -2445,7 +2445,7 @@
;;
@@ -20651,8 +20703,10 @@
case $cc_basename in
KCC*)
# Kuck and Associates, Inc. (KAI) C++ Compiler
---- a/m4/ltversion.m4
-+++ b/m4/ltversion.m4
+Index: quilt-bEU2iR/m4/ltversion.m4
+===================================================================
+--- quilt-bEU2iR.orig/m4/ltversion.m4 2009-12-15 10:12:49.000000000 +0100
++++ quilt-bEU2iR/m4/ltversion.m4 2009-12-15 14:38:18.000000000 +0100
@@ -9,15 +9,15 @@
# Generated from ltversion.in.
More information about the pkg-gnome-commits
mailing list