r1037 - in /unstable/libquicktime/debian: changelog control patches/20-deprecated-headers.dpatch patches/21-export-quicktime_set_window.dpatch rules

fabian-guest at users.alioth.debian.org fabian-guest at users.alioth.debian.org
Sun Jan 20 16:50:05 UTC 2008


Author: fabian-guest
Date: Sun Jan 20 16:50:04 2008
New Revision: 1037

URL: http://svn.debian.org/wsvn/pkg-multimedia/?sc=1&rev=1037
Log:
Uploaded new tarballs/libquicktime_1.0.2+debian.orig.tar.gz (forgot to rename the source directory to libquicktime-1.0.2+debian in the last upload).
Checked installed header files: No API changes relative to 1.0.0.
No additional dependencies for libquicktime-dev due to the enabled alsa plugin.

* debian/control:
+ Added libasound2-dev to the build-deps for supported architectures to enable the ALSA plugin.
* debian/changelog:
+ Added debian/patches/03-spurious-files-in-potfiles-in.dpatch to the list of updated patches.
* debian/rules:
+ Added a test to disable the ALSA plugin on unsupported architectures.
+ Added a get-orig-source rule to document how to generate a tarball suitable for Debian.
* debian/patches/20-deprecated-headers.dpatch, debian/patches/21-export-quicktime_set_window.dpatch:
+ Reverted noop changes from the last commit.

Modified:
    unstable/libquicktime/debian/changelog
    unstable/libquicktime/debian/control
    unstable/libquicktime/debian/patches/20-deprecated-headers.dpatch
    unstable/libquicktime/debian/patches/21-export-quicktime_set_window.dpatch
    unstable/libquicktime/debian/rules

Modified: unstable/libquicktime/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-multimedia/unstable/libquicktime/debian/changelog?rev=1037&op=diff
==============================================================================
--- unstable/libquicktime/debian/changelog (original)
+++ unstable/libquicktime/debian/changelog Sun Jan 20 16:50:04 2008
@@ -10,15 +10,19 @@
 
   [ Fabian Greffrath ]
   * New upstream release.
