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

[djpig at alioth.debian.org]

Author: djpig
Date: 2009-01-24 12:29:31 +0000 (Sat, 24 Jan 2009)
New Revision: 344

Modified:
   libgpod/trunk/debian/changelog
   libgpod/trunk/debian/patches/20_no-superfluous-ffi-dep.dpatch
Log:
update patch 20_no-superfluous-ffi-dep


Modified: libgpod/trunk/debian/changelog
===================================================================
--- libgpod/trunk/debian/changelog	2009-01-24 12:16:04 UTC (rev 343)
+++ libgpod/trunk/debian/changelog	2009-01-24 12:29:31 UTC (rev 344)
@@ -2,6 +2,7 @@
 
   * (NOT RELEASED YET) New upstream release
     + drop patch 10_allow-autoreconf, applied upstream
+    + update patch 20_no-superfluous-ffi-dep
   * Fix watch file to use SF.net redirector implicetly
 
  -- Frank Lichtenheld <djpig at debian.org>  Sat, 24 Jan 2009 11:35:12 +0100

Modified: libgpod/trunk/debian/patches/20_no-superfluous-ffi-dep.dpatch
===================================================================
--- libgpod/trunk/debian/patches/20_no-superfluous-ffi-dep.dpatch	2009-01-24 12:16:04 UTC (rev 343)
+++ libgpod/trunk/debian/patches/20_no-superfluous-ffi-dep.dpatch	2009-01-24 12:29:31 UTC (rev 344)
@@ -7,8 +7,8 @@
 
 @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
+--- 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
@@ -22,9 +22,9 @@
  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 @@
+--- 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) \
@@ -32,7 +32,7 @@
  @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 @@
+@@ -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
@@ -45,31 +45,28 @@
  	$(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 @@
+--- 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
  
-    fi
 -   LIBGPOD_CFLAGS="$LIBGPOD_CFLAGS $PYGOBJECT_CFLAGS"
 -   LIBGPOD_LIBS="$LIBGPOD_LIBS $PYGOBJECT_LIBS"
+ else
+    have_pygobject=no
  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
+--- 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)