r9517 - in /desktop/experimental/at-spi/debian: changelog rules

[lool at users.alioth.debian.org]

Author: lool
Date: Wed Apr  4 15:34:29 2007
New Revision: 9517

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=9517
Log:
* Use DEB_UPSTREAM_VERSION instead of computing the version; misc cleanups.

Modified:
    desktop/experimental/at-spi/debian/changelog
    desktop/experimental/at-spi/debian/rules

Modified: desktop/experimental/at-spi/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/at-spi/debian/changelog?rev=9517&op=diff
==============================================================================
--- desktop/experimental/at-spi/debian/changelog (original)
+++ desktop/experimental/at-spi/debian/changelog Wed Apr  4 15:34:29 2007
@@ -1,3 +1,9 @@
+at-spi (1.18.0-2) UNRELEASED; urgency=low
+
+  * Use DEB_UPSTREAM_VERSION instead of computing the version; misc cleanups.
+
+ -- Loic Minier <lool at dooz.org>  Wed, 04 Apr 2007 17:34:21 +0200
+
 at-spi (1.18.0-1) experimental; urgency=low
 
   * New upstream release.

Modified: desktop/experimental/at-spi/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/at-spi/debian/rules?rev=9517&op=diff
==============================================================================
--- desktop/experimental/at-spi/debian/rules (original)
+++ desktop/experimental/at-spi/debian/rules Wed Apr  4 15:34:29 2007
@@ -8,7 +8,7 @@
 include /usr/share/gnome-pkg-tools/1/rules/check-dist.mk
 -include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
 
-DEB_CONFIGURE_EXTRA_FLAGS := --enable-gtk-doc
+DEB_CONFIGURE_EXTRA_FLAGS += --enable-gtk-doc
 
 # Ensure at build time that the library has no dependencies on undefined
 # symbols.
@@ -17,17 +17,13 @@
 # Speed up loading.
 LDFLAGS += -Wl,-O1
 
-# "upstream" version number (no Debian package revision)
-DEB_NOREVISION_VERSION := $(shell dpkg-parsechangelog | sed -ne 's/^Version: \(.*\)-[^-]*$$/\1/p')
-
 # Make tight shlib dependencies
-SHLIB_VERSION=$(DEB_NOREVISION_VERSION)
+SHLIB_VERSION := $(DEB_UPSTREAM_VERSION)
 
 # Specify shlib dependency information explicitly
 DEB_DH_MAKESHLIBS_ARGS_libatspi1.0-0 := -V"libatspi1.0-0 (>= $(SHLIB_VERSION))"
 
-
-DEB_DH_STRIP_ARGS := --dbg-package=libatspi1.0-0
+DEB_DH_STRIP_ARGS += --dbg-package=libatspi1.0-0
 
 # Yes, this is a hack, but dh_strip --dbg-package creates a libatspi1.0-0-dbg
 # and we don't want to change libatspi-dbg name for the moment.