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

fabian-guest at users.alioth.debian.org fabian-guest at users.alioth.debian.org
Thu Jul 31 14:58:26 UTC 2008


Author: fabian-guest
Date: Thu Jul 31 14:58:26 2008
New Revision: 1331

URL: http://svn.debian.org/wsvn/pkg-multimedia/?sc=1&rev=1331
Log:
libquicktime (2:1.0.3+debian-1) experimental; urgency=low

* New upstream release.
* Rebuilt upstream tarball without debian/ directory.
* Targeted at experimental due to the Lenny freeze.

* debian/patches/01-debian-directory.dpatch,
debian/patches/02-install-in-libquicktime1.dpatch,
debian/patches/03-spurious-files-in-potfiles-in.dpatch,
debian/patches/70_relibtoolize.dpatch:
+ Updated.
* debian/patches/06-lqt-config-cflags.dpatch:
+ Removed, fixed upstream.
* debian/rules:
+ Built '--with-libdv'.


Added:
    experimental/libquicktime/
    experimental/libquicktime/debian/   (props changed)
      - copied from r1316, unstable/libquicktime/debian/
Removed:
    experimental/libquicktime/debian/patches/06-lqt-config-cflags.dpatch
Modified:
    experimental/libquicktime/debian/changelog
    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/70_relibtoolize.dpatch
    experimental/libquicktime/debian/rules

Propchange: experimental/libquicktime/debian/
------------------------------------------------------------------------------
    mergeWithUpstream = 1

Propchange: experimental/libquicktime/debian/
------------------------------------------------------------------------------
    svn-bp:tagsUrl = svn+ssh://svn.debian.org/svn/pkg-multimedia/tags/libquicktime

Propchange: experimental/libquicktime/debian/
------------------------------------------------------------------------------
    svn:mergeinfo = 

Modified: experimental/libquicktime/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-multimedia/experimental/libquicktime/debian/changelog?rev=1331&op=diff
==============================================================================
--- experimental/libquicktime/debian/changelog (original)
+++ experimental/libquicktime/debian/changelog Thu Jul 31 14:58:26 2008
@@ -1,3 +1,21 @@
+libquicktime (2:1.0.3+debian-1) experimental; urgency=low
+
+  * New upstream release.
+  * Rebuilt upstream tarball without debian/ directory.
+  * Targeted at experimental due to the Lenny freeze.
+
+  * debian/patches/01-debian-directory.dpatch,
+    debian/patches/02-install-in-libquicktime1.dpatch,
+    debian/patches/03-spurious-files-in-potfiles-in.dpatch,
+    debian/patches/70_relibtoolize.dpatch:
+    + Updated.
+  * debian/patches/06-lqt-config-cflags.dpatch:
+    + Removed, fixed upstream.
+  * debian/rules:
+    + Built '--with-libdv'.
+
+ -- Fabian Greffrath <fabian at debian-unofficial.org>  Thu, 31 Jul 2008 16:27:00 +0100
+
 libquicktime (2:1.0.2+debian-2) unstable; urgency=medium
 
   [ Fabian Greffrath ]

Modified: experimental/libquicktime/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-multimedia/experimental/libquicktime/debian/patches/00list?rev=1331&op=diff
==============================================================================
--- experimental/libquicktime/debian/patches/00list (original)
+++ experimental/libquicktime/debian/patches/00list Thu Jul 31 14:58:26 2008
@@ -1,7 +1,6 @@
 01-debian-directory
 02-install-in-libquicktime1
 03-spurious-files-in-potfiles-in
-06-lqt-config-cflags
 20-deprecated-headers
 21-export-quicktime_set_window
 70_relibtoolize

Modified: experimental/libquicktime/debian/patches/01-debian-directory.dpatch
URL: http://svn.debian.org/wsvn/pkg-multimedia/experimental/libquicktime/debian/patches/01-debian-directory.dpatch?rev=1331&op=diff
==============================================================================
--- experimental/libquicktime/debian/patches/01-debian-directory.dpatch (original)
+++ experimental/libquicktime/debian/patches/01-debian-directory.dpatch Thu Jul 31 14:58:26 2008
@@ -4,10 +4,10 @@
 ## DP: Rebuild upstream-tarball without debian-directory.
 
 @DPATCH@
