r1635 - in /unstable/gmerlin-avdecoder/debian: changelog compat control control.in copyright install patches/ patches/fix_dvdread_configure.patch patches/fix_int_64.patch patches/series rules

toots at users.alioth.debian.org toots at users.alioth.debian.org
Tue Jun 9 12:28:52 UTC 2009 

Author: toots
Date: Tue Jun  9 12:28:52 2009
New Revision: 1635

URL: http://svn.debian.org/wsvn/pkg-multimedia/?sc=1&rev=1635
Log:
Imported and prepared debian package from Marillat's

Added:
    unstable/gmerlin-avdecoder/debian/patches/
    unstable/gmerlin-avdecoder/debian/patches/fix_dvdread_configure.patch
    unstable/gmerlin-avdecoder/debian/patches/fix_int_64.patch
    unstable/gmerlin-avdecoder/debian/patches/series
Modified:
    unstable/gmerlin-avdecoder/debian/changelog
    unstable/gmerlin-avdecoder/debian/compat
    unstable/gmerlin-avdecoder/debian/control
    unstable/gmerlin-avdecoder/debian/control.in
    unstable/gmerlin-avdecoder/debian/copyright
    unstable/gmerlin-avdecoder/debian/install
    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=1635&op=diff
==============================================================================
--- unstable/gmerlin-avdecoder/debian/changelog (original)
+++ unstable/gmerlin-avdecoder/debian/changelog Tue Jun  9 12:28:52 2009
@@ -1,9 +1,48 @@
-gmerlin-avdecoder (0.1.8-1) unstable; urgency=low
+gmerlin-avdecoder (1.0.0-1) unstable; urgency=low
 
-  * Adopted package for debian, with Christian Marillat's blessing
-  * Moved to cdbs
+  * Adopted package for debian, with Christian Marillat's blessing.
+    -> Removed libgmerlin-avdec-common package, which only contained
+       a single file so far..
+  * Moved to cdbs.
+  * Added build-dep on libswscale-dev.
+  * Added build-dep on libopenjpeg-dev.
+  * 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>  Mon, 24 Nov 2008 14:05:57 +0100
+ -- Romain Beauxis <toots at rastageeks.org>  Tue, 09 Jun 2009 12:01:51 +0200
+
+gmerlin-avdecoder (1.0.0-0.2) unstable; urgency=low
+
+  * Rebuild against latest libdvdread-dev.
+  * Need to build-depends on libdts-dev.
+
+ -- Christian Marillat <marillat at debian.org>  Sat, 07 Mar 2009 11:51:26 +0100
+
+gmerlin-avdecoder (1.0.0-0.1) unstable; urgency=low
+
+  * libgmerlin-avdec1 should Depends on libgmerlin-avdec-common instead of
+    libgmerlin-common.
+
+ -- Christian Marillat <marillat at debian.org>  Fri, 13 Feb 2009 11:33:43 +0100
+
+gmerlin-avdecoder (1.0.0-0.0) unstable; urgency=low
+
+  * New upstream release.
+  * Update libgmerlin-dev Build Depends version to 0.4.0
+  * Remove quilt from Build depends.
+
+ -- Christian Marillat <marillat at debian.org>  Mon, 02 Feb 2009 14:20:11 +0100
+
+gmerlin-avdecoder (0.1.8-0.1) unstable; urgency=low
+
+  * libgmerlin-avdec-dev should depends on libgavl-dev (Thanks to IOhannes m
+    zmoelnig).
+  * Rebuild against latest libgavl-dev.
+  * New patch to fix a build problem.
+
+ -- Christian Marillat <marillat at debian.org>  Thu, 11 Dec 2008 23:23:09 +0100
 
 gmerlin-avdecoder (0.1.8-0.0) unstable; urgency=low
 

Modified: unstable/gmerlin-avdecoder/debian/compat
URL: http://svn.debian.org/wsvn/pkg-multimedia/unstable/gmerlin-avdecoder/debian/compat?rev=1635&op=diff
==============================================================================
--- unstable/gmerlin-avdecoder/debian/compat (original)
+++ unstable/gmerlin-avdecoder/debian/compat Tue Jun  9 12:28:52 2009
@@ -1,1 +1,1 @@
-4
+7

Modified: unstable/gmerlin-avdecoder/debian/control
URL: http://svn.debian.org/wsvn/pkg-multimedia/unstable/gmerlin-avdecoder/debian/control?rev=1635&op=diff
==============================================================================
--- unstable/gmerlin-avdecoder/debian/control (original)
+++ unstable/gmerlin-avdecoder/debian/control Tue Jun  9 12:28:52 2009
@@ -1,17 +1,19 @@
 Source: gmerlin-avdecoder
 Section: libs
 Priority: extra
