r1048 - in /unstable/libquicktime/debian: changelog control rules

[fabian-guest at users.alioth.debian.org]

Author: fabian-guest
Date: Fri Jan 25 09:24:03 2008
New Revision: 1048

URL: http://svn.debian.org/wsvn/pkg-multimedia/?sc=1&rev=1048
Log:
Oops, passing --as-needed results in a build error, reverting changes for the tme beeing.

* debian/rules:
+ Improved get-orig-source rule to
- compute the version instead of hardcoding it,
- remove libquicktime-1.0.2.tar.gz and libquicktime-1.0.2/ afterwards,
- output the tarball in ../tarballs and
- not rename the toplevel directory anymore.

Modified:
    unstable/libquicktime/debian/changelog
    unstable/libquicktime/debian/control
    unstable/libquicktime/debian/rules

Modified: unstable/libquicktime/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-multimedia/unstable/libquicktime/debian/changelog?rev=1048&op=diff
==============================================================================
--- unstable/libquicktime/debian/changelog (original)
+++ unstable/libquicktime/debian/changelog Fri Jan 25 09:24:03 2008
@@ -1,12 +1,16 @@
 libquicktime (2:1.0.2+debian-2) UNRELEASED; urgency=low
 
   * debian/control:
-    + Added Build-Depends on cdbs (>= 0.4.41).
+    + Added Build-Depends on cdbs.
   * debian/rules:
     + Converted Debian packaging to CDBS.
-    + Added -Wl,-z,defs -Wl,--as-needed to LDFLAGS.
-
- -- Fabian Greffrath <fabian at debian-unofficial.org>  Thu, 24 Jan 2008 17:25:19 +0100
+    + Improved get-orig-source rule to
+      - compute the version instead of hardcoding it,
+      - remove libquicktime-1.0.2.tar.gz and libquicktime-1.0.2/ afterwards,
+      - output the tarball in ../tarballs and
+      - not rename the toplevel directory anymore.
+
+ -- Fabian Greffrath <fabian at debian-unofficial.org>  Fri, 25 Jan 2008 09:48:21 +0100
 
 libquicktime (2:1.0.2+debian-1) unstable; urgency=low
 

Modified: unstable/libquicktime/debian/control
URL: http://svn.debian.org/wsvn/pkg-multimedia/unstable/libquicktime/debian/control?rev=1048&op=diff
==============================================================================
--- unstable/libquicktime/debian/control (original)
+++ unstable/libquicktime/debian/control Fri Jan 25 09:24:03 2008
@@ -6,7 +6,7 @@
            Sam Hocevar (Debian packages) <sam+deb at zoy.org>,
            Loic Minier <lool at dooz.org>
 Standards-Version: 3.7.3
-Build-Depends: cdbs (>= 0.4.41),
+Build-Depends: cdbs,
                debhelper (>= 5),
                dpatch,
                autotools-dev,

Modified: unstable/libquicktime/debian/rules
URL: http://svn.debian.org/wsvn/pkg-multimedia/unstable/libquicktime/debian/rules?rev=1048&op=diff
==============================================================================
--- unstable/libquicktime/debian/rules (original)
+++ unstable/libquicktime/debian/rules Fri Jan 25 09:24:03 2008
@@ -4,19 +4,18 @@
 include /usr/share/cdbs/1/class/autotools.mk
 include /usr/share/cdbs/1/rules/dpatch.mk
 
-LDFLAGS += -Wl,-z,defs -Wl,--as-needed
+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
 
 DEB_DH_INSTALL_SOURCEDIR := debian/tmp
 
 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/
+	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)/
 
 pre-build::
 	ln -sf quicktime include/lqt