r1616 - in /unstable/libquicktime/debian: ./ patches/

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sun Feb 22 14:48:33 UTC 2009 

Author: siretart
Date: Sun Feb 22 14:48:33 2009
New Revision: 1616

URL: http://svn.debian.org/wsvn/pkg-multimedia/?sc=1&rev=1616
Log:
merge from the experimental branch


Added:
    unstable/libquicktime/debian/README.source
      - copied unchanged from r1615, experimental/libquicktime/debian/README.source
    unstable/libquicktime/debian/libquicktime-doc.docs
      - copied unchanged from r1615, experimental/libquicktime/debian/libquicktime-doc.docs
    unstable/libquicktime/debian/patches/01-debian-directory.patch
      - copied unchanged from r1615, experimental/libquicktime/debian/patches/01-debian-directory.patch
    unstable/libquicktime/debian/patches/02-install-in-libquicktime1.patch
      - copied unchanged from r1615, experimental/libquicktime/debian/patches/02-install-in-libquicktime1.patch
    unstable/libquicktime/debian/patches/03-spurious-files-in-potfiles-in.patch
      - copied unchanged from r1615, experimental/libquicktime/debian/patches/03-spurious-files-in-potfiles-in.patch
    unstable/libquicktime/debian/patches/20-deprecated-headers.patch
      - copied unchanged from r1615, experimental/libquicktime/debian/patches/20-deprecated-headers.patch
    unstable/libquicktime/debian/patches/21-export-quicktime_set_window.patch
      - copied unchanged from r1615, experimental/libquicktime/debian/patches/21-export-quicktime_set_window.patch
    unstable/libquicktime/debian/patches/70-relibtoolize.patch
      - copied unchanged from r1615, experimental/libquicktime/debian/patches/70-relibtoolize.patch
    unstable/libquicktime/debian/patches/series
      - copied unchanged from r1615, experimental/libquicktime/debian/patches/series
Removed:
    unstable/libquicktime/debian/docs
    unstable/libquicktime/debian/patches/00list
    unstable/libquicktime/debian/patches/01-debian-directory.dpatch
    unstable/libquicktime/debian/patches/02-install-in-libquicktime1.dpatch
    unstable/libquicktime/debian/patches/03-spurious-files-in-potfiles-in.dpatch
    unstable/libquicktime/debian/patches/20-deprecated-headers.dpatch
    unstable/libquicktime/debian/patches/21-export-quicktime_set_window.dpatch
    unstable/libquicktime/debian/patches/70_relibtoolize.dpatch
Modified:
    unstable/libquicktime/debian/   (props changed)
    unstable/libquicktime/debian/changelog
    unstable/libquicktime/debian/control
    unstable/libquicktime/debian/copyright
    unstable/libquicktime/debian/libquicktime-dev.install
    unstable/libquicktime/debian/libquicktime1.install
    unstable/libquicktime/debian/libquicktime1.shlibs
    unstable/libquicktime/debian/quicktime-utils.install
    unstable/libquicktime/debian/quicktime-x11utils.install
    unstable/libquicktime/debian/rules
    unstable/libquicktime/debian/watch

Propchange: unstable/libquicktime/debian/
------------------------------------------------------------------------------
--- bzr:file-ids (added)
+++ bzr:file-ids Sun Feb 22 14:48:33 2009
@@ -1,0 +1,1 @@
+changelog	1331 at 49b7e9ba-2410-0410-beda-b1d44d574104:experimental%2Flibquicktime%2Fdebian:changelog

Propchange: unstable/libquicktime/debian/
------------------------------------------------------------------------------
--- bzr:revision-id:v3-single1-ZXhwZXJpbWVudGFsL2xpYnF1aWNrdGltZS9kZWJpYW4. (added)
+++ bzr:revision-id:v3-single1-ZXhwZXJpbWVudGFsL2xpYnF1aWNrdGltZS9kZWJpYW4. Sun Feb 22 14:48:33 2009
@@ -1,0 +1,2 @@
+3 siretart at tauware.de-20080804132422-yesbblbezrb7215q
+7 siretart at tauware.de-20080818112910-zs6zd6f96a13tl7c

