r1637 - in /unstable/gmerlin-avdecoder/debian: changelog control patches/fix_dvdread_configure.patch rules

[toots at users.alioth.debian.org]

Author: toots
Date: Tue Jun  9 13:09:34 2009
New Revision: 1637

URL: http://svn.debian.org/wsvn/pkg-multimedia/?sc=1&rev=1637
Log:
regenerating configure fails in cowbuilder, simply patch existing configure..

Modified:
    unstable/gmerlin-avdecoder/debian/changelog
    unstable/gmerlin-avdecoder/debian/control
    unstable/gmerlin-avdecoder/debian/patches/fix_dvdread_configure.patch
    unstable/gmerlin-avdecoder/debian/rules

Modified: unstable/gmerlin-avdecoder/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-multimedia/unstable/gmerlin-avdecoder/debian/changelog?rev=1637&op=diff
==============================================================================
--- unstable/gmerlin-avdecoder/debian/changelog (original)
+++ unstable/gmerlin-avdecoder/debian/changelog Tue Jun  9 13:09:34 2009
@@ -9,7 +9,6 @@
   * Added build-dep on libdvdread-dev, patched configure's macro
     to build against the current package, which is a fork from
     the mplayer guys with the same name but different version..
-  * Regenerating configure scripts, according to previous patch.
 
  -- Romain Beauxis <toots at rastageeks.org>  Tue, 09 Jun 2009 12:01:51 +0200
 

Modified: unstable/gmerlin-avdecoder/debian/control
URL: http://svn.debian.org/wsvn/pkg-multimedia/unstable/gmerlin-avdecoder/debian/control?rev=1637&op=diff
==============================================================================
--- unstable/gmerlin-avdecoder/debian/control (original)
+++ unstable/gmerlin-avdecoder/debian/control Tue Jun  9 13:09:34 2009
@@ -5,7 +5,7 @@
 Uploaders: Romain Beauxis <toots at rastageeks.org>
 Homepage: http://gmerlin.sourceforge.net/
 Standards-Version: 3.8.1
-Build-Depends: debhelper (>= 7.0.1), libtool, automake1.10, autoconf, quilt, patchutils (>= 0.2.25), cdbs (>= 0.4.27), 
+Build-Depends: debhelper (>= 7.0.1), quilt, patchutils (>= 0.2.25), cdbs (>= 0.4.27), 
  doxygen, libgavl-dev (>=  1.1.0),
  libavcodec-dev, libavformat-dev, libpostproc-dev, libswscale-dev, libflac-dev,
  libtheora-dev, libcdio-paranoia-dev, libtiff4-dev, libsmbclient-dev,

Modified: unstable/gmerlin-avdecoder/debian/patches/fix_dvdread_configure.patch
URL: http://svn.debian.org/wsvn/pkg-multimedia/unstable/gmerlin-avdecoder/debian/patches/fix_dvdread_configure.patch?rev=1637&op=diff
==============================================================================
--- unstable/gmerlin-avdecoder/debian/patches/fix_dvdread_configure.patch (original)
+++ unstable/gmerlin-avdecoder/debian/patches/fix_dvdread_configure.patch Tue Jun  9 13:09:34 2009
@@ -1,8 +1,8 @@
 Fix dvdread detection.
 Index: gmerlin-avdecoder-1.0.0/m4/check_funcs.m4
 ===================================================================
---- gmerlin-avdecoder-1.0.0.orig/m4/check_funcs.m4	2009-06-09 13:56:58.000000000 +0200
-+++ gmerlin-avdecoder-1.0.0/m4/check_funcs.m4	2009-06-09 13:57:08.000000000 +0200
+--- gmerlin-avdecoder-1.0.0.orig/m4/check_funcs.m4	2008-11-24 20:51:25.000000000 +0100
++++ gmerlin-avdecoder-1.0.0/m4/check_funcs.m4	2009-06-09 15:07:51.000000000 +0200
 @@ -838,11 +838,7 @@
      #include <stdio.h>
      main()
@@ -15,3 +15,19 @@
      }
    ],
    [
+Index: gmerlin-avdecoder-1.0.0/configure
+===================================================================
+--- gmerlin-avdecoder-1.0.0.orig/configure	2009-06-09 15:07:55.000000000 +0200
++++ gmerlin-avdecoder-1.0.0/configure	2009-06-09 15:08:04.000000000 +0200
+@@ -27080,11 +27080,7 @@
+     #include <stdio.h>
+     main()
+     {
+-#if DVDREAD_VERSION < 905
+-    return -1;
+-#else
+     return 0;
+-#endif
+     }
+ 
+ _ACEOF

Modified: unstable/gmerlin-avdecoder/debian/rules
URL: http://svn.debian.org/wsvn/pkg-multimedia/unstable/gmerlin-avdecoder/debian/rules?rev=1637&op=diff
==============================================================================
--- unstable/gmerlin-avdecoder/debian/rules (original)
+++ unstable/gmerlin-avdecoder/debian/rules Tue Jun  9 13:09:34 2009
@@ -1,10 +1,5 @@
 #!/usr/bin/make -f
 
-DEB_AUTO_UPDATE_LIBTOOL = pre
-DEB_AUTO_UPDATE_ACLOCAL = 1.10
-DEB_AUTO_UPDATE_AUTOMAKE = 1.10
-DEB_AUTO_UPDATE_AUTOCONF = 2.60
-  
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/autotools.mk
 include /usr/share/cdbs/1/rules/patchsys-quilt.mk