r26200 - in /desktop/experimental/gtk+3.0/debian: libgtk3.0-bin.links.in rules

[pochu at users.alioth.debian.org]

Author: pochu
Date: Tue Jan 11 01:37:03 2011
New Revision: 26200

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

Modified:
    desktop/experimental/gtk+3.0/debian/libgtk3.0-bin.links.in
    desktop/experimental/gtk+3.0/debian/rules

Modified: desktop/experimental/gtk+3.0/debian/libgtk3.0-bin.links.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B3.0/debian/libgtk3.0-bin.links.in?rev=26200&op=diff
==============================================================================
--- desktop/experimental/gtk+3.0/debian/libgtk3.0-bin.links.in [utf-8] (original)
+++ desktop/experimental/gtk+3.0/debian/libgtk3.0-bin.links.in [utf-8] Tue Jan 11 01:37:03 2011
@@ -1,5 +1,5 @@
 @LIBDIR@/@SHARED_PKG@/gtk-query-immodules- at APIVER@ usr/bin/gtk-query-immodules- at APIVER@
- at LIBDIR@/@SHARED_PKG@/gtk-update-icon-cache usr/bin/gtk-update-icon-cache- at APIVER@
+ at LIBDIR@/@SHARED_PKG@/gtk-update-icon-cache- at APIVER@ usr/bin/gtk-update-icon-cache- at APIVER@
 usr/share/doc/@COMMON_PKG@/changelog.gz usr/share/doc/@BIN_PKG@/changelog.gz
 usr/share/doc/@COMMON_PKG@/NEWS.gz usr/share/doc/@BIN_PKG@/NEWS.gz
 usr/share/doc/@COMMON_PKG@/README.gz usr/share/doc/@BIN_PKG@/README.gz

Modified: desktop/experimental/gtk+3.0/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B3.0/debian/rules?rev=26200&op=diff
==============================================================================
--- desktop/experimental/gtk+3.0/debian/rules [utf-8] (original)
+++ desktop/experimental/gtk+3.0/debian/rules [utf-8] Tue Jan 11 01:37:03 2011
@@ -22,8 +22,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 := 3.0
 SONAME := 0
 SHVER := 2.99.0
@@ -101,7 +99,7 @@
 	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#@GTK_BINVER_DEP@#$(GTK_BINVER_DEP)#g" \
 		-e "s#@SHARED_PKG@#$(SHARED_PKG)#g" \
 		-e "s#@COMMON_PKG@#$(COMMON_PKG)#g" \