r1588 - in /experimental/libquicktime/debian: ./ patches/

fabian-guest at users.alioth.debian.org fabian-guest at users.alioth.debian.org
Thu Nov 27 10:32:53 UTC 2008 

Author: fabian-guest
Date: Thu Nov 27 10:32:52 2008
New Revision: 1588

URL: http://svn.debian.org/wsvn/pkg-multimedia/?sc=1&rev=1588
Log:
libquicktime (2:1.1.0+debian-1) UNRELEASED; urgency=low
 
  * New upstream release (Closes: #506955).
  * Rebuilt upstream tarball without debian/ directory.

  * debian/control:
    + Bumped Standards-Version to 3.8.0.
    + Removed the "XS-" prefix from the Vcs-Svn and Vcs-Browser fields.
  * debian/control, debian/rules, debian/patches/*:
    + Switched from dpatch to quilt.
  * debian/README.source:
    + Added.
 
 -- Fabian Greffrath <fabian at debian-unofficial.org>  Thu, 27 Nov 2008 11:14:10 +0100


Added:
    experimental/libquicktime/debian/README.source
    experimental/libquicktime/debian/patches/01-debian-directory.patch
    experimental/libquicktime/debian/patches/02-install-in-libquicktime1.patch
    experimental/libquicktime/debian/patches/03-spurious-files-in-potfiles-in.patch
    experimental/libquicktime/debian/patches/20-deprecated-headers.patch
    experimental/libquicktime/debian/patches/21-export-quicktime_set_window.patch
    experimental/libquicktime/debian/patches/70-relibtoolize.patch
    experimental/libquicktime/debian/patches/series
Removed:
    experimental/libquicktime/debian/patches/00list
    experimental/libquicktime/debian/patches/01-debian-directory.dpatch
    experimental/libquicktime/debian/patches/02-install-in-libquicktime1.dpatch
    experimental/libquicktime/debian/patches/03-spurious-files-in-potfiles-in.dpatch
    experimental/libquicktime/debian/patches/20-deprecated-headers.dpatch
    experimental/libquicktime/debian/patches/21-export-quicktime_set_window.dpatch
    experimental/libquicktime/debian/patches/70_relibtoolize.dpatch
Modified:
    experimental/libquicktime/debian/changelog
    experimental/libquicktime/debian/control
    experimental/libquicktime/debian/rules

Added: experimental/libquicktime/debian/README.source
URL: http://svn.debian.org/wsvn/pkg-multimedia/experimental/libquicktime/debian/README.source?rev=1588&op=file
==============================================================================
--- experimental/libquicktime/debian/README.source (added)
+++ experimental/libquicktime/debian/README.source Thu Nov 27 10:32:52 2008
@@ -1,0 +1,6 @@
+This package uses quilt to manage all modifications to the upstream source.
+The fully patched source can be generated using the patch target provided by
+`debian/rules'.
+
+If you want to know more about how to use quilt to manage Debian patches, read
+/usr/share/doc/quilt/README.source.

Modified: experimental/libquicktime/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-multimedia/experimental/libquicktime/debian/changelog?rev=1588&op=diff
==============================================================================
--- experimental/libquicktime/debian/changelog (original)
+++ experimental/libquicktime/debian/changelog Thu Nov 27 10:32:52 2008
@@ -1,9 +1,17 @@
-libquicktime (2:1.0.3+debian-3) UNRELEASED; urgency=low
-
-  * debian/control:
+libquicktime (2:1.1.0+debian-1) UNRELEASED; urgency=low
+
+  * New upstream release (Closes: #506955).
+  * Rebuilt upstream tarball without debian/ directory.
+
+  * debian/control:
+    + Bumped Standards-Version to 3.8.0.
     + Removed the "XS-" prefix from the Vcs-Svn and Vcs-Browser fields.
-
- -- Fabian Greffrath <fabian at debian-unofficial.org>  Tue, 19 Aug 2008 16:00:00 +0200
+  * debian/control, debian/rules, debian/patches/*:
+    + Switched from dpatch to quilt.
+  * debian/README.source:
+    + Added.
+
+ -- Fabian Greffrath <fabian at debian-unofficial.org>  Thu, 27 Nov 2008 11:14:10 +0100
 
 libquicktime (2:1.0.3+debian-2) experimental; urgency=low
 

Modified: experimental/libquicktime/debian/control
URL: http://svn.debian.org/wsvn/pkg-multimedia/experimental/libquicktime/debian/control?rev=1588&op=diff
==============================================================================
--- experimental/libquicktime/debian/control (original)
+++ experimental/libquicktime/debian/control Thu Nov 27 10:32:52 2008
@@ -5,10 +5,9 @@
 Uploaders: Fabian Greffrath <fabian at debian-unofficial.org>,
            Sam Hocevar (Debian packages) <sam+deb at zoy.org>,
            Loic Minier <lool at dooz.org>
-Standards-Version: 3.7.3
+Standards-Version: 3.8.0
 Build-Depends: cdbs,
                debhelper (>= 5),
-               dpatch,
                autotools-dev,
                doxygen,
                libasound2-dev [!hurd-i386 !kfreebsd-amd64 !kfreebsd-i386],
@@ -26,7 +25,8 @@
                libvorbis-dev,
                libxaw7-dev,
                libxv-dev,
-               libgl1-mesa-dev | libgl-dev
+               libgl1-mesa-dev | libgl-dev,
+               quilt
 Vcs-Svn: svn://svn.debian.org/pkg-multimedia/experimental/libquicktime
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-multimedia/experimental/libquicktime/
 Homepage: http://libquicktime.sourceforge.net/

Added: experimental/libquicktime/debian/patches/01-debian-directory.patch
URL: http://svn.debian.org/wsvn/pkg-multimedia/experimental/libquicktime/debian/patches/01-debian-directory.patch?rev=1588&op=file
==============================================================================
--- experimental/libquicktime/debian/patches/01-debian-directory.patch (added)
+++ experimental/libquicktime/debian/patches/01-debian-directory.patch Thu Nov 27 10:32:52 2008
@@ -1,0 +1,20 @@
+--- libquicktime.orig/Makefile.am
++++ libquicktime/Makefile.am
+@@ -25,7 +25,6 @@
+ 
+ 
+ DIST_SUBDIRS= \
+-debian \
+ doc \
+ src \
+ include \
+--- libquicktime.orig/configure.ac
++++ libquicktime/configure.ac
+@@ -880,7 +880,6 @@
+ libquicktime.pc \
+ doc/Makefile \
+ doc/Doxyfile \
+-debian/Makefile \
+ src/Makefile \
+ include/Makefile \
+ include/quicktime/Makefile \

Added: experimental/libquicktime/debian/patches/02-install-in-libquicktime1.patch
URL: http://svn.debian.org/wsvn/pkg-multimedia/experimental/libquicktime/debian/patches/02-install-in-libquicktime1.patch?rev=1588&op=file
==============================================================================
--- experimental/libquicktime/debian/patches/02-install-in-libquicktime1.patch (added)
+++ experimental/libquicktime/debian/patches/02-install-in-libquicktime1.patch Thu Nov 27 10:32:52 2008
@@ -1,0 +1,20 @@
+--- libquicktime.orig/configure.ac
++++ libquicktime/configure.ac
+@@ -1,5 +1,5 @@
+ AC_INIT(src/lqt_quicktime.c)
+-AM_INIT_AUTOMAKE(libquicktime, 1.1.0)
++AM_INIT_AUTOMAKE(libquicktime1, 1.1.0)
+ 
+ LQT_VERSION=$VERSION
+ 
+--- libquicktime.orig/src/Makefile.am
++++ libquicktime/src/Makefile.am
+@@ -9,7 +9,7 @@
+ #
+ libquicktime_la_LIBADD = @ICONV_LIBS@ @LTLIBINTL@
+ 
+-libquicktime_la_LDFLAGS = -export-dynamic
++libquicktime_la_LDFLAGS = -export-dynamic -version-number 1
+ 
+ # build only the files, which can be compiled
+ 

Added: experimental/libquicktime/debian/patches/03-spurious-files-in-potfiles-in.patch
URL: http://svn.debian.org/wsvn/pkg-multimedia/experimental/libquicktime/debian/patches/03-spurious-files-in-potfiles-in.patch?rev=1588&op=file
==============================================================================
--- experimental/libquicktime/debian/patches/03-spurious-files-in-potfiles-in.patch (added)
+++ experimental/libquicktime/debian/patches/03-spurious-files-in-potfiles-in.patch Thu Nov 27 10:32:52 2008
@@ -1,0 +1,10 @@
+--- libquicktime.orig/po/POTFILES.in
++++ libquicktime/po/POTFILES.in
+@@ -109,7 +109,6 @@
+ utils/lqtplay.c
+ utils/dump.c
+ utils/yuv4toyuv.c
+-utils/recover.c
+ utils/dechunk.c
+ utils/dump_codecs.c
+ utils/gtk/libquicktime_config.c

Added: experimental/libquicktime/debian/patches/20-deprecated-headers.patch
URL: http://svn.debian.org/wsvn/pkg-multimedia/experimental/libquicktime/debian/patches/20-deprecated-headers.patch?rev=1588&op=file
==============================================================================
--- experimental/libquicktime/debian/patches/20-deprecated-headers.patch (added)
+++ experimental/libquicktime/debian/patches/20-deprecated-headers.patch Thu Nov 27 10:32:52 2008
@@ -1,0 +1,33 @@
+--- libquicktime.orig/include/quicktime/lqt_codecapi.h
++++ libquicktime/include/quicktime/lqt_codecapi.h
+@@ -28,8 +28,8 @@
+ #pragma GCC visibility push(default)
+ 
+ #include <config.h>
+-#include <quicktime/lqt_version.h>
+-#include <quicktime/lqt.h>
++#include <lqt/lqt_version.h>
++#include <lqt/lqt.h>
+ 
+ #include <quicktime/qtprivate.h>
+ 
+--- libquicktime.orig/lqt.m4
++++ libquicktime/lqt.m4
+@@ -84,7 +84,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
+-#include <quicktime/quicktime.h>
++#include <lqt/quicktime.h>
+ 
+ char*
+ my_strdup (char *str)
+@@ -171,7 +171,7 @@
+           LIBS="$LIBS $LQT_LIBS"
+           AC_TRY_LINK([
+ #include <stdio.h>
+-#include <quicktime/quicktime.h>
++#include <lqt/quicktime.h>
+ 
+ int main(int argc, char *argv[])
+ { return 0; }

Added: experimental/libquicktime/debian/patches/21-export-quicktime_set_window.patch
URL: http://svn.debian.org/wsvn/pkg-multimedia/experimental/libquicktime/debian/patches/21-export-quicktime_set_window.patch?rev=1588&op=file
==============================================================================
--- experimental/libquicktime/debian/patches/21-export-quicktime_set_window.patch (added)
+++ experimental/libquicktime/debian/patches/21-export-quicktime_set_window.patch Thu Nov 27 10:32:52 2008
@@ -1,0 +1,12 @@
+--- libquicktime.orig/include/quicktime/quicktime.h
++++ libquicktime/include/quicktime/quicktime.h
+@@ -1044,6 +1044,9 @@
+ 
+ int quicktime_set_video_position(quicktime_t *file, int64_t frame, int track);
+ 
++/* set window data */
++void quicktime_set_window(quicktime_t *file, int in_x, int in_y, int in_w, int in_h, int out_w, int out_h);
++
+ /* ========================== Access to raw data follows. */
+ /* write data for one quicktime track */
+ /* the user must handle conversion to the channels in this track */

Added: experimental/libquicktime/debian/patches/70-relibtoolize.patch
URL: http://svn.debian.org/wsvn/pkg-multimedia/experimental/libquicktime/debian/patches/70-relibtoolize.patch?rev=1588&op=file
==============================================================================
--- experimental/libquicktime/debian/patches/70-relibtoolize.patch (added)
+++ experimental/libquicktime/debian/patches/70-relibtoolize.patch Thu Nov 27 10:32:52 2008
@@ -1,0 +1,79 @@
+Classical relibtoolizing patch generated with:
+    libtoolize --force --copy && \
+    aclocal-1.10 -I m4 && \
+    autoconf && \
+    automake-1.10 && \
+    rm -rf autom4te.cache
+and by excluding config.guess and config.sub from the patch.
+
+--- libquicktime.orig/Makefile.in
++++ libquicktime/Makefile.in
+@@ -292,7 +292,6 @@
+ m4datadir = $(datadir)/aclocal
+ m4data_DATA = lqt.m4
+ DIST_SUBDIRS = \
+-debian \
+ doc \
+ src \
+ include \
+--- libquicktime.orig/aclocal.m4
++++ libquicktime/aclocal.m4
+@@ -21,7 +21,7 @@
+ 
+ # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
+ 
+-# serial 52 Debian 1.5.26-1ubuntu1 AC_PROG_LIBTOOL
++# serial 52 Debian 1.5.26-4 AC_PROG_LIBTOOL
+ 
+ 
+ # AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
+--- libquicktime.orig/configure
++++ libquicktime/configure
+@@ -2441,7 +2441,7 @@
+ 
+ 
+ # Define the identity of the package.
+- PACKAGE=libquicktime
++ PACKAGE=libquicktime1
+  VERSION=1.1.0
+ 
+ 
+@@ -29628,7 +29628,7 @@
+ 
+ 
+ 
+-ac_config_files="$ac_config_files Makefile po/Makefile.in libquicktime.spec libquicktime.pc doc/Makefile doc/Doxyfile debian/Makefile src/Makefile include/Makefile include/quicktime/Makefile include/quicktime/lqt_version.h plugins/Makefile plugins/dv/Makefile plugins/faad2/Makefile plugins/faac/Makefile plugins/lame/Makefile plugins/mjpeg/Makefile plugins/audiocodec/Makefile plugins/videocodec/Makefile plugins/vorbis/Makefile plugins/png/Makefile plugins/rtjpeg/Makefile plugins/ffmpeg/Makefile plugins/x264/Makefile utils/Makefile utils/gtk/Makefile lqt-config"
++ac_config_files="$ac_config_files Makefile po/Makefile.in libquicktime.spec libquicktime.pc doc/Makefile doc/Doxyfile src/Makefile include/Makefile include/quicktime/Makefile include/quicktime/lqt_version.h plugins/Makefile plugins/dv/Makefile plugins/faad2/Makefile plugins/faac/Makefile plugins/lame/Makefile plugins/mjpeg/Makefile plugins/audiocodec/Makefile plugins/videocodec/Makefile plugins/vorbis/Makefile plugins/png/Makefile plugins/rtjpeg/Makefile plugins/ffmpeg/Makefile plugins/x264/Makefile utils/Makefile utils/gtk/Makefile lqt-config"
+ 
+ ac_config_commands="$ac_config_commands default"
+ 
+@@ -30365,7 +30365,6 @@
+     "libquicktime.pc") CONFIG_FILES="$CONFIG_FILES libquicktime.pc" ;;
+     "doc/Makefile") CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;;
+     "doc/Doxyfile") CONFIG_FILES="$CONFIG_FILES doc/Doxyfile" ;;
+-    "debian/Makefile") CONFIG_FILES="$CONFIG_FILES debian/Makefile" ;;
+     "src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
+     "include/Makefile") CONFIG_FILES="$CONFIG_FILES include/Makefile" ;;
+     "include/quicktime/Makefile") CONFIG_FILES="$CONFIG_FILES include/quicktime/Makefile" ;;
+--- libquicktime.orig/ltmain.sh
++++ libquicktime/ltmain.sh
+@@ -43,7 +43,7 @@
+ 
+ PROGRAM=ltmain.sh
+ PACKAGE=libtool
+-VERSION="1.5.26 Debian 1.5.26-1ubuntu1"
++VERSION="1.5.26 Debian 1.5.26-4"
+ TIMESTAMP=" (1.1220.2.493 2008/02/01 16:58:18)"
+ 
+ # Be Bourne compatible (taken from Autoconf:_AS_BOURNE_COMPATIBLE).
+--- libquicktime.orig/src/Makefile.in
++++ libquicktime/src/Makefile.in
+@@ -305,7 +305,7 @@
+ # Maybe we need zlib to read compressed quicktime headers
+ #
+ libquicktime_la_LIBADD = @ICONV_LIBS@ @LTLIBINTL@
+-libquicktime_la_LDFLAGS = -export-dynamic
++libquicktime_la_LDFLAGS = -export-dynamic -version-number 1
+ @HAVE_FSEEKO_FALSE at FSEEKO_SRC = lqt_fseeko.c
+ 
+ # build only the files, which can be compiled

Added: experimental/libquicktime/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-multimedia/experimental/libquicktime/debian/patches/series?rev=1588&op=file
==============================================================================
--- experimental/libquicktime/debian/patches/series (added)
+++ experimental/libquicktime/debian/patches/series Thu Nov 27 10:32:52 2008
@@ -1,0 +1,6 @@
+01-debian-directory.patch
+02-install-in-libquicktime1.patch
+03-spurious-files-in-potfiles-in.patch
+20-deprecated-headers.patch
+21-export-quicktime_set_window.patch
+70-relibtoolize.patch

Modified: experimental/libquicktime/debian/rules
URL: http://svn.debian.org/wsvn/pkg-multimedia/experimental/libquicktime/debian/rules?rev=1588&op=diff
==============================================================================
--- experimental/libquicktime/debian/rules (original)
+++ experimental/libquicktime/debian/rules Thu Nov 27 10:32:52 2008
@@ -2,7 +2,7 @@
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/autotools.mk
-include /usr/share/cdbs/1/rules/dpatch.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 
 VERSION := `dpkg-parsechangelog | grep 'Version: '| sed 's/Version: //g' | cut -d ':' -f 2 | cut -d '+' -f 1`

More information about the pkg-multimedia-commits mailing list