[Restricted-changes] r125 - in dists/trunk: faac/debian hot-babe/debian xv/debian

[fabian-guest at alioth.debian.org]

Author: fabian-guest
Date: 2007-06-05 06:53:29 +0000 (Tue, 05 Jun 2007)
New Revision: 125

Modified:
   dists/trunk/faac/debian/rules
   dists/trunk/hot-babe/debian/rules
   dists/trunk/xv/debian/rules
Log:
Clean up some debian/rules


Modified: dists/trunk/faac/debian/rules
===================================================================
--- dists/trunk/faac/debian/rules	2007-06-05 06:44:57 UTC (rev 124)
+++ dists/trunk/faac/debian/rules	2007-06-05 06:53:29 UTC (rev 125)
@@ -5,11 +5,6 @@
 
 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)))
@@ -26,9 +21,7 @@
 	sh ./bootstrap
 
 	# Configuring package
-	CFLAGS="$(CFLAGS) -fPIC" ./configure\
-		--host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE)\
-		--prefix=/usr --with-mp4v2
+	CFLAGS="$(CFLAGS) -fPIC" ./configure --prefix=/usr --with-mp4v2
 
 	touch configure-stamp
 
@@ -41,7 +34,8 @@
 
 	touch build-stamp
 
-clean: unpatch
+clean: clean-patched unpatch
+clean-patched:
 	dh_testdir
 	dh_testroot
 	rm -f build-stamp configure-stamp

Modified: dists/trunk/hot-babe/debian/rules
===================================================================
--- dists/trunk/hot-babe/debian/rules	2007-06-05 06:44:57 UTC (rev 124)
+++ dists/trunk/hot-babe/debian/rules	2007-06-05 06:53:29 UTC (rev 125)
@@ -16,7 +16,7 @@
 	dh_testdir
 
 	# Building package
-	CFLAGS="$(CFLAGS)" $(MAKE) PREFIX=/usr
+	$(MAKE) CFLAGS="$(CFLAGS)" PREFIX=/usr
 
 	touch build-stamp
 

Modified: dists/trunk/xv/debian/rules
===================================================================
--- dists/trunk/xv/debian/rules	2007-06-05 06:44:57 UTC (rev 124)
+++ dists/trunk/xv/debian/rules	2007-06-05 06:53:29 UTC (rev 125)
@@ -5,12 +5,20 @@
 
 include /usr/share/dpatch/dpatch.make
 
+CFLAGS = -Wall -g
+
+ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+	CFLAGS += -O0
+else
+	CFLAGS += -O2
+endif
+
 build: build-stamp
 build-stamp: patch-stamp
 	dh_testdir
 
 	# Building package
-	$(MAKE) PREFIX=/usr
+	$(MAKE) CCOPTS="$(CFLAGS)" PREFIX=/usr
 
 	touch build-stamp