r12582 - in /desktop/unstable/ekiga/debian: changelog rules

[kilian at users.alioth.debian.org]

Author: kilian
Date: Wed Sep 19 07:19:18 2007
New Revision: 12582

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=12582
Log:
* Use pkg-gnome's version of get-orig-source (gnome-get-source.mk)

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

Modified: desktop/unstable/ekiga/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/ekiga/debian/changelog?rev=12582&op=diff
==============================================================================
--- desktop/unstable/ekiga/debian/changelog (original)
+++ desktop/unstable/ekiga/debian/changelog Wed Sep 19 07:19:18 2007
@@ -3,8 +3,9 @@
   * NOT RELEASED YET
   * New upstream release.
   * Bump build-depends to PWLib 1.10.10 and OPAL 2.2.11.
-
- -- Kilian Krause <kilian at debian.org>  Wed, 19 Sep 2007 09:05:03 +0200
+  * Use pkg-gnome's version of get-orig-source (gnome-get-source.mk)
+
+ -- Kilian Krause <kilian at debian.org>  Wed, 19 Sep 2007 09:18:36 +0200
 
 ekiga (2.0.9-3) unstable; urgency=low
 

Modified: desktop/unstable/ekiga/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/ekiga/debian/rules?rev=12582&op=diff
==============================================================================
--- desktop/unstable/ekiga/debian/rules (original)
+++ desktop/unstable/ekiga/debian/rules Wed Sep 19 07:19:18 2007
@@ -20,17 +20,16 @@
   confflags += --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE)
 endif
 
+include /usr/share/dpatch/dpatch.make
+include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk
+-include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
+
 CFLAGS = -Wall -g
 CXXFLAGS = -Wall -g
 # --as-needed is relatively risky and should be added with -z defs if possible
 #LDFLAGS += -Wl,-z,defs -Wl,--as-needed
 
-DEBVERSION:=$(shell head -n 1 debian/changelog \
-		    | sed -e 's/^[^(]*(\([^)]*\)).*/\1/')
-UPVERSION:=$(shell echo $(DEBVERSION) | sed -e 's/^.*://' -e 's/-[0-9.]*$$//' -e 's/.dfsg$$//')
-
-FILENAME := ekiga_$(UPVERSION).orig.tar.gz
-URL := http://www.ekiga.org/admin/downloads/latest/sources/sources/ekiga-$(UPVERSION).tar.gz
+#URL := http://www.ekiga.net/misc/ekiga-$(UPVERSION).tar.gz
 
 ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
 	CFLAGS += -O0
@@ -40,18 +39,19 @@
 	CXXFLAGS += -O2
 endif
 
-include /usr/share/dpatch/dpatch.make
-include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk
-
 config.status: patch-stamp
 	dh_testdir
-	CXXFLAGS="$(CXXFLAGS)" CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" ./configure $(confflags) --prefix=/usr \
-				--mandir=\$${prefix}/share/man \
-				--infodir=\$${prefix}/share/info \
-				--with-pwlib=/usr \
-				--sysconfdir=/etc \
-				--disable-install-schemas \
-				--enable-avahi --disable-scrollkeeper
+	CXXFLAGS="$(CXXFLAGS)" \
+		CFLAGS="$(CFLAGS)" \
+		LDFLAGS="$(LDFLAGS)" \
+		./configure $(confflags) --prefix=/usr \
+			--mandir=\$${prefix}/share/man \
+			--infodir=\$${prefix}/share/info \
+			--with-pwlib=/usr \
+			--sysconfdir=/etc \
+			--disable-install-schemas \
+			--enable-avahi \
+			--disable-scrollkeeper
 
 build: build-stamp
 
@@ -118,15 +118,5 @@
 	dh_installman -a man/ekiga.1 debian/ekiga-config-tool.1
 	$(MAKE) -f debian/rules DH_OPTIONS=-a binary-common
 
-print-version:
-	@@echo "Debian version:          $(DEBVERSION)"
-	@@echo "Upstream version:        $(UPVERSION)"
-
-get-orig-source:
-	@@dh_testdir
-	@@[ -d ../tarballs/. ]||mkdir -p ../tarballs
-	@@echo Downloading $(FILENAME) from $(URL) ...
-	@@wget -N -nv -T10 -t3 -O ../tarballs/$(FILENAME) $(URL)
-
 binary: binary-indep binary-arch
 .PHONY: build clean binary-indep binary-arch binary install patch