r13902 - in /packages/unstable/libcm/debian: changelog rules

[lool at users.alioth.debian.org]

Author: lool
Date: Sun Dec 16 13:31:22 2007
New Revision: 13902

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

Modified:
    packages/unstable/libcm/debian/changelog
    packages/unstable/libcm/debian/rules

Modified: packages/unstable/libcm/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/libcm/debian/changelog?rev=13902&op=diff
==============================================================================
--- packages/unstable/libcm/debian/changelog (original)
+++ packages/unstable/libcm/debian/changelog Sun Dec 16 13:31:22 2007
@@ -7,6 +7,7 @@
   [ Loic Minier ]
   * Honor distclean failures in clean::.
   * Bump up Standards-Version to 3.7.3.
+  * Cleanup rules.
 
  -- Kilian Krause <kilian at debian.org>  Sat, 22 Sep 2007 12:46:39 +0200
 

Modified: packages/unstable/libcm/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/libcm/debian/rules?rev=13902&op=diff
==============================================================================
--- packages/unstable/libcm/debian/rules (original)
+++ packages/unstable/libcm/debian/rules Sun Dec 16 13:31:22 2007
@@ -10,23 +10,18 @@
 DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 
-CONFIGURE_FLAGS :=
+CFLAGS += -Wall -g -O$(if $(findstring noopt,$(DEB_BUILD_OPTIONS)),0,2)
+
+CFLAGS += -Wl,-z,defs
+
 ifeq ($(DEB_BUILD_GNU_TYPE),$(DEB_HOST_GNU_TYPE))
-CONFIGURE_FLAGS += --build=$(DEB_BUILD_GNU_TYPE)
+configure_flags += --build=$(DEB_BUILD_GNU_TYPE)
 else
-CONFIGURE_FLAGS += --build=$(DEB_BUILD_GNU_TYPE) --host=$(DEB_HOST_GNU_TYPE)
+configure_flags += --build=$(DEB_BUILD_GNU_TYPE) --host=$(DEB_HOST_GNU_TYPE)
 endif
-CONFIGURE_FLAGS += --prefix=/usr \
+configure_flags += --prefix=/usr \
 			--mandir=\$${prefix}/share/man \
 			--infodir=\$${prefix}/share/info
-
-CFLAGS = -Wall -g
-
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-	CFLAGS += -O0
-else
-	CFLAGS += -O2
-endif
 
 $(STAMP_DIR)/patch-stamp:
 	dh_testdir
@@ -47,7 +42,7 @@
 
 $(STAMP_DIR)/configure-stamp: $(STAMP_DIR)/patch-stamp
 	dh_testdir
-	CFLAGS="$(CFLAGS) -Wl,-z,defs" ./configure $(CONFIGURE_FLAGS)
+	CFLAGS="$(CFLAGS)" ./configure $(configure_flags)
 	touch $@
 
 configure: $(STAMP_DIR)/configure-stamp
@@ -89,18 +84,18 @@
 binary-arch: build install
 	dh_testdir
 	dh_testroot
-	dh_installchangelogs -a ChangeLog
-	dh_installdocs -a
-	dh_install -a --sourcedir=debian/tmp
-	dh_strip -a
-	dh_compress -a
-	dh_fixperms -a
-	dh_makeshlibs -a -V
-	dh_installdeb -a
-	dh_shlibdeps -a
-	dh_gencontrol -a
-	dh_md5sums -a
-	dh_builddeb -a
+	dh_installchangelogs -s ChangeLog
+	dh_installdocs -s
+	dh_install -s --sourcedir=debian/tmp
+	dh_strip -s
+	dh_compress -s
+	dh_fixperms -s
+	dh_makeshlibs -s -V
+	dh_installdeb -s
+	dh_shlibdeps -s
+	dh_gencontrol -s
+	dh_md5sums -s
+	dh_builddeb -s
 
 binary: binary-indep binary-arch
 .PHONY: build clean binary-indep binary-arch binary install configure