[Pkg-gtkpod-devel] r389 - libgpod/trunk/debian/patches

[Frank Lichtenheld]

Author: djpig
Date: 2009-06-19 21:21:39 +0000 (Fri, 19 Jun 2009)
New Revision: 389

Removed:
   libgpod/trunk/debian/patches/20_no-superfluous-ffi-dep.dpatch
Modified:
   libgpod/trunk/debian/patches/00list
Log:
Drop patch 20_no-superfluous-ffi-dep.dpatch, applied upstream


Modified: libgpod/trunk/debian/patches/00list
===================================================================
--- libgpod/trunk/debian/patches/00list	2009-06-19 21:21:07 UTC (rev 388)
+++ libgpod/trunk/debian/patches/00list	2009-06-19 21:21:39 UTC (rev 389)
@@ -1,2 +1 @@
-20_no-superfluous-ffi-dep
 25_xsltproc-nonet

Deleted: libgpod/trunk/debian/patches/20_no-superfluous-ffi-dep.dpatch
===================================================================
--- libgpod/trunk/debian/patches/20_no-superfluous-ffi-dep.dpatch	2009-06-19 21:21:07 UTC (rev 388)
+++ libgpod/trunk/debian/patches/20_no-superfluous-ffi-dep.dpatch	2009-06-19 21:21:39 UTC (rev 389)
@@ -1,75 +0,0 @@
-#! /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	2009-01-24 13:21:26.000000000 +0100
-+++ trunk/bindings/python/Makefile.am	2009-01-24 13:23: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	2009-01-24 13:21:26.000000000 +0100
-+++ trunk/bindings/python/Makefile.in	2009-01-24 13:27:43.000000000 +0100
-@@ -57,6 +57,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)
-@@ -313,9 +314,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	2009-01-24 13:16:18.000000000 +0100
-+++ trunk/configure	2009-01-24 13:26:51.000000000 +0100
-@@ -21207,8 +21207,6 @@
- #define HAVE_PYGOBJECT 1
- _ACEOF
- 
--   LIBGPOD_CFLAGS="$LIBGPOD_CFLAGS $PYGOBJECT_CFLAGS"
--   LIBGPOD_LIBS="$LIBGPOD_LIBS $PYGOBJECT_LIBS"
- else
-    have_pygobject=no
- fi
-diff -urNad trunk~/configure.ac trunk/configure.ac
---- trunk~/configure.ac	2009-01-24 13:16:18.000000000 +0100
-+++ trunk/configure.ac	2009-01-24 13:27:10.000000000 +0100
-@@ -212,11 +212,11 @@
- fi
- if test x"$have_pygobject" = xyes; then
-    AC_DEFINE_UNQUOTED(HAVE_PYGOBJECT, 1)
--   LIBGPOD_CFLAGS="$LIBGPOD_CFLAGS $PYGOBJECT_CFLAGS"
--   LIBGPOD_LIBS="$LIBGPOD_LIBS $PYGOBJECT_LIBS"
- else
-    have_pygobject=no
- fi
-+AC_SUBST(PYGOBJECT_CFLAGS)
-+AC_SUBST(PYGOBJECT_LIBS)
- AM_CONDITIONAL(HAVE_PYGOBJECT, test x"$have_pygobject" = xyes)
- 
- dnl **************************************************