[Glibc-bsd-commits] r1929 - trunk/libvolume-id/debian

[guillem at alioth.debian.org]

Author: guillem
Date: 2007-05-16 01:25:50 +0000 (Wed, 16 May 2007)
New Revision: 1929

Modified:
   trunk/libvolume-id/debian/changelog
   trunk/libvolume-id/debian/rules
Log:
Clean up debian/rules:
- Support noopt in DEB_BUILD_OPTIONS.
- Build with debugging symbols by default.
- Do not use a build stamp.
- Remove useless INSTALL_PROGRAM.
- Add build-arch and build-indep.
- Remove commented out debhelper commands.


Modified: trunk/libvolume-id/debian/changelog
===================================================================
--- trunk/libvolume-id/debian/changelog	2007-05-16 01:09:15 UTC (rev 1928)
+++ trunk/libvolume-id/debian/changelog	2007-05-16 01:25:50 UTC (rev 1929)
@@ -1,6 +1,13 @@
 libvolume-id (0.71.0-2) UNRELEASED; urgency=low
 
   * Remove emacs mode lines from the changelog.
+  * Clean up debian/rules:
+    - Support noopt in DEB_BUILD_OPTIONS.
+    - Build with debugging symbols by default.
+    - Do not use a build stamp.
+    - Remove useless INSTALL_PROGRAM.
+    - Add build-arch and build-indep.
+    - Remove commented out debhelper commands.
 
  -- Guillem Jover <guillem at debian.org>  Wed, 16 May 2007 04:08:34 +0300
 

Modified: trunk/libvolume-id/debian/rules
===================================================================
--- trunk/libvolume-id/debian/rules	2007-05-16 01:09:15 UTC (rev 1928)
+++ trunk/libvolume-id/debian/rules	2007-05-16 01:25:50 UTC (rev 1929)
@@ -10,69 +10,68 @@
 DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 
-ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
-	CFLAGS += -g
+CFLAGS = -Wall -g
+
+ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+	CFLAGS += -O0
+else
+	CFLAGS += -O2
 endif
-ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
-	INSTALL_PROGRAM += -s
-endif
-		
-build: build-stamp
-build-stamp:
+
+build-indep:
+
+build-arch:
 	dh_testdir
+	
 	$(MAKE) CC=gcc E=echo RANLIB=ranlib AR=ar prefix=/usr Q=@
-	touch build-stamp
 
+build: build-arch build-indep
+
 clean:
 	dh_testdir
 	dh_testroot
-	rm -f build-stamp
+	
 	-$(MAKE) clean E=echo Q=@
+	
 	dh_clean
 
-install: build
+install: build-arch
 	dh_testdir
 	dh_testroot
 	dh_clean -k
 	dh_installdirs
-
+	
 	$(MAKE) install prefix=/usr DESTDIR=debian/tmp
 	
 	# Move all files in their corresponding package
 	dh_install -s --list-missing --sourcedir=debian/tmp
 
-# Build architecture-independent files here.
-binary-indep: build install
+binary-indep:
 # We have nothing to do by default.
 
-# Build architecture-dependent files here.
-binary-arch: build install
+binary-arch: build-arch install
 	dh_testdir
 	dh_testroot
-#	dh_installdebconf	
 	dh_installdocs
 	dh_installexamples
 	dh_installmenu
-#	dh_installlogrotate
-#	dh_installemacsen
-#	dh_installpam
-#	dh_installmime
-#	dh_installinit
 	dh_installcron
 	dh_installman
 	dh_installinfo
-	dh_installchangelogs 
+	dh_installchangelogs
 	dh_link
 	dh_strip
 	dh_compress
 	dh_fixperms
 	dh_makeshlibs -V
 	dh_installdeb
-#	dh_perl
 	dh_shlibdeps
 	dh_gencontrol
 	dh_md5sums
 	dh_builddeb
 
 binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install configure
+
+.PHONY: clean install
+.PHONY: build-indep build-arch build binary-indep binary-arch binary
+