-diff -urNad libquicktime-1.0.2~/Makefile.am libquicktime-1.0.2/Makefile.am
---- libquicktime-1.0.2~/Makefile.am	2008-01-15 13:22:43.000000000 +0100
-+++ libquicktime-1.0.2/Makefile.am	2008-01-15 13:23:44.000000000 +0100
-@@ -19,7 +19,6 @@
+diff -urNad libquicktime-1.0.3~/Makefile.am libquicktime-1.0.3/Makefile.am
+--- libquicktime-1.0.3~/Makefile.am	2008-07-31 15:11:56.000000000 +0200
++++ libquicktime-1.0.3/Makefile.am	2008-07-31 15:12:30.000000000 +0200
+@@ -25,7 +25,6 @@
  
  
  DIST_SUBDIRS= \
@@ -15,13 +15,13 @@
  doc \
  src \
  include \
-diff -urNad libquicktime-1.0.2~/configure.ac libquicktime-1.0.2/configure.ac
---- libquicktime-1.0.2~/configure.ac	2008-01-15 13:22:43.000000000 +0100
-+++ libquicktime-1.0.2/configure.ac	2008-01-15 13:23:44.000000000 +0100
-@@ -823,7 +823,6 @@
- libquicktime.spec \
+diff -urNad libquicktime-1.0.3~/configure.ac libquicktime-1.0.3/configure.ac
+--- libquicktime-1.0.3~/configure.ac	2008-07-31 15:11:56.000000000 +0200
++++ libquicktime-1.0.3/configure.ac	2008-07-31 15:16:08.000000000 +0200
+@@ -864,7 +864,6 @@
  libquicktime.pc \
  doc/Makefile \
+ doc/Doxyfile \
 -debian/Makefile \
  src/Makefile \
  include/Makefile \

Modified: experimental/libquicktime/debian/patches/02-install-in-libquicktime1.dpatch
URL: http://svn.debian.org/wsvn/pkg-multimedia/experimental/libquicktime/debian/patches/02-install-in-libquicktime1.dpatch?rev=1331&op=diff
==============================================================================
--- experimental/libquicktime/debian/patches/02-install-in-libquicktime1.dpatch (original)
+++ experimental/libquicktime/debian/patches/02-install-in-libquicktime1.dpatch Thu Jul 31 14:58:26 2008
@@ -4,19 +4,19 @@
 ## DP: Install plugins in /usr/lib/libquicktime1, not /usr/lib/libquicktime
 
 @DPATCH@
-diff -urNad libquicktime-1.0.2~/configure.ac libquicktime-1.0.2/configure.ac
---- libquicktime-1.0.2~/configure.ac	2008-01-15 13:25:36.000000000 +0100
-+++ libquicktime-1.0.2/configure.ac	2008-01-15 13:25:37.000000000 +0100
+diff -urNad libquicktime-1.0.3~/configure.ac libquicktime-1.0.3/configure.ac
+--- libquicktime-1.0.3~/configure.ac	2008-07-31 15:20:34.000000000 +0200
++++ libquicktime-1.0.3/configure.ac	2008-07-31 15:20:37.000000000 +0200
 @@ -1,5 +1,5 @@
  AC_INIT(src/lqt_quicktime.c)
--AM_INIT_AUTOMAKE(libquicktime, 1.0.2)
-+AM_INIT_AUTOMAKE(libquicktime1, 1.0.2)
+-AM_INIT_AUTOMAKE(libquicktime, 1.0.3)
++AM_INIT_AUTOMAKE(libquicktime1, 1.0.3)
  
  LQT_VERSION=$VERSION
  
-diff -urNad libquicktime-1.0.2~/src/Makefile.am libquicktime-1.0.2/src/Makefile.am
---- libquicktime-1.0.2~/src/Makefile.am	2008-01-15 13:22:43.000000000 +0100
-+++ libquicktime-1.0.2/src/Makefile.am	2008-01-15 13:25:37.000000000 +0100
+diff -urNad libquicktime-1.0.3~/src/Makefile.am libquicktime-1.0.3/src/Makefile.am
+--- libquicktime-1.0.3~/src/Makefile.am	2008-07-31 15:18:53.000000000 +0200
++++ libquicktime-1.0.3/src/Makefile.am	2008-07-31 15:20:37.000000000 +0200
 @@ -9,7 +9,7 @@
  #
  libquicktime_la_LIBADD = @ICONV_LIBS@ @LTLIBINTL@

