[med-svn] r11394 - trunk/packages/fis-gtm/fis-gtm/trunk/debian

[Yaroslav Halchenko]

Author: yoh
Date: 2012-06-19 16:44:44 +0000 (Tue, 19 Jun 2012)
New Revision: 11394

Modified:
   trunk/packages/fis-gtm/fis-gtm/trunk/debian/changelog
   trunk/packages/fis-gtm/fis-gtm/trunk/debian/rules
Log:
Extract API version (without +git), adjusted changelog and git revision to match the position, --verbose for gtminstall

Modified: trunk/packages/fis-gtm/fis-gtm/trunk/debian/changelog
===================================================================
--- trunk/packages/fis-gtm/fis-gtm/trunk/debian/changelog	2012-06-19 16:44:42 UTC (rev 11393)
+++ trunk/packages/fis-gtm/fis-gtm/trunk/debian/changelog	2012-06-19 16:44:44 UTC (rev 11394)
@@ -1,4 +1,4 @@
-fis-gtm (5.5-000+git80-g211bd16-1) UNRELEASED; urgency=low
+fis-gtm (5.5-000+git87-g5b7c3e5-1) UNRELEASED; urgency=low
 
   [ Luis Ibanez ]
   * Initial release (Closes: #541239) based on not yet released work of
@@ -28,6 +28,7 @@
       to upstream
     - generate lintian-overrides for shlib-with-executable-stack
     - provide dumped from web changelog for the most recent release
+    - utilize gtminstall script for the 2nd-stage build/installation
 
  -- Yaroslav Halchenko <debian at onerussian.com>  Wed, 13 Jun 2012 19:27:19 -0400
 

Modified: trunk/packages/fis-gtm/fis-gtm/trunk/debian/rules
===================================================================
--- trunk/packages/fis-gtm/fis-gtm/trunk/debian/rules	2012-06-19 16:44:42 UTC (rev 11393)
+++ trunk/packages/fis-gtm/fis-gtm/trunk/debian/rules	2012-06-19 16:44:44 UTC (rev 11394)
@@ -9,10 +9,12 @@
 
 ARCH := $(shell dpkg-architecture -qDEB_HOST_GNU_CPU)
 UVER := $(shell LC_ALL=C dpkg-parsechangelog | awk '/^Version:/{print $$2;}' | sed -e 's,-[^-]*$$,,g')
-UVERDIR := V$(UVER)_$(ARCH)
+# Strip any +REV, e.g. +gitXX-gTREEISH
+UAPIVER := $(shell echo $(UVER) | sed -e 's,+.*,,')
+UAPIDIR := V$(UAPIVER)_$(ARCH)
 SRCPKG := $(shell dpkg-parsechangelog | sed -n 's/^Source: //p')
 BINPKG := $(shell awk '/Package:.*[0-9]/{print $$2;}' debian/control)
-GTM_INSTALL_DIR := lib/fis-gtm/$(UVERDIR)
+GTM_INSTALL_DIR := lib/fis-gtm/$(UAPIDIR)
 
 %:
 	dh $@
@@ -24,7 +26,7 @@
 	dh_auto_install --destdir=debian/$(BINPKG)-stage1 $@
 	cd debian/$(BINPKG)-stage1/usr/$(GTM_INSTALL_DIR) && \
 		gtm_destdir=$(CURDIR)/debian/$(BINPKG) \
-		./gtminstall --utf8 default --user root --group root \
+		./gtminstall --utf8 default --user root --group root --verbose \
 			--distrib debian/$(BINPKG)-stage1/usr/$(GTM_INSTALL_DIR) \
 			--installdir $(CURDIR)/debian/$(BINPKG)/usr/$(GTM_INSTALL_DIR)
 	@echo "I: Fixing up permissions for removed write rights -- we aren't done yet!"
@@ -35,7 +37,7 @@
 # user (root) would always be able to revert them to become writable.
 
 override_dh_link:
-	echo '/usr/lib/fis-gtm/$(UVERDIR) /usr/lib/fis-gtm/current' > debian/fis-gtm.links
+	echo '/usr/lib/fis-gtm/$(UAPIDIR) /usr/lib/fis-gtm/current' > debian/fis-gtm.links
 	dh_link
 
 # Because 'the' binary package name will change, let's just generate