Propchange: unstable/libquicktime/debian/
------------------------------------------------------------------------------
--- bzr:revision-info (added)
+++ bzr:revision-info Sun Feb 22 14:48:33 2009
@@ -1,0 +1,4 @@
+timestamp: 2008-08-18 13:29:10.979000092 +0200
+committer: Reinhard Tartler <siretart at tauware.de>
+properties: 
+	branch-nick: libquicktime.debian.experimental

Propchange: unstable/libquicktime/debian/
------------------------------------------------------------------------------
    bzr:text-parents = 

Modified: unstable/libquicktime/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-multimedia/unstable/libquicktime/debian/changelog?rev=1616&op=diff
==============================================================================
--- unstable/libquicktime/debian/changelog (original)
+++ unstable/libquicktime/debian/changelog Sun Feb 22 14:48:33 2009
@@ -1,3 +1,90 @@
+libquicktime (2:1.1.1+debian-1) unstable; urgency=low
+
+  * Upload to unstable.
+  * New upstream release.
+  * Rebuilt upstream tarball without debian/ directory.
+  * debian/patches/01-debian-directory.patch,
+    debian/patches/02-install-in-libquicktime1.patch,
+    debian/patches/70-relibtoolize.patch:
+    + Refreshed.
+
+  * debian/*.install:
+    + Simplified, removed leading "/" and trailing "/*".
+  * debian/docs:
+    + Removed, README and TODO get installed by cdbs anyway.
+  * debian/rules:
+    + Replaced package version detection with a more sophisticated algorithm.
+    + Simplified by doing autodetection of headers:
+      - faac.h
+      - lame/lame.h
+      - x264.h
+      Also removed the setting externalcodecs from DEB_BUILD_OPTIONS. The codecs
+      will be enabled as soon as the headers are installed on the filesystem,
+      so there is no need in enabling that separately.
+    + Both changes taken from the ffmpeg-debian package.
+    + Improved get-orig-source rule to not blindly assume an existing
+      "../tarballs" directory.
+  * debian/watch:
+    + Removed spurious comments and correctly cited dversionmangle option.
+
+ -- Fabian Greffrath <fabian at debian-unofficial.org>  Mon, 16 Feb 2009 13:48:03 +0100
+
+libquicktime (2:1.1.0+debian-1) experimental; 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.
+  * debian/libquicktime1.shlibs:
+    + Bumped to (>= 2:1.1.0+debian) due to API additions.
+
+ -- Fabian Greffrath <fabian at debian-unofficial.org>  Fri, 28 Nov 2008 08:57:11 +0100
+
+libquicktime (2:1.0.3+debian-2) experimental; urgency=low
+
+  * debian/control:
+    + Introduced new package "libquicktime-doc" that contains the html
+      documentation of the libquicktime API.
+    + Made libquicktime-dev recommend libquicktime-doc.
+  * debian/copyright:
+    + Changed to use the "©" symbol instead of "Copyright (C)".
+  * debian/libquicktime-docs, debian/rules:
+    + Moved documentation from libquicktime-dev to libquicktime-doc.
+  * debian/rules:
+    + Introduced the "externalcodecs" keyword as in the ffmpeg-debian packages.
+      Set this in DEB_BUILD_OPTIONS to enable support for additional codecs via
+      external libraries.
+  * debian/watch:
+    + Mangled version to remove the "+debian" string.
+
+ -- Fabian Greffrath <fabian at debian-unofficial.org>  Mon, 11 Aug 2008 11:30:00 +0100
+
+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/libquicktime1.shlibs:
+    + Bumped to (>= 2:1.0.3+debian) due to API additions.
+  * 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>  Fri,  1 Aug 2008 11:04:00 +0100
+
 libquicktime (2:1.0.2+debian-2) unstable; urgency=medium
 
   [ Fabian Greffrath ]

Modified: unstable/libquicktime/debian/control
URL: http://svn.debian.org/wsvn/pkg-multimedia/unstable/libquicktime/debian/control?rev=1616&op=diff
==============================================================================
--- unstable/libquicktime/debian/control (original)
+++ unstable/libquicktime/debian/control Sun Feb 22 14:48:33 2009
@@ -5,11 +5,11 @@
 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],
                libavc1394-dev [!hurd-i386 !kfreebsd-amd64 !kfreebsd-i386],
                libavcodec-dev,
@@ -25,9 +25,10 @@
                libvorbis-dev,
                libxaw7-dev,
                libxv-dev,
-               libgl1-mesa-dev | libgl-dev
-XS-Vcs-Svn: svn://svn.debian.org/pkg-multimedia/experimental/libquicktime
-XS-Vcs-Browser: http://svn.debian.org/wsvn/pkg-multimedia/experimental/libquicktime/
+               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/
 
 Package: libquicktime1
@@ -49,6 +50,7 @@
          ${misc:Depends},
          libgl1-mesa-dev | libgl-dev,
          zlib1g-dev
+Recommends: libquicktime-doc
 Description: library for reading and writing Quicktime files (development)
  libquicktime is a library for reading and writing QuickTime files on UNIX
  systems. Video CODECs supported by this library are OpenDivX, MJPA, JPEG Photo,
@@ -56,6 +58,18 @@
  Vorbis, IMA4, ulaw, and any linear PCM format.
  .
  This package contains the development files.
+
+Package: libquicktime-doc
+Section: doc
+Architecture: all
+Depends: ${misc:Depends}
+Description: library for reading and writing Quicktime files (documentation)
+ libquicktime is a library for reading and writing QuickTime files on UNIX
+ systems. Video CODECs supported by this library are OpenDivX, MJPA, JPEG Photo,
+ PNG, RGB, YUV 4:2:2, and YUV 4:2:0 compression. Supported audio CODECs are Ogg
+ Vorbis, IMA4, ulaw, and any linear PCM format.
+ .
+ This package contains the html documentation of the libquicktime API.
 
 Package: quicktime-utils
 Section: utils

Modified: unstable/libquicktime/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-multimedia/unstable/libquicktime/debian/copyright?rev=1616&op=diff
==============================================================================
--- unstable/libquicktime/debian/copyright (original)
+++ unstable/libquicktime/debian/copyright Sun Feb 22 14:48:33 2009
@@ -3,7 +3,7 @@
 
 It was downloaded from <http://libquicktime.sourceforge.net/>.
 
-Upstream Authors: 
+Upstream Authors:
 
 	Original quicktime4linux developer:
 
@@ -22,25 +22,25 @@
 
 Copyright:
 
-	Copyright (C) 2002 Heroine Virtual Ltd.
-	Copyright (C) 2002-2006 Members of the libquicktime project.
+	© 2002, Heroine Virtual Ltd.
+	© 2002-2006, Members of the libquicktime project
 
 	RTjpeg:
 
-	  Copyright (C) Justin Schoeman 1998 <justin at suntiger.ee.up.ac.za>
+	  © 1998, Justin Schoeman <justin at suntiger.ee.up.ac.za>
 
 	   With modifications by:
 
-	  Copyright (C) 1998, 1999 by Joerg Walter <trouble at moes.pmnet.uni-oldenburg.de>
-	  Copyright (C) 1999 by Wim Taymans <wim.taymans at tvd.be>
+	  © 1998-1999, Joerg Walter <trouble at moes.pmnet.uni-oldenburg.de>
+	  © 1999, Wim Taymans <wim.taymans at tvd.be>
 
 	Portions from FFmpeg (plugins/rtjpeg/mmx.h):
 
-	  Copyright (C) 1997-2001 H. Dietz and R. Fisher
+	  © 1997-2001, H. Dietz and R. Fisher
 
 	Portions from libsndfile (plugins/audiocodec/alaw_tables.h, ulaw_tables.h):
 
-	  Copyright (C) 2002-2004 Erik de Castro Lopo
+	  © 2002-2004, Erik de Castro Lopo
 
 	This library is free software; you can redistribute it and/or modify it under
 	the terms of the GNU Lesser General Public License as published by the Free

Modified: unstable/libquicktime/debian/libquicktime-dev.install
URL: http://svn.debian.org/wsvn/pkg-multimedia/unstable/libquicktime/debian/libquicktime-dev.install?rev=1616&op=diff
==============================================================================
--- unstable/libquicktime/debian/libquicktime-dev.install (original)
+++ unstable/libquicktime/debian/libquicktime-dev.install Sun Feb 22 14:48:33 2009
@@ -1,5 +1,5 @@
-/usr/bin/lqt-config
-/usr/include/*
-/usr/lib/*.so
-/usr/lib/pkgconfig/*
-/usr/share/aclocal/*
+usr/bin/lqt-config
+usr/include
+usr/lib/*.so
+usr/lib/pkgconfig
+usr/share/aclocal

Modified: unstable/libquicktime/debian/libquicktime1.install
URL: http://svn.debian.org/wsvn/pkg-multimedia/unstable/libquicktime/debian/libquicktime1.install?rev=1616&op=diff
==============================================================================
--- unstable/libquicktime/debian/libquicktime1.install (original)
+++ unstable/libquicktime/debian/libquicktime1.install Sun Feb 22 14:48:33 2009
@@ -1,3 +1,3 @@
-/usr/lib/*.so.*
-/usr/lib/libquicktime1/*.so
-/usr/share/locale/*
+usr/lib/*.so.*
+usr/lib/libquicktime1/*.so
+usr/share/locale

Modified: unstable/libquicktime/debian/libquicktime1.shlibs
URL: http://svn.debian.org/wsvn/pkg-multimedia/unstable/libquicktime/debian/libquicktime1.shlibs?rev=1616&op=diff
==============================================================================
--- unstable/libquicktime/debian/libquicktime1.shlibs (original)
+++ unstable/libquicktime/debian/libquicktime1.shlibs Sun Feb 22 14:48:33 2009
@@ -1,1 +1,1 @@
-libquicktime 1 libquicktime1 (>= 2:1.0.0+debian)
+libquicktime 1 libquicktime1 (>= 2:1.1.0+debian)

Modified: unstable/libquicktime/debian/quicktime-utils.install
URL: http://svn.debian.org/wsvn/pkg-multimedia/unstable/libquicktime/debian/quicktime-utils.install?rev=1616&op=diff
==============================================================================
--- unstable/libquicktime/debian/quicktime-utils.install (original)
+++ unstable/libquicktime/debian/quicktime-utils.install Sun Feb 22 14:48:33 2009
@@ -1,8 +1,8 @@
-/usr/bin/lqt_transcode
-/usr/bin/qt2text
-/usr/bin/qtdechunk
-/usr/bin/qtdump
-/usr/bin/qtinfo
-/usr/bin/qtrechunk
-/usr/bin/qtstreamize
-/usr/bin/qtyuv4toyuv
+usr/bin/lqt_transcode
+usr/bin/qt2text
+usr/bin/qtdechunk
+usr/bin/qtdump
+usr/bin/qtinfo
+usr/bin/qtrechunk
+usr/bin/qtstreamize
+usr/bin/qtyuv4toyuv

Modified: unstable/libquicktime/debian/quicktime-x11utils.install
URL: http://svn.debian.org/wsvn/pkg-multimedia/unstable/libquicktime/debian/quicktime-x11utils.install?rev=1616&op=diff
==============================================================================
--- unstable/libquicktime/debian/quicktime-x11utils.install (original)
+++ unstable/libquicktime/debian/quicktime-x11utils.install Sun Feb 22 14:48:33 2009
@@ -1,3 +1,3 @@
-/usr/bin/libquicktime_config
-/usr/bin/lqtplay
-/usr/share/man/man1
+usr/bin/libquicktime_config
+usr/bin/lqtplay
+usr/share/man

Modified: unstable/libquicktime/debian/rules
URL: http://svn.debian.org/wsvn/pkg-multimedia/unstable/libquicktime/debian/rules?rev=1616&op=diff
==============================================================================
--- unstable/libquicktime/debian/rules (original)
+++ unstable/libquicktime/debian/rules Sun Feb 22 14:48:33 2009
@@ -2,20 +2,36 @@
 
 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`
+DEB_VERSION := $(shell dpkg-parsechangelog | sed -n 's/^Version: //p')
+UPSTREAM_VERSION := $(shell echo $(DEB_VERSION) | sed -r 's/[^:]+://; s/-[^-]+$$//; s/\+debian//')
 
-DEB_CONFIGURE_EXTRA_FLAGS += --enable-gpl
+# Autodetection of headers (taken from the ffmpeg-debian package)
+define cond_with
+	$(shell test -r $(1) && echo --with-$(2) )
+endef
+
+DEB_CONFIGURE_EXTRA_FLAGS += --enable-gpl --with-libdv
+
+# Support for additional external codecs
+DEB_CONFIGURE_EXTRA_FLAGS += $(call cond_with,/usr/include/faac.h,faac)
+DEB_CONFIGURE_EXTRA_FLAGS += $(call cond_with,/usr/include/lame/lame.h,lame)
+DEB_CONFIGURE_EXTRA_FLAGS += $(call cond_with,/usr/include/x264.h,x264)
 
 DEB_DH_INSTALL_SOURCEDIR := debian/tmp
 
 get-orig-source:
-	wget http://downloads.sourceforge.net/libquicktime/libquicktime-$(VERSION).tar.gz
-	tar xzf libquicktime-$(VERSION).tar.gz
-	rm -rf libquicktime-$(VERSION)/debian/
-	tar czf ../tarballs/libquicktime_$(VERSION)+debian.orig.tar.gz libquicktime-$(VERSION)/
-	rm -rf libquicktime-$(VERSION).tar.gz libquicktime-$(VERSION)/
+	wget http://downloads.sourceforge.net/libquicktime/libquicktime-$(UPSTREAM_VERSION).tar.gz
+	tar xzf libquicktime-$(UPSTREAM_VERSION).tar.gz
+	rm -rf libquicktime-$(UPSTREAM_VERSION)/debian/
+	tar czf libquicktime_$(UPSTREAM_VERSION)+debian.orig.tar.gz libquicktime-$(UPSTREAM_VERSION)/
+	rm -rf libquicktime-$(UPSTREAM_VERSION).tar.gz libquicktime-$(UPSTREAM_VERSION)/
+	if [ -d "../tarballs" ] ; then \
+		mv -f libquicktime_$(UPSTREAM_VERSION)+debian.orig.tar.gz ../tarballs ; \
+	else \
+		mv -f libquicktime_$(UPSTREAM_VERSION)+debian.orig.tar.gz .. ; \
+	fi
 
 pre-build::
 	ln -sf quicktime include/lqt
@@ -23,11 +39,8 @@
 clean::
 	rm -rf include/lqt
 
-install/libquicktime-dev::
-	# Installing documentation
-	install -d -m 0755 debian/libquicktime-dev/usr/share/doc/libquicktime-dev/html
-	cp -r doc/*.html debian/libquicktime-dev/usr/share/doc/libquicktime-dev/html
+binary-install/libquicktime-doc::
 	# Symlinking qt4l_*.html to get rid of the prefix
-	for HTML in debian/libquicktime-dev/usr/share/doc/libquicktime-dev/html/qt4l_*.html; \
+	for HTML in debian/libquicktime-doc/usr/share/doc/libquicktime-doc/qt4l_*.html; \
 		do ln -sf `basename $$HTML` `echo $$HTML | sed 's:qt4l_::'`; \
 	done

Modified: unstable/libquicktime/debian/watch
URL: http://svn.debian.org/wsvn/pkg-multimedia/unstable/libquicktime/debian/watch?rev=1616&op=diff
==============================================================================
--- unstable/libquicktime/debian/watch (original)
+++ unstable/libquicktime/debian/watch Sun Feb 22 14:48:33 2009
@@ -1,4 +1,3 @@
-# watch control file for uscan
-
 version=3
+opts="dversionmangle=s/\+debian//" \
 http://sf.net/libquicktime/libquicktime-(.*)\.tar\.gz

More information about the pkg-multimedia-commits mailing list