-Maintainer: Debian Multimedia Team <debian-multimedia at lists.debian.org>
+Maintainer: Debian Multimedia Team <debian-multimedia at lists.debian.org>                        
 Uploaders: Romain Beauxis <toots at rastageeks.org>
 Homepage: http://gmerlin.sourceforge.net/
-Standards-Version: 3.8.0
-Build-Depends: cdbs (>= 0.4.23-1.1), debhelper (>= 4.2.0), doxygen, libgavl-dev (>= 1.0.1-0.2),
+Standards-Version: 3.8.1
+Build-Depends: debhelper (>= 7.0.1), libtool, automake1.10, autoconf, 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,
  libdca-dev, libdvdread-dev, libmpcdec-dev, libspeex-dev, libpng12-dev,
- libgmerlin-dev (>= 0.3.8-0.1), libmad0-dev, libmpeg2-4-dev, gmerlin-data
+ libgmerlin-dev (>= 0.4.0), libmad0-dev, libmpeg2-4-dev, gmerlin-data,
+ libdts-dev, libswscale-dev, libopenjpeg-dev, libdvdread-dev (>= 4.1.3)
 
-Package: libgmerlin-avdec0
+Package: libgmerlin-avdec1
 Architecture: any
 Depends: ${shlibs:Depends}
 Description: a general multimedia decoding library
@@ -22,7 +24,7 @@
 Package: libgmerlin-avdec-dev
 Architecture: any
 Section: libdevel
-Depends: libgmerlin-avdec0 (>= ${source:Version}), pkg-config
+Depends: libgmerlin-avdec1 (>= ${source:Version}), libgavl-dev
 Description: a general multimedia decoding library
  Gmerlin_avdecoder is a general purpose media decoding library. It was
  written as a support library for gmerlin, but it can also be used by other
@@ -31,7 +33,6 @@
 Package: libgmerlin-avdec-doc
 Architecture: all
 Section: doc
-Depends: libgmerlin-avdec0 (>= ${source:Version})
 Description: a general multimedia decoding library
  Gmerlin_avdecoder is a general purpose media decoding library. It was
  written as a support library for gmerlin, but it can also be used by other

Modified: unstable/gmerlin-avdecoder/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-multimedia/unstable/gmerlin-avdecoder/debian/control.in?rev=1635&op=diff
==============================================================================
--- unstable/gmerlin-avdecoder/debian/control.in (original)
+++ unstable/gmerlin-avdecoder/debian/control.in Tue Jun  9 12:28:52 2009
@@ -1,17 +1,19 @@
 Source: gmerlin-avdecoder
 Section: libs
 Priority: extra
-Maintainer: Debian Multimedia Team <debian-multimedia at lists.debian.org>
+Maintainer: Debian Multimedia Team <debian-multimedia at lists.debian.org>                        
 Uploaders: Romain Beauxis <toots at rastageeks.org>
 Homepage: http://gmerlin.sourceforge.net/
-Standards-Version: 3.8.0
-Build-Depends: @cdbs@, doxygen, libgavl-dev (>= 1.0.1-0.2),
+Standards-Version: 3.8.1
+Build-Depends: @cdbs@, 
+ 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,
  libdca-dev, libdvdread-dev, libmpcdec-dev, libspeex-dev, libpng12-dev,
- libgmerlin-dev (>= 0.3.8-0.1), libmad0-dev, libmpeg2-4-dev, gmerlin-data
+ libgmerlin-dev (>= 0.4.0), libmad0-dev, libmpeg2-4-dev, gmerlin-data,
+ libdts-dev, libswscale-dev, libopenjpeg-dev, libdvdread-dev (>= 4.1.3)
 
-Package: libgmerlin-avdec0
+Package: libgmerlin-avdec1
 Architecture: any
 Depends: ${shlibs:Depends}
 Description: a general multimedia decoding library
@@ -22,7 +24,7 @@
 Package: libgmerlin-avdec-dev
 Architecture: any
 Section: libdevel
-Depends: libgmerlin-avdec0 (>= ${source:Version}), pkg-config
+Depends: libgmerlin-avdec1 (>= ${source:Version}), libgavl-dev
 Description: a general multimedia decoding library
  Gmerlin_avdecoder is a general purpose media decoding library. It was
  written as a support library for gmerlin, but it can also be used by other
@@ -31,7 +33,6 @@
 Package: libgmerlin-avdec-doc
 Architecture: all
 Section: doc
-Depends: libgmerlin-avdec0 (>= ${source:Version})
 Description: a general multimedia decoding library
  Gmerlin_avdecoder is a general purpose media decoding library. It was
  written as a support library for gmerlin, but it can also be used by other