+    + No API changes relative to 1.0.0.
     + Fixes typos in lqtplay manpage (Closes: #449092).
   * Rebuilt upstream tarball without debian/ directory.
 
   * debian/control:
-    + Added libswscale-dev to the build-deps to enable libswscale plugin.
+    + Added libasound2-dev to the build-deps for supported architectures
+      to enable the ALSA plugin.
+    + Added libswscale-dev to the build-deps to enable the libswscale plugin.
     + Added Homepage: field to header, removed from package descriptions.
     + Bumped Standards-Version to 3.7.3.
   * 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,
     debian/patches/00list:
     + Updated.
@@ -28,7 +32,9 @@
   * debian/patches/60_gtk212-tooltip.dpatch:
     + Dropped, fixed upstream.
   * debian/rules:
-    + Explicitely disabled build with ALSA library.
+    + Added a test to disable the ALSA plugin on unsupported architectures.
+    + Added a get-orig-source rule to document how to generate a tarball
+      suitable for Debian.
     + Patch before clean, unpatch after clean.
     + Do not ignore make clean errors.
 

Modified: unstable/libquicktime/debian/control
URL: http://svn.debian.org/wsvn/pkg-multimedia/unstable/libquicktime/debian/control?rev=1037&op=diff
==============================================================================
--- unstable/libquicktime/debian/control (original)
+++ unstable/libquicktime/debian/control Sun Jan 20 16:50:04 2008
@@ -9,6 +9,7 @@
 Build-Depends: debhelper (>= 5),
                dpatch,
                autotools-dev,
+               libasound2-dev [!hurd-i386 !kfreebsd-amd64 !kfreebsd-i386],
                libavc1394-dev [!hurd-i386 !kfreebsd-amd64 !kfreebsd-i386],
                libavcodec-dev,
                libdv4-dev,

Modified: unstable/libquicktime/debian/patches/20-deprecated-headers.dpatch
URL: http://svn.debian.org/wsvn/pkg-multimedia/unstable/libquicktime/debian/patches/20-deprecated-headers.dpatch?rev=1037&op=diff
==============================================================================
--- unstable/libquicktime/debian/patches/20-deprecated-headers.dpatch (original)
+++ unstable/libquicktime/debian/patches/20-deprecated-headers.dpatch Sun Jan 20 16:50:04 2008
@@ -3,9 +3,10 @@
 ## DP: Avoid inclusion of deprecated headers.
 
 @DPATCH@
-diff -urNad libquicktime-1.0.2~/include/quicktime/lqt_codecapi.h libquicktime-1.0.2/include/quicktime/lqt_codecapi.h
---- libquicktime-1.0.2~/include/quicktime/lqt_codecapi.h	2007-03-19 18:23:33.000000000 +0100
-+++ libquicktime-1.0.2/include/quicktime/lqt_codecapi.h	2008-01-15 13:39:01.000000000 +0100
+
+diff -Naru libquicktime-1.0.0.orig/include/quicktime/lqt_codecapi.h libquicktime-1.0.0/include/quicktime/lqt_codecapi.h
+--- libquicktime-1.0.0.orig/include/quicktime/lqt_codecapi.h	2007-03-19 18:23:33.000000000 +0100
++++ libquicktime-1.0.0/include/quicktime/lqt_codecapi.h	2007-07-18 10:02:50.000000000 +0200
 @@ -22,8 +22,8 @@
   Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  *******************************************************************************/
@@ -17,9 +18,9 @@
  
  /*
   *  Return the codec api version. This function will be defined in every
-diff -urNad libquicktime-1.0.2~/lqt.m4 libquicktime-1.0.2/lqt.m4
---- libquicktime-1.0.2~/lqt.m4	2005-01-09 23:50:53.000000000 +0100
-+++ libquicktime-1.0.2/lqt.m4	2008-01-15 13:39:01.000000000 +0100
+diff -Naru libquicktime-1.0.0.orig/lqt.m4 libquicktime-1.0.0/lqt.m4
+--- libquicktime-1.0.0.orig/lqt.m4	2005-01-09 23:50:53.000000000 +0100
++++ libquicktime-1.0.0/lqt.m4	2007-07-18 10:02:19.000000000 +0200
 @@ -84,7 +84,7 @@
  #include <stdio.h>
  #include <stdlib.h>

Modified: unstable/libquicktime/debian/patches/21-export-quicktime_set_window.dpatch
URL: http://svn.debian.org/wsvn/pkg-multimedia/unstable/libquicktime/debian/patches/21-export-quicktime_set_window.dpatch?rev=1037&op=diff
==============================================================================
--- unstable/libquicktime/debian/patches/21-export-quicktime_set_window.dpatch (original)
+++ unstable/libquicktime/debian/patches/21-export-quicktime_set_window.dpatch Sun Jan 20 16:50:04 2008
@@ -3,9 +3,10 @@
 ## DP: Export the quicktime_set_window function.
 
 @DPATCH@
-diff -urNad libquicktime-1.0.2~/include/quicktime/quicktime.h libquicktime-1.0.2/include/quicktime/quicktime.h
---- libquicktime-1.0.2~/include/quicktime/quicktime.h	2007-02-14 12:40:53.000000000 +0100
-+++ libquicktime-1.0.2/include/quicktime/quicktime.h	2008-01-15 13:39:18.000000000 +0100
+
+diff -Naru libquicktime-1.0.0.orig/include/quicktime/quicktime.h libquicktime-1.0.0/include/quicktime/quicktime.h
+--- libquicktime-1.0.0.orig/include/quicktime/quicktime.h	2007-02-14 12:40:53.000000000 +0100
++++ libquicktime-1.0.0/include/quicktime/quicktime.h	2007-07-18 14:31:39.000000000 +0200
 @@ -1041,6 +1041,9 @@
  
  int quicktime_set_video_position(quicktime_t *file, int64_t frame, int track);

Modified: unstable/libquicktime/debian/rules
URL: http://svn.debian.org/wsvn/pkg-multimedia/unstable/libquicktime/debian/rules?rev=1037&op=diff
==============================================================================
--- unstable/libquicktime/debian/rules (original)
+++ unstable/libquicktime/debian/rules Sun Jan 20 16:50:04 2008
@@ -2,6 +2,7 @@
 
 include /usr/share/dpatch/dpatch.make
 
+DEB_HOST_ARCH_OS    ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
 DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 
@@ -10,14 +11,25 @@
 configure_flags := \
 	--prefix=/usr \
 	--mandir=\$${prefix}/share/man \
-	--enable-gpl \
-	--without-alsa
+	--enable-gpl	
 
 ifeq ($(DEB_BUILD_GNU_TYPE),$(DEB_HOST_GNU_TYPE))
 configure_flags += --host=$(DEB_HOST_GNU_TYPE)
 else
 configure_flags += --build=$(DEB_BUILD_GNU_TYPE) --host=$(DEB_HOST_GNU_TYPE)
 endif
+
+# Linux specific flags
+ifneq ($(DEB_HOST_ARCH_OS),linux)
+	configure_flags += --without-alsa
+endif
+
+get-orig-source:
+	wget http://downloads.sourceforge.net/libquicktime/libquicktime-1.0.2.tar.gz
+	tar xzf libquicktime-1.0.2.tar.gz
+	rm -rf libquicktime-1.0.2/debian/
+	mv libquicktime-1.0.2 libquicktime-1.0.2+debian
+	tar czf libquicktime_1.0.2+debian.orig.tar.gz libquicktime-1.0.2+debian/
 
 config.status: patch-stamp configure
 	dh_testdir




More information about the pkg-multimedia-commits mailing list