[Pkg-gtkpod-devel] r281 - in libgpod/trunk/debian: . patches

djpig at alioth.debian.org djpig at alioth.debian.org
Mon Nov 26 21:58:06 UTC 2007 

Author: djpig
Date: 2007-11-26 21:58:06 +0000 (Mon, 26 Nov 2007)
New Revision: 281

Added:
   libgpod/trunk/debian/patches/10_allow-autoreconf.dpatch
   libgpod/trunk/debian/patches/20_no-superfluous-ffi-dep.dpatch
Modified:
   libgpod/trunk/debian/changelog
   libgpod/trunk/debian/patches/00list
Log:
* 20_no-superfluous-ffi-dep:
  Only use PYGOBJECT_LIBS in bindings/python. This avoids a spurious
  dependency on libffi. Reported by Kurt Roeckx. Closes: #452829
* 10_allow-autoreconf: Make autoreconf work which is needed for
  20_no-superfluous-ffi-dep to take effect.


Modified: libgpod/trunk/debian/changelog
===================================================================
--- libgpod/trunk/debian/changelog	2007-11-20 13:46:35 UTC (rev 280)
+++ libgpod/trunk/debian/changelog	2007-11-26 21:58:06 UTC (rev 281)
@@ -1,3 +1,13 @@
+libgpod (0.6.0-3) unstable; urgency=low
+
+  * 20_no-superfluous-ffi-dep:
+    Only use PYGOBJECT_LIBS in bindings/python. This avoids a spurious
+    dependency on libffi. Reported by Kurt Roeckx. Closes: #452829
+  * 10_allow-autoreconf: Make autoreconf work which is needed for
+    20_no-superfluous-ffi-dep to take effect.
+
+ -- Frank Lichtenheld <djpig at debian.org>  Mon, 26 Nov 2007 22:47:04 +0100
+
 libgpod (0.6.0-2) unstable; urgency=low
 
   * Upload to unstable

Modified: libgpod/trunk/debian/patches/00list
===================================================================
--- libgpod/trunk/debian/patches/00list	2007-11-20 13:46:35 UTC (rev 280)
+++ libgpod/trunk/debian/patches/00list	2007-11-26 21:58:06 UTC (rev 281)
@@ -0,0 +1,2 @@
+10_allow-autoreconf
+20_no-superfluous-ffi-dep

Added: libgpod/trunk/debian/patches/10_allow-autoreconf.dpatch
===================================================================
--- libgpod/trunk/debian/patches/10_allow-autoreconf.dpatch	                        (rev 0)
+++ libgpod/trunk/debian/patches/10_allow-autoreconf.dpatch	2007-11-26 21:58:06 UTC (rev 281)
@@ -0,0 +1,32 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 10_allow-autoreconf.dpatch by  <djpig at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Calling autoreconf doesn't work, fix that so we can patch
+## DP: autotools files.
+
+ at DPATCH@
+diff -urNad trunk~/Makefile.am trunk/Makefile.am
+--- trunk~/Makefile.am	2007-11-26 22:36:04.000000000 +0100
++++ trunk/Makefile.am	2007-11-26 22:41:11.000000000 +0100
+@@ -3,6 +3,8 @@
+ # build documentation when doing a distcheck.
+ DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc
+ 
++ACLOCAL_AMFLAGS = -I m4
++
+ pkgconfigdir = $(libdir)/pkgconfig
+ pkgconfig_DATA = libgpod-1.0.pc
+ 
+diff -urNad trunk~/Makefile.in trunk/Makefile.in
+--- trunk~/Makefile.in	2007-11-26 22:36:04.000000000 +0100
++++ trunk/Makefile.in	2007-11-26 22:41:11.000000000 +0100
+@@ -85,7 +85,7 @@
+ distuninstallcheck_listfiles = find . -type f -print
+ distcleancheck_listfiles = find . -type f -print
+ ACLOCAL = @ACLOCAL@
+-ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
++ACLOCAL_AMFLAGS = -I m4
+ ALL_LINGUAS = @ALL_LINGUAS@
+ AMDEP_FALSE = @AMDEP_FALSE@
+ AMDEP_TRUE = @AMDEP_TRUE@


Property changes on: libgpod/trunk/debian/patches/10_allow-autoreconf.dpatch
___________________________________________________________________
Name: svn:executable
   + *

