r37716 - in /attic/gnome-vfs/debian: changelog control control.in patches/40_disable_deprecated.patch patches/90_relibtoolize.patch patches/99_ltmain_as-needed.patch patches/series rules
pochu at users.alioth.debian.org
pochu at users.alioth.debian.org
Sat May 11 17:43:42 UTC 2013
Author: pochu
Date: Sat May 11 17:43:41 2013
New Revision: 37716
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=37716
Log:
* debian/patches/40_disable_deprecated.patch:
+ New patch, don't define G_DISABLE_DEPRECATED. Fixes FTBFS.
Closes: #707381.
* debian/control.in,
debian/rules:
+ Run dh_autoreconf.
* debian/patches/90_relibtoolize.patch
debian/patches/99_ltmain_as-needed.patch:
+ Removed, no longer needed.
Added:
attic/gnome-vfs/debian/patches/40_disable_deprecated.patch
Removed:
attic/gnome-vfs/debian/patches/90_relibtoolize.patch
attic/gnome-vfs/debian/patches/99_ltmain_as-needed.patch
Modified:
attic/gnome-vfs/debian/changelog
attic/gnome-vfs/debian/control
attic/gnome-vfs/debian/control.in
attic/gnome-vfs/debian/patches/series
attic/gnome-vfs/debian/rules
Modified: attic/gnome-vfs/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/attic/gnome-vfs/debian/changelog?rev=37716&op=diff
==============================================================================
--- attic/gnome-vfs/debian/changelog [utf-8] (original)
+++ attic/gnome-vfs/debian/changelog [utf-8] Sat May 11 17:43:41 2013
@@ -1,3 +1,17 @@
+gnome-vfs (1:2.24.4-3) UNRELEASED; urgency=low
+
+ * debian/patches/40_disable_deprecated.patch:
+ + New patch, don't define G_DISABLE_DEPRECATED. Fixes FTBFS.
+ Closes: #707381.
+ * debian/control.in,
+ debian/rules:
+ + Run dh_autoreconf.
+ * debian/patches/90_relibtoolize.patch
+ debian/patches/99_ltmain_as-needed.patch:
+ + Removed, no longer needed.
+
+ -- Emilio Pozuelo Monfort <pochu at debian.org> Sat, 11 May 2013 19:41:34 +0200
+
gnome-vfs (1:2.24.4-2) unstable; urgency=low
[ Josselin Mouette ]
Modified: attic/gnome-vfs/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/attic/gnome-vfs/debian/control?rev=37716&op=diff
==============================================================================
--- attic/gnome-vfs/debian/control [utf-8] (original)
+++ attic/gnome-vfs/debian/control [utf-8] Sat May 11 17:43:41 2013
@@ -9,6 +9,7 @@
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>, Michael Biebl <biebl at debian.org>, Otavio Salvador <otavio at debian.org>, Sebastian Dröge <slomo at debian.org>
Build-Depends: cdbs,
+ dh-autoreconf,
gtk-doc-tools (>= 1.0),
libglib2.0-dev (>= 2.9.3),
libgconf2-dev (>= 2.8.0),
Modified: attic/gnome-vfs/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/attic/gnome-vfs/debian/control.in?rev=37716&op=diff
==============================================================================
--- attic/gnome-vfs/debian/control.in [utf-8] (original)
+++ attic/gnome-vfs/debian/control.in [utf-8] Sat May 11 17:43:41 2013
@@ -4,6 +4,7 @@
Maintainer: Josselin Mouette <joss at debian.org>
Uploaders: @GNOME_TEAM@
Build-Depends: cdbs,
+ dh-autoreconf,
gtk-doc-tools (>= 1.0),
libglib2.0-dev (>= 2.9.3),
libgconf2-dev (>= 2.8.0),
Added: attic/gnome-vfs/debian/patches/40_disable_deprecated.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/attic/gnome-vfs/debian/patches/40_disable_deprecated.patch?rev=37716&op=file
==============================================================================
--- attic/gnome-vfs/debian/patches/40_disable_deprecated.patch (added)
+++ attic/gnome-vfs/debian/patches/40_disable_deprecated.patch [utf-8] Sat May 11 17:43:41 2013
@@ -1,0 +1,52 @@
+--- a/daemon/Makefile.am
++++ b/daemon/Makefile.am
+@@ -8,7 +8,6 @@
+ -D_LARGEFILE64_SOURCE \
+ -D_POSIX_PTHREAD_SEMANTICS \
+ -D_REENTRANT \
+- -DG_DISABLE_DEPRECATED \
+ -DGNOME_VFS_PREFIX=\"$(prefix)\" \
+ -DGNOME_VFS_DATADIR=\"$(datadir)\" \
+ -DGNOME_VFS_LIBDIR=\"$(libdir)\" \
+--- a/libgnomevfs/Makefile.am
++++ b/libgnomevfs/Makefile.am
+@@ -19,7 +19,6 @@
+ -D_LARGEFILE64_SOURCE \
+ -D_POSIX_PTHREAD_SEMANTICS \
+ -D_REENTRANT \
+- -DG_DISABLE_DEPRECATED \
+ -DGNOME_VFS_PREFIX=\"$(prefix)\" \
+ -DGNOME_VFS_BINDIR=\"$(bindir)\" \
+ -DGNOME_VFS_DATADIR=\"$(datadir)\" \
+--- a/modules/Makefile.am
++++ b/modules/Makefile.am
+@@ -18,7 +18,6 @@
+ -D_POSIX_PTHREAD_SEMANTICS \
+ -D_REENTRANT \
+ -DSSH_PROGRAM=\"$(SSH_PROGRAM)\" \
+- -DG_DISABLE_DEPRECATED \
+ -DGNOME_VFS_PREFIX=\"$(prefix)\" \
+ -DGNOME_VFS_DATADIR=\"$(datadir)\" \
+ -DGNOME_VFS_LIBDIR=\"$(libdir)\" \
+--- a/programs/Makefile.am
++++ b/programs/Makefile.am
+@@ -4,8 +4,7 @@
+ -I$(top_srcdir) \
+ -I$(top_builddir) \
+ $(PROGRAMS_CFLAGS) \
+- $(VFS_CFLAGS) \
+- -DG_DISABLE_DEPRECATED
++ $(VFS_CFLAGS)
+
+ libraries = \
+ $(top_builddir)/libgnomevfs/libgnomevfs-2.la \
+--- a/test/Makefile.am
++++ b/test/Makefile.am
+@@ -6,7 +6,6 @@
+ -I$(top_builddir)/libgnomevfs \
+ $(TEST_CFLAGS) \
+ $(VFS_CFLAGS) \
+- -DG_DISABLE_DEPRECATED \
+ -DMODULES_PATH=\"$(libdir)/vfs/modules\"
+
+ if OS_WIN32
Modified: attic/gnome-vfs/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/attic/gnome-vfs/debian/patches/series?rev=37716&op=diff
==============================================================================
--- attic/gnome-vfs/debian/patches/series [utf-8] (original)
+++ attic/gnome-vfs/debian/patches/series [utf-8] Sat May 11 17:43:41 2013
@@ -21,5 +21,4 @@
24_home_dir_fakeroot.patch
30_nfs4.patch
31_link_tests_and_programs_against_required_libs.patch
-90_relibtoolize.patch
-99_ltmain_as-needed.patch
+40_disable_deprecated.patch
Modified: attic/gnome-vfs/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/attic/gnome-vfs/debian/rules?rev=37716&op=diff
==============================================================================
--- attic/gnome-vfs/debian/rules [utf-8] (original)
+++ attic/gnome-vfs/debian/rules [utf-8] Sat May 11 17:43:41 2013
@@ -1,5 +1,6 @@
#!/usr/bin/make -f
+include /usr/share/cdbs/1/rules/autoreconf.mk
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/class/gnome.mk
include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk
@@ -7,7 +8,7 @@
include /usr/share/gnome-pkg-tools/1/rules/clean-la.mk
-include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
-GNOME_MODULE := gnome-vfs
+DEB_DH_AUTORECONF_ARGS = --as-needed
ifeq ($(DEB_HOST_ARCH),hurd-i386)
HOST_ARCH_CONFIGURE_FLAGS=--disable-ipv6
More information about the pkg-gnome-commits
mailing list