Modified: experimental/libquicktime/debian/patches/03-spurious-files-in-potfiles-in.dpatch
URL: http://svn.debian.org/wsvn/pkg-multimedia/experimental/libquicktime/debian/patches/03-spurious-files-in-potfiles-in.dpatch?rev=1331&op=diff
==============================================================================
--- experimental/libquicktime/debian/patches/03-spurious-files-in-potfiles-in.dpatch (original)
+++ experimental/libquicktime/debian/patches/03-spurious-files-in-potfiles-in.dpatch Thu Jul 31 14:58:26 2008
@@ -4,9 +4,9 @@
 ## DP: Remove include/cmodel_default.h and utils/recover.c from POTFILES.in
 
 @DPATCH@
-diff -urNad libquicktime-1.0.2~/po/POTFILES.in libquicktime-1.0.2/po/POTFILES.in
---- libquicktime-1.0.2~/po/POTFILES.in	2008-01-08 23:00:45.000000000 +0100
-+++ libquicktime-1.0.2/po/POTFILES.in	2008-01-15 13:32:29.000000000 +0100
+diff -urNad libquicktime-1.0.3~/po/POTFILES.in libquicktime-1.0.3/po/POTFILES.in
+--- libquicktime-1.0.3~/po/POTFILES.in	2008-07-31 15:45:41.000000000 +0200
++++ libquicktime-1.0.3/po/POTFILES.in	2008-07-31 15:47:11.000000000 +0200
 @@ -106,7 +106,6 @@
  utils/lqtplay.c
  utils/dump.c
@@ -15,11 +15,3 @@
  utils/dechunk.c
  utils/dump_codecs.c
  utils/gtk/libquicktime_config.c
-@@ -173,7 +172,6 @@
- include/quicktime/lqt_codecinfo.h
- include/quicktime/qtprivate.h
- include/quicktime/lqt_codecapi.h
--include/cmodel_default.h
- include/lqt_codecfile.h
- include/colorspace_tables.h
- include/lqt_private.h

Modified: experimental/libquicktime/debian/patches/70_relibtoolize.dpatch
URL: http://svn.debian.org/wsvn/pkg-multimedia/experimental/libquicktime/debian/patches/70_relibtoolize.dpatch?rev=1331&op=diff
==============================================================================
--- experimental/libquicktime/debian/patches/70_relibtoolize.dpatch (original)
+++ experimental/libquicktime/debian/patches/70_relibtoolize.dpatch Thu Jul 31 14:58:26 2008
@@ -10,10 +10,10 @@
 ## DP: and by excluding config.guess and .sub from the patch
 
 @DPATCH@
-diff -urNad libquicktime-1.0.2~/Makefile.in libquicktime-1.0.2/Makefile.in
---- libquicktime-1.0.2~/Makefile.in	2008-01-08 23:00:57.000000000 +0100
-+++ libquicktime-1.0.2/Makefile.in	2008-01-15 13:56:35.000000000 +0100
-@@ -290,7 +290,6 @@
+diff -urNad libquicktime-1.0.3~/Makefile.in libquicktime-1.0.3/Makefile.in
+--- libquicktime-1.0.3~/Makefile.in	2008-07-01 22:36:00.000000000 +0200
++++ libquicktime-1.0.3/Makefile.in	2008-07-31 16:11:09.000000000 +0200
+@@ -292,7 +292,6 @@
  m4datadir = $(datadir)/aclocal
  m4data_DATA = lqt.m4
  DIST_SUBDIRS = \
@@ -21,63 +21,63 @@
  doc \
  src \
  include \
-diff -urNad libquicktime-1.0.2~/aclocal.m4 libquicktime-1.0.2/aclocal.m4
---- libquicktime-1.0.2~/aclocal.m4	2008-01-08 23:00:51.000000000 +0100
-+++ libquicktime-1.0.2/aclocal.m4	2008-01-15 13:56:24.000000000 +0100
-@@ -18,7 +18,7 @@
+diff -urNad libquicktime-1.0.3~/aclocal.m4 libquicktime-1.0.3/aclocal.m4
+--- libquicktime-1.0.3~/aclocal.m4	2008-07-01 22:35:54.000000000 +0200
++++ libquicktime-1.0.3/aclocal.m4	2008-07-31 16:10:37.000000000 +0200
+@@ -21,7 +21,7 @@
  
  # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
  
