r842 - in /unstable/x264/debian: changelog rules

[lool at users.alioth.debian.org]

Author: lool
Date: Sun Aug 12 08:44:06 2007
New Revision: 842

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

Modified:
    unstable/x264/debian/changelog
    unstable/x264/debian/rules

Modified: unstable/x264/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-multimedia/unstable/x264/debian/changelog?rev=842&op=diff
==============================================================================
--- unstable/x264/debian/changelog (original)
+++ unstable/x264/debian/changelog Sun Aug 12 08:44:06 2007
@@ -1,3 +1,9 @@
+x264 (0.svn20070309-5) UNRELEASED; urgency=low
+
+  * Cleanup rules.
+
+ -- Loic Minier <lool at dooz.org>  Sun, 12 Aug 2007 10:44:01 +0200
+
 x264 (0.svn20070309-4) unstable; urgency=low
 
   * debian/patches/010_altivec_crash.diff:

Modified: unstable/x264/debian/rules
URL: http://svn.debian.org/wsvn/pkg-multimedia/unstable/x264/debian/rules?rev=842&op=diff
==============================================================================
--- unstable/x264/debian/rules (original)
+++ unstable/x264/debian/rules Sun Aug 12 08:44:06 2007
@@ -1,7 +1,4 @@
 #!/usr/bin/make -f
-
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
 
 # This has to be exported to make some magic below work.
 export DH_OPTIONS
@@ -11,20 +8,16 @@
 DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 
-confflags = --enable-debug --enable-pthread --prefix=/usr
+confflags := --enable-debug --enable-pthread --prefix=/usr
 
-CFLAGS = -Wall -g
+CFLAGS += -Wall -g -O$(if $(findstring noopt,$(DEB_BUILD_OPTIONS)),0,2)
 
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-	CFLAGS += -O0
-else
-	CFLAGS += -O2
-endif
+QUILT := QUILT_PATCHES=debian/patches quilt
 
 build: build-stamp
 build-stamp:
 	dh_testdir
-	QUILT_PATCHES=debian/patches quilt push -a || test $$? = 2
+	$(QUILT) push -a || test $$? = 2
 	# Build static lib
 	$(MAKE) clean
 	CFLAGS="$(CFLAGS)" ./configure $(confflags)
@@ -46,8 +39,8 @@
 	rm -f build-stamp
 	-$(MAKE) distclean
 	rm -f libx264.a.bak
-	QUILT_PATCHES=debian/patches quilt pop -a -R || test $$? = 2
-	dh_clean 
+	$(QUILT) pop -a -R || test $$? = 2
+	dh_clean
 
 install:
 	dh_testdir
@@ -60,25 +53,14 @@
 binary-common:
 	dh_testdir
 	dh_testroot
-	dh_installchangelogs 
+	dh_installchangelogs
 	dh_installdocs
 	dh_installexamples
-#	dh_installmenu
-#	dh_installdebconf	
-#	dh_installlogrotate	
-#	dh_installemacsen
-#	dh_installpam
-#	dh_installmime
-#	dh_python
-#	dh_installinit
-#	dh_installcron
-#	dh_installinfo
 	dh_installman debian/x264.1
 	dh_link
 	dh_strip
-	dh_compress 
+	dh_compress
 	dh_fixperms
-#	dh_perl
 	dh_makeshlibs
 	dh_installdeb
 	dh_shlibdeps