r882 - in /unstable/libquicktime/debian: changelog rules

[lool at users.alioth.debian.org]

Author: lool
Date: Sat Sep 29 19:39:30 2007
New Revision: 882

URL: http://svn.debian.org/wsvn/pkg-multimedia/?sc=1&rev=882
Log:
* Cleanup rules.

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

Modified: unstable/libquicktime/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-multimedia/unstable/libquicktime/debian/changelog?rev=882&op=diff
==============================================================================
--- unstable/libquicktime/debian/changelog (original)
+++ unstable/libquicktime/debian/changelog Sat Sep 29 19:39:30 2007
@@ -11,8 +11,9 @@
       70_relibtoolize, to updated generated files (automake-1.9 && autoconf &&
       rm -rf autom4te.cache).
   * Wrap build-deps and deps.
-
- -- Loic Minier <lool at dooz.org>  Sat, 29 Sep 2007 21:29:37 +0200
+  * Cleanup rules.
+
+ -- Loic Minier <lool at dooz.org>  Sat, 29 Sep 2007 21:39:25 +0200
 
 libquicktime (2:1.0.0+debian-4) unstable; urgency=low
 

Modified: unstable/libquicktime/debian/rules
URL: http://svn.debian.org/wsvn/pkg-multimedia/unstable/libquicktime/debian/rules?rev=882&op=diff
==============================================================================
--- unstable/libquicktime/debian/rules (original)
+++ unstable/libquicktime/debian/rules Sat Sep 29 19:39:30 2007
@@ -1,26 +1,14 @@
 #!/usr/bin/make -f
-
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
 
 include /usr/share/dpatch/dpatch.make
 
-# These are used for cross-compiling and for saving the configure script
-# from having to guess our platform (since we know it already)
 DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 
-CFLAGS = -Wall -g
-
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-	CFLAGS += -O0
-else
-	CFLAGS += -O2
-endif
+CFLAGS := -Wall -g -O$(if $(findstring noopt,$(DEB_BUILD_OPTIONS)),0,2)
 
 config.status: patch-stamp configure
 	dh_testdir
-
 	# Configuring package
 	CLFAGS="$(CFLAGS)" ./configure\
 		--host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE)\
@@ -30,30 +18,20 @@
 build: build-stamp
 build-stamp: config.status
 	dh_testdir
-
 	ln -sf quicktime include/lqt
-
 	# Building package
 	$(MAKE)
-
-	touch build-stamp
+	touch $@
 
 clean: unpatch
 	dh_testdir
 	dh_testroot
 	rm -f build-stamp
-
 	# Cleaning package
 	-$(MAKE) --ignore-errors distclean
-ifneq "$(wildcard /usr/share/misc/config.sub)" ""
-	cp -f /usr/share/misc/config.sub config.sub
-endif
-ifneq "$(wildcard /usr/share/misc/config.guess)" ""
-	cp -f /usr/share/misc/config.guess config.guess
-endif
-
+	-test -f config.sub   && cp -f /usr/share/misc/config.sub   .
+	-test -f config.guess && cp -f /usr/share/misc/config.guess .
 	rm -rf include/lqt
-
 	dh_clean
 
 install: build
@@ -61,14 +39,11 @@
 	dh_testroot
 	dh_clean -k
 	dh_installdirs
-
 	# Installing package
 	$(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
-
 	# 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
-	
 	# Symlinking qt4l_*.html to get rid of the prefix
 	for HTML in debian/libquicktime-dev/usr/share/doc/libquicktime-dev/html/qt4l_*.html; \
 		do ln -sf `basename $$HTML` `echo $$HTML | sed 's:qt4l_::'`; \