r17565 - in /desktop/experimental/ekiga/debian: changelog rules

[lool at users.alioth.debian.org]

Author: lool
Date: Fri Nov 14 14:23:24 2008
New Revision: 17565

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=17565
Log:
Cleanup rules; in particular, use dpkg-parsechangelog and honor
distclean/clean failures.

Modified:
    desktop/experimental/ekiga/debian/changelog
    desktop/experimental/ekiga/debian/rules

Modified: desktop/experimental/ekiga/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/ekiga/debian/changelog?rev=17565&op=diff
==============================================================================
--- desktop/experimental/ekiga/debian/changelog (original)
+++ desktop/experimental/ekiga/debian/changelog Fri Nov 14 14:23:24 2008
@@ -20,6 +20,8 @@
   * Generate a PO template during build by calling intltool-update -p in
     install; thanks Ubuntu and Martin Pitt; closes: #505535.
   * Also let the -dbg depend on ${misc:Depends}.
+  * Cleanup rules; in particular, use dpkg-parsechangelog and honor
+    distclean/clean failures.
 
  -- Eugen Dedu <Eugen.Dedu at pu-pm.univ-fcomte.fr>  Sat, 27 Sep 2008 10:00:00 +0200
 

Modified: desktop/experimental/ekiga/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/ekiga/debian/rules?rev=17565&op=diff
==============================================================================
--- desktop/experimental/ekiga/debian/rules (original)
+++ desktop/experimental/ekiga/debian/rules Fri Nov 14 14:23:24 2008
@@ -1,12 +1,5 @@
 #!/usr/bin/make -f
-# Sample debian/rules that uses debhelper.
-# GNU copyright 1997 to 1999 by Joey Hess.
 
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
-
-# 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)
 
@@ -16,9 +9,8 @@
   confflags += --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE)
 endif
 
-DEBVERSION := $(shell head -n 1 debian/changelog \
-                    | sed -e 's/^[^(]*(\([^)]*\)).*/\1/')
-UPVERSION := $(shell echo $(DEBVERSION) | sed -r -e 's/^.*://' -e 's/-[0-9.]*(\+b[0-9])?$$//' -e 's/.dfsg[0-9]*$$//')
+DEBVERSION := $(shell dpkg-parsechangelog | sed -n -e 's/^Version: //p')
+UPVERSION := $(shell echo $(DEBVERSION) | sed -r -e 's/^.*://; s/-[0-9.]*(\+b[0-9])?$$//; s/.dfsg[0-9]*$$//')
 UPFILENAME := ekiga_$(UPVERSION).orig.tar.gz
 URL := http://ftp.gnome.org/pub/gnome/sources/ekiga/3.0/ekiga-$(UPVERSION).tar.gz
 
@@ -28,29 +20,19 @@
 
 #URL := http://www.ekiga.net/misc/ekiga-$(UPVERSION).tar.gz
 
-CFLAGS = -Wall -g
-CXXFLAGS = -Wall -g
+CFLAGS   += -Wall -g -O$(if $(findstring noopt,$(DEB_BUILD_OPTIONS)),0,2)
+CXXFLAGS += -Wall -g -O$(if $(findstring noopt,$(DEB_BUILD_OPTIONS)),0,2)
 # --as-needed is relatively risky and should be added with -z defs if possible
 LDFLAGS += -Wl,-z,defs -Wl,--as-needed
-
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-        CFLAGS += -O0
-        CXXFLAGS += -O0
-else
-        CFLAGS += -O2
-        CXXFLAGS += -O2
-endif
 
 config.status: patch-stamp
 	dh_testdir
 	rm -f config.cache
-
 	#rm -rf build-gtkonly
 	#mkdir build-gtkonly
 	#cd build-gtkonly ; ./autogen.sh $(confflags) --prefix=/usr \
 	#		--sysconfdir=/etc --disable-schemas-install --disable-scrollkeeper \
 	#		--disable-gnome
-
 	CXXFLAGS="$(CXXFLAGS)" CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" \
 	./configure $(confflags) --prefix=/usr \
 			--sysconfdir=/etc --disable-schemas-install --disable-scrollkeeper
@@ -71,9 +53,7 @@
 	rm -f build-stamp patch-stamp  # for debhelper v6
 	rm -f debian/files*
 	rm -f xml-i18n-extract xml-i18n-merge xml-i18n-update
-	-if [ -f Makefile ];then \
-		$(MAKE) clean distclean;\
-	fi
+	[ ! -f Makefile ] || $(MAKE) clean distclean
 	rm -rf po/.intltool-merge-cache
 	rm -rf intltool-extract intltool-merge intltool-update
 	rm -f pixmaps/inline_emoticons.h