r26199 - /desktop/experimental/pango1.0/debian/rules

[pochu at users.alioth.debian.org]

Author: pochu
Date: Tue Jan 11 01:35:37 2011
New Revision: 26199

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=26199
Log:
use DEB_VERSION and DEB_UPSTREAM_VERSION from CDBS

Modified:
    desktop/experimental/pango1.0/debian/rules

Modified: desktop/experimental/pango1.0/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/pango1.0/debian/rules?rev=26199&op=diff
==============================================================================
--- desktop/experimental/pango1.0/debian/rules [utf-8] (original)
+++ desktop/experimental/pango1.0/debian/rules [utf-8] Tue Jan 11 01:35:37 2011
@@ -21,8 +21,6 @@
 # Make the linker work a bit harder so dynamic loading can be done faster
 LDFLAGS += -Wl,-O1
 
-DEBVERSION := $(shell dpkg-parsechangelog | sed -n -e 's/^Version: //p')
-VERSION := $(shell echo $(DEBVERSION) | sed -e 's/-[^-]*$$//')
 APIVER := 1.0
 SONAME := 0
 MODVER := 1.6.0
@@ -79,14 +77,14 @@
 dh_subst_files = $(patsubst %.in,%,$(wildcard $(addprefix debian/, $(addsuffix *.in, $(1)))))
 
 debian/dh_pangomodules.1: debian/dh_pangomodules
-	cd debian && pod2man -c "Pango" -r "$(DEBVERSION)" dh_pangomodules dh_pangomodules.1
+	cd debian && pod2man -c "Pango" -r "$(DEB_VERSION)" dh_pangomodules dh_pangomodules.1
 
 debian/%: debian/%.in
 	dh_testdir
 	sed \
 		-e 's#@SONAME@#$(SONAME)#g' \
 		-e 's#@APIVER@#$(APIVER)#g' \
-		-e 's#@VERSION@#$(VERSION)#g' \
+		-e 's#@VERSION@#$(DEB_UPSTREAM_VERSION)#g' \
 		-e 's#@PANGO_MODVER_DEP@#$(PANGO_MODVER_DEP)#g' \
 		-e 's#@LIBDIR@#$(LIBDIR)#g' \
 		-e 's#@OPTLIBDIR@#$(OPTLIBDIR)#g' \