Modified: unstable/gmerlin-avdecoder/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-multimedia/unstable/gmerlin-avdecoder/debian/copyright?rev=1635&op=diff
==============================================================================
--- unstable/gmerlin-avdecoder/debian/copyright (original)
+++ unstable/gmerlin-avdecoder/debian/copyright Tue Jun  9 12:28:52 2009
@@ -14,9 +14,9 @@
 License:
 
     You should have received a copy of the GNU General Public License with the
-    Debian GNU/Linux distribution in file /usr/share/common-licenses/GPL; if
+    Debian GNU/Linux distribution in file /usr/share/common-licenses/GPL-2; if
     not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth
     Floor, Boston, MA 02110-1301, USA.
 
 The Debian packaging is (C) 2008, Christian Marillat <marillat at debian.org> and
-is licensed under the GPL, see `/usr/share/common-licenses/GPL'.
+is licensed under the GPL, see `/usr/share/common-licenses/GPL-2'.

Modified: unstable/gmerlin-avdecoder/debian/install
URL: http://svn.debian.org/wsvn/pkg-multimedia/unstable/gmerlin-avdecoder/debian/install?rev=1635&op=diff
==============================================================================
--- unstable/gmerlin-avdecoder/debian/install (original)
+++ unstable/gmerlin-avdecoder/debian/install Tue Jun  9 12:28:52 2009
@@ -1,3 +1,3 @@
 debian/tmp/usr/share/locale
 debian/tmp/usr/lib/gmerlin/plugins
-debian/tmp/usr/lib/libgmerlin_avdec.so.0*
+debian/tmp/usr/lib/libgmerlin_avdec.so.1*

Added: 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=1635&op=file
==============================================================================
--- unstable/gmerlin-avdecoder/debian/patches/fix_dvdread_configure.patch (added)
+++ unstable/gmerlin-avdecoder/debian/patches/fix_dvdread_configure.patch Tue Jun  9 12:28:52 2009
@@ -1,0 +1,17 @@
+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
+@@ -838,11 +838,7 @@
+     #include <stdio.h>
+     main()
+     {
+-#if DVDREAD_VERSION < 905
+-    return -1;
+-#else
+     return 0;
+-#endif
+     }
+   ],
+   [

Added: unstable/gmerlin-avdecoder/debian/patches/fix_int_64.patch
URL: http://svn.debian.org/wsvn/pkg-multimedia/unstable/gmerlin-avdecoder/debian/patches/fix_int_64.patch?rev=1635&op=file
==============================================================================
--- unstable/gmerlin-avdecoder/debian/patches/fix_int_64.patch (added)
+++ unstable/gmerlin-avdecoder/debian/patches/fix_int_64.patch Tue Jun  9 12:28:52 2009
@@ -1,0 +1,15 @@
+Index: gmerlin-avdecoder-1.0.0/lib/dvb_channels.c
+===================================================================
+--- gmerlin-avdecoder-1.0.0.orig/lib/dvb_channels.c	2009-06-09 14:02:05.000000000 +0200
++++ gmerlin-avdecoder-1.0.0/lib/dvb_channels.c	2009-06-09 14:19:48.000000000 +0200
+@@ -19,6 +19,10 @@
+  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+  * *****************************************************************/
+ 
++// Dirty hack to avoid conflicting #include:
++#define _INTTYPES_H 1
++#define _SYS_TYPES_H 1
++
+ #include <linux/dvb/frontend.h>
+ 
+ #include <avdec_private.h>

Added: unstable/gmerlin-avdecoder/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-multimedia/unstable/gmerlin-avdecoder/debian/patches/series?rev=1635&op=file
==============================================================================
--- unstable/gmerlin-avdecoder/debian/patches/series (added)
+++ unstable/gmerlin-avdecoder/debian/patches/series Tue Jun  9 12:28:52 2009
@@ -1,0 +1,2 @@
+fix_dvdread_configure.patch
+fix_int_64.patch

Modified: unstable/gmerlin-avdecoder/debian/rules
URL: http://svn.debian.org/wsvn/pkg-multimedia/unstable/gmerlin-avdecoder/debian/rules?rev=1635&op=diff
==============================================================================
--- unstable/gmerlin-avdecoder/debian/rules (original)
+++ unstable/gmerlin-avdecoder/debian/rules Tue Jun  9 12:28:52 2009
@@ -1,8 +1,13 @@
 #!/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
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 
 # In order to regenerate 'debian/control' :
 #    DEB_AUTO_UPDATE_DEBIAN_CONTROL=yes fakeroot debian/rules clean

More information about the pkg-multimedia-commits mailing list