Added: libgpod/trunk/debian/patches/20_no-superfluous-ffi-dep.dpatch
===================================================================
--- libgpod/trunk/debian/patches/20_no-superfluous-ffi-dep.dpatch	                        (rev 0)
+++ libgpod/trunk/debian/patches/20_no-superfluous-ffi-dep.dpatch	2007-11-26 21:58:06 UTC (rev 281)
@@ -0,0 +1,78 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 20_no-superfluous-ffi-dep.dpatch by  <djpig at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Avoid superfluous dependency on libffi in .la file
+## DP: Bug#452829
+
+ at DPATCH@
+diff -urNad trunk~/bindings/python/Makefile.am trunk/bindings/python/Makefile.am
+--- trunk~/bindings/python/Makefile.am	2007-11-26 22:36:04.000000000 +0100
++++ trunk/bindings/python/Makefile.am	2007-11-26 22:45:14.000000000 +0100
+@@ -40,9 +40,9 @@
+ nodist_gpod_PYTHON = gpod.py
+ gpod_LTLIBRARIES = _gpod.la
+ nodist__gpod_la_SOURCES = gpod_wrap.c
+-_gpod_la_CPPFLAGS = $(PYTHON_INCLUDES) $(LIBGPOD_CFLAGS) $(INCLUDES)
++_gpod_la_CPPFLAGS = $(PYTHON_INCLUDES) $(LIBGPOD_CFLAGS) $(PYGOBJECT_CFLAGS) $(INCLUDES)
+ _gpod_la_LDFLAGS = -module -avoid-version
+-_gpod_la_LIBADD = $(LIBGPOD_LIBS) $(top_builddir)/src/libgpod.la
++_gpod_la_LIBADD = $(LIBGPOD_LIBS) $(PYGOBJECT_LIBS) $(top_builddir)/src/libgpod.la
+ 
+ gpod_doc.i: $(srcdir)/gpod_doc.i.in $(srcdir)/gtkdoc-to-swig.xsl
+ 	cat $< > $@
+diff -urNad trunk~/bindings/python/Makefile.in trunk/bindings/python/Makefile.in
+--- trunk~/bindings/python/Makefile.in	2007-11-26 22:36:04.000000000 +0100
++++ trunk/bindings/python/Makefile.in	2007-11-26 22:45:36.000000000 +0100
+@@ -61,6 +61,7 @@
+ LTLIBRARIES = $(gpod_LTLIBRARIES)
+ am__DEPENDENCIES_1 =
+ @HAVE_PYTHON_TRUE at _gpod_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
++ at HAVE_PYTHON_TRUE@	$(am__DEPENDENCIES_1) \
+ @HAVE_PYTHON_TRUE@	$(top_builddir)/src/libgpod.la
+ @HAVE_PYTHON_TRUE at nodist__gpod_la_OBJECTS = _gpod_la-gpod_wrap.lo
+ _gpod_la_OBJECTS = $(nodist__gpod_la_OBJECTS)
+@@ -317,9 +318,9 @@
+ @HAVE_PYTHON_TRUE at nodist_gpod_PYTHON = gpod.py
+ @HAVE_PYTHON_TRUE at gpod_LTLIBRARIES = _gpod.la
+ @HAVE_PYTHON_TRUE at nodist__gpod_la_SOURCES = gpod_wrap.c
+- at HAVE_PYTHON_TRUE@_gpod_la_CPPFLAGS = $(PYTHON_INCLUDES) $(LIBGPOD_CFLAGS) $(INCLUDES)
++ at HAVE_PYTHON_TRUE@_gpod_la_CPPFLAGS = $(PYTHON_INCLUDES) $(LIBGPOD_CFLAGS) $(PYGOBJECT_CFLAGS) $(INCLUDES)
+ @HAVE_PYTHON_TRUE at _gpod_la_LDFLAGS = -module -avoid-version
+- at HAVE_PYTHON_TRUE@_gpod_la_LIBADD = $(LIBGPOD_LIBS) $(top_builddir)/src/libgpod.la
++ at HAVE_PYTHON_TRUE@_gpod_la_LIBADD = $(LIBGPOD_LIBS) $(PYGOBJECT_LIBS) $(top_builddir)/src/libgpod.la
+ all: $(BUILT_SOURCES)
+ 	$(MAKE) $(AM_MAKEFLAGS) all-recursive
+ 
+diff -urNad trunk~/configure trunk/configure
+--- trunk~/configure	2007-11-26 22:36:04.000000000 +0100
++++ trunk/configure	2007-11-26 22:45:34.000000000 +0100
+@@ -20691,11 +20691,11 @@
+ _ACEOF
+ 
+    fi
+-   LIBGPOD_CFLAGS="$LIBGPOD_CFLAGS $PYGOBJECT_CFLAGS"
+-   LIBGPOD_LIBS="$LIBGPOD_LIBS $PYGOBJECT_LIBS"
+ fi
+ 
+ 
++
++
+ if test x"$have_pygobject" = xyes; then
+   HAVE_PYGOBJECT_TRUE=
+   HAVE_PYGOBJECT_FALSE='#'
+diff -urNad trunk~/configure.ac trunk/configure.ac
+--- trunk~/configure.ac	2007-11-26 22:36:04.000000000 +0100
++++ trunk/configure.ac	2007-11-26 22:45:14.000000000 +0100
+@@ -163,9 +163,9 @@
+    if test x"$have_pygobject" = xyes; then
+       AC_DEFINE_UNQUOTED(HAVE_PYGOBJECT, 1)
+    fi
+-   LIBGPOD_CFLAGS="$LIBGPOD_CFLAGS $PYGOBJECT_CFLAGS"
+-   LIBGPOD_LIBS="$LIBGPOD_LIBS $PYGOBJECT_LIBS"
+ fi
++AC_SUBST(PYGOBJECT_CFLAGS)
++AC_SUBST(PYGOBJECT_LIBS)
+ AM_CONDITIONAL(HAVE_PYGOBJECT, test x"$have_pygobject" = xyes)
+ 
+ dnl **************************************************


Property changes on: libgpod/trunk/debian/patches/20_no-superfluous-ffi-dep.dpatch
___________________________________________________________________
Name: svn:executable
   + *

More information about the Pkg-gtkpod-devel mailing list