--# serial 51 Debian 1.5.24-1ubuntu1 AC_PROG_LIBTOOL
-+# serial 51 Debian 1.5.24-2 AC_PROG_LIBTOOL
+-# 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)
-diff -urNad libquicktime-1.0.2~/configure libquicktime-1.0.2/configure
---- libquicktime-1.0.2~/configure	2008-01-08 23:00:53.000000000 +0100
-+++ libquicktime-1.0.2/configure	2008-01-15 13:56:29.000000000 +0100
-@@ -2439,7 +2439,7 @@
+diff -urNad libquicktime-1.0.3~/configure libquicktime-1.0.3/configure
+--- libquicktime-1.0.3~/configure	2008-07-01 22:35:56.000000000 +0200
++++ libquicktime-1.0.3/configure	2008-07-31 16:10:51.000000000 +0200
+@@ -2440,7 +2440,7 @@
  
  
  # Define the identity of the package.
 - PACKAGE=libquicktime
 + PACKAGE=libquicktime1
-  VERSION=1.0.2
+  VERSION=1.0.3
  
  
-@@ -28894,7 +28894,7 @@
+@@ -29554,7 +29554,7 @@
  
  
  
--ac_config_files="$ac_config_files Makefile po/Makefile.in libquicktime.spec libquicktime.pc doc/Makefile 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 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 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"
  
-@@ -29616,7 +29616,6 @@
-     "libquicktime.spec") CONFIG_FILES="$CONFIG_FILES libquicktime.spec" ;;
+@@ -30291,7 +30291,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" ;;
-diff -urNad libquicktime-1.0.2~/ltmain.sh libquicktime-1.0.2/ltmain.sh
---- libquicktime-1.0.2~/ltmain.sh	2007-08-14 20:05:31.000000000 +0200
-+++ libquicktime-1.0.2/ltmain.sh	2007-11-27 22:23:09.000000000 +0100
+diff -urNad libquicktime-1.0.3~/ltmain.sh libquicktime-1.0.3/ltmain.sh
+--- libquicktime-1.0.3~/ltmain.sh	2008-02-08 01:57:47.000000000 +0100
++++ libquicktime-1.0.3/ltmain.sh	2008-04-29 23:33:55.000000000 +0200
 @@ -43,7 +43,7 @@
  
  PROGRAM=ltmain.sh
  PACKAGE=libtool
--VERSION="1.5.24 Debian 1.5.24-1ubuntu1"
-+VERSION="1.5.24 Debian 1.5.24-2"
- TIMESTAMP=" (1.1220.2.456 2007/06/24 02:25:32)"
+-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).
-diff -urNad libquicktime-1.0.2~/src/Makefile.in libquicktime-1.0.2/src/Makefile.in
---- libquicktime-1.0.2~/src/Makefile.in	2008-01-08 23:00:57.000000000 +0100
-+++ libquicktime-1.0.2/src/Makefile.in	2008-01-15 13:56:35.000000000 +0100
-@@ -305,7 +305,7 @@
+diff -urNad libquicktime-1.0.3~/src/Makefile.in libquicktime-1.0.3/src/Makefile.in
+--- libquicktime-1.0.3~/src/Makefile.in	2008-07-01 22:36:00.000000000 +0200
++++ libquicktime-1.0.3/src/Makefile.in	2008-07-31 16:11:08.000000000 +0200
+@@ -304,7 +304,7 @@
  # Maybe we need zlib to read compressed quicktime headers
  #
  libquicktime_la_LIBADD = @ICONV_LIBS@ @LTLIBINTL@

Modified: experimental/libquicktime/debian/rules
URL: http://svn.debian.org/wsvn/pkg-multimedia/experimental/libquicktime/debian/rules?rev=1331&op=diff
==============================================================================
--- experimental/libquicktime/debian/rules (original)
+++ experimental/libquicktime/debian/rules Thu Jul 31 14:58:26 2008
@@ -6,7 +6,7 @@
 
 VERSION := `dpkg-parsechangelog | grep 'Version: '| sed 's/Version: //g' | cut -d ':' -f 2 | cut -d '+' -f 1`
 
-DEB_CONFIGURE_EXTRA_FLAGS += --enable-gpl
+DEB_CONFIGURE_EXTRA_FLAGS += --enable-gpl --with-libdv
 
 DEB_DH_INSTALL_SOURCEDIR := debian/tmp
 




More information about the pkg-multimedia-commits mailing list