r1611 - in /experimental/libquicktime/debian: changelog docs libquicktime-dev.install libquicktime1.install quicktime-utils.install quicktime-x11utils.install rules watch

fabian-guest at users.alioth.debian.org fabian-guest at users.alioth.debian.org
Wed Feb 4 16:12:35 UTC 2009 

Author: fabian-guest
Date: Wed Feb  4 16:12:35 2009
New Revision: 1611

URL: http://svn.debian.org/wsvn/pkg-multimedia/?sc=1&rev=1611
Log:
  * 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 seperately.
    + 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.


Removed:
    experimental/libquicktime/debian/docs
Modified:
    experimental/libquicktime/debian/changelog
    experimental/libquicktime/debian/libquicktime-dev.install
    experimental/libquicktime/debian/libquicktime1.install
    experimental/libquicktime/debian/quicktime-utils.install
    experimental/libquicktime/debian/quicktime-x11utils.install
    experimental/libquicktime/debian/rules
    experimental/libquicktime/debian/watch

Modified: experimental/libquicktime/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-multimedia/experimental/libquicktime/debian/changelog?rev=1611&op=diff
==============================================================================
--- experimental/libquicktime/debian/changelog (original)
+++ experimental/libquicktime/debian/changelog Wed Feb  4 16:12:35 2009
@@ -1,3 +1,26 @@
+libquicktime (2:1.1.0+debian-2) experimental; urgency=low
+
+  * 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 seperately.
+    + 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>  Wed, 04 Feb 2009 17:03:48 +0100
+
 libquicktime (2:1.1.0+debian-1) experimental; urgency=low
 
   * New upstream release (Closes: #506955).

Modified: experimental/libquicktime/debian/libquicktime-dev.install
URL: http://svn.debian.org/wsvn/pkg-multimedia/experimental/libquicktime/debian/libquicktime-dev.install?rev=1611&op=diff
==============================================================================
--- experimental/libquicktime/debian/libquicktime-dev.install (original)
+++ experimental/libquicktime/debian/libquicktime-dev.install Wed Feb  4 16:12:35 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: experimental/libquicktime/debian/libquicktime1.install
URL: http://svn.debian.org/wsvn/pkg-multimedia/experimental/libquicktime/debian/libquicktime1.install?rev=1611&op=diff
==============================================================================
--- experimental/libquicktime/debian/libquicktime1.install (original)
+++ experimental/libquicktime/debian/libquicktime1.install Wed Feb  4 16:12:35 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: experimental/libquicktime/debian/quicktime-utils.install
URL: http://svn.debian.org/wsvn/pkg-multimedia/experimental/libquicktime/debian/quicktime-utils.install?rev=1611&op=diff
==============================================================================
--- experimental/libquicktime/debian/quicktime-utils.install (original)
+++ experimental/libquicktime/debian/quicktime-utils.install Wed Feb  4 16:12:35 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: experimental/libquicktime/debian/quicktime-x11utils.install
URL: http://svn.debian.org/wsvn/pkg-multimedia/experimental/libquicktime/debian/quicktime-x11utils.install?rev=1611&op=diff
==============================================================================
--- experimental/libquicktime/debian/quicktime-x11utils.install (original)
+++ experimental/libquicktime/debian/quicktime-x11utils.install Wed Feb  4 16:12:35 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: experimental/libquicktime/debian/rules
URL: http://svn.debian.org/wsvn/pkg-multimedia/experimental/libquicktime/debian/rules?rev=1611&op=diff
==============================================================================
--- experimental/libquicktime/debian/rules (original)
+++ experimental/libquicktime/debian/rules Wed Feb  4 16:12:35 2009
@@ -4,29 +4,34 @@
 include /usr/share/cdbs/1/class/autotools.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/-[^-]+$$//')
+
+# Autodetection of headers (taken from the ffmpeg-debian package)
+define cond_with
+	$(shell stat $(1) >/dev/null 2>/dev/null && echo --with-$(2) )
+endef
 
 DEB_CONFIGURE_EXTRA_FLAGS += --enable-gpl --with-libdv
 
 # Support for additional external codecs
-ifneq (,$(findstring externalcodecs,$(DEB_BUILD_OPTIONS)))
-  weak-build-deps += libmp3lame-dev | liblame-dev
-  DEB_CONFIGURE_EXTRA_FLAGS += --with-lame
-  weak-build-deps += libfaac-dev
-  DEB_CONFIGURE_EXTRA_FLAGS += --with-faac
-  weak-build-deps += libx264-dev
-  DEB_CONFIGURE_EXTRA_FLAGS += --with-x264
-  $(warning Make sure these packages are installed: $(weak-build-deps))
-endif
+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

Modified: experimental/libquicktime/debian/watch
URL: http://svn.debian.org/wsvn/pkg-multimedia/experimental/libquicktime/debian/watch?rev=1611&op=diff
==============================================================================
--- experimental/libquicktime/debian/watch (original)
+++ experimental/libquicktime/debian/watch Wed Feb  4 16:12:35 2009
@@ -1,5 +1,3 @@
-# watch control file for uscan
-
 version=3
-opts=dversionmangle=s/\+debian// \
+opts="dversionmangle=s/\+debian//" \
 http://sf.net/libquicktime/libquicktime-(.*)\.tar\.gz

More information about the pkg-multimedia-commits mailing list