[med-svn] r8800 - trunk/packages/mgltools/scenario/trunk/debian

[Andreas Tille]

Author: tille
Date: 2011-12-07 08:54:52 +0000 (Wed, 07 Dec 2011)
New Revision: 8800

Modified:
   trunk/packages/mgltools/scenario/trunk/debian/changelog
   trunk/packages/mgltools/scenario/trunk/debian/rules
Log:
Suggest alternative method to obtain versions for get-orig-source relying on the information in debian/changelog


Modified: trunk/packages/mgltools/scenario/trunk/debian/changelog
===================================================================
--- trunk/packages/mgltools/scenario/trunk/debian/changelog	2011-12-07 08:15:17 UTC (rev 8799)
+++ trunk/packages/mgltools/scenario/trunk/debian/changelog	2011-12-07 08:54:52 UTC (rev 8800)
@@ -1,9 +1,17 @@
 mgltools-scenario (1.5.6~rc2+cvs.20110926-1) UNRELEASED; urgency=low
 
+  [ Steffen Moeller ]
   * New upstream version.
 
- -- Steffen Moeller <moeller at debian.org>  Tue, 27 Sep 2011 10:58:14 +0200
+  [ Andreas Tille ]
+  * debian/rules:
+    - use dh with python2 (as any other mgltools package)
+    - Suggest (not activated!) alternative method to obtain versions to
+      fetch via get-upstream-source by relying on the string in
+      debian/changelog
 
+ -- Andreas Tille <tille at debian.org>  Wed, 07 Dec 2011 09:02:04 +0100
+
 mgltools-scenario (1.5.6~rc1+cvs.20110617-1) UNRELEASED; urgency=low
 
   * New upstream version.

Modified: trunk/packages/mgltools/scenario/trunk/debian/rules
===================================================================
--- trunk/packages/mgltools/scenario/trunk/debian/rules	2011-12-07 08:15:17 UTC (rev 8799)
+++ trunk/packages/mgltools/scenario/trunk/debian/rules	2011-12-07 08:54:52 UTC (rev 8800)
@@ -1,20 +1,33 @@
 #!/usr/bin/make -f
 # -*- makefile -*-
-# Sample debian/rules that uses debhelper.
-# This file was originally written by Joey Hess and Craig Small.
-# As a special exception, when this file is copied by dh-make into a
-# dh-make output file, you may use that output file without restriction.
-# This special exception was added by Craig Small in version 0.37 of dh-make.
+# debian/rules for mgltools-scenario
 
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-export DEB_PYTHON_SYSTEM=pycentral
+BRANCH=`cat debian/get-orig-source/current-branch`
+RCVERSION=`cat debian/get-orig-source/rc-version`
 
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/python-distutils.mk
-#include /usr/share/cdbs/1/rules/simple-patchsys.mk
+# FIXME: Does not exist in upstream CVS
+SRC=ScenarioDIST
 
-clean::
+FULLVERSION=$(shell dpkg-parsechangelog | grep '^Version:' | sed 's/^Version:[[:space:]]\+\([^+]\+\)+cvs.*/\1/')
+BRANCHNEW=$(shell echo $(FULLVERSION) | sed -e 's/\(.*\)~rc.*/rc-\1/' -e 's/\./-/g')
+RCVERSIONNEW=$(shell echo $(FULLVERSION) | sed -e 's/.*~\(rc.*\)/\1/')
+
+# The following version strings are reflecting the status in changelog
+testversions:
+	echo $(FULLVERSION)
+	echo $(BRANCHNEW)
+	echo $(RCVERSIONNEW)
+
+%:
+	dh $@ --with python2
+
+override_dh_clean:
+	dh_clean
 	find . -name CVS -a -type d| xargs -r rm -r
-	rm -rf build build-stamp debian/Pmv
+
+get-orig-source:
+	./debian/get-orig-source/get-orig-source $(SRC) $(BRANCH) $(RCVERSION)
+