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

[Luis Ibanez]

Author: luisibanez-guest
Date: 2012-02-12 17:09:05 +0000 (Sun, 12 Feb 2012)
New Revision: 9656

Modified:
   trunk/packages/fis-gtm/fis-gtm/trunk/debian/changelog
   trunk/packages/fis-gtm/fis-gtm/trunk/debian/get-orig-source
   trunk/packages/fis-gtm/fis-gtm/trunk/debian/rules
Log:
Fixed behavior of clean. Now the extra source files
are kept in a helper directory on the side, and are
restored during the configure step after a clean 
step have been executed.



Modified: trunk/packages/fis-gtm/fis-gtm/trunk/debian/changelog
===================================================================
--- trunk/packages/fis-gtm/fis-gtm/trunk/debian/changelog	2012-02-12 15:07:35 UTC (rev 9655)
+++ trunk/packages/fis-gtm/fis-gtm/trunk/debian/changelog	2012-02-12 17:09:05 UTC (rev 9656)
@@ -9,6 +9,14 @@
     - Solves bootstrapping challenges.
   * debian/patches/01-comlist.patch: Ensure make will not stop
     at a to early "MAKELEVEL"
+  * debian/rules:
+    - override_dh_clean now uses the gtm provided "clean" make target.
+    - override_dh_auto_configure now restores the extra files from the
+      helper directory: fis-gtm-src-extras
+    - now uses setupenv.sh from the fis-gtm-src-extras directory.
+  * debian/get-orig-source:
+    - Extra source files are now expanded in fis-gtm-src-extras 
+      directory, and this new directory is now part of the orig.tar.gz.
 
   [ Andreas Tille ]
   * debian/changelog: switch to "uncompressed" version numbers

Modified: trunk/packages/fis-gtm/fis-gtm/trunk/debian/get-orig-source
===================================================================
--- trunk/packages/fis-gtm/fis-gtm/trunk/debian/get-orig-source	2012-02-12 15:07:35 UTC (rev 9655)
+++ trunk/packages/fis-gtm/fis-gtm/trunk/debian/get-orig-source	2012-02-12 17:09:05 UTC (rev 9656)
@@ -23,6 +23,7 @@
 
 UPSTREAM_EXTRAS_SRC="gtm_V${VERSION}_linux_i686_src_extras"
 UPSTREAM_EXTRAS_SRC_TGZ="${UPSTREAM_EXTRAS_SRC}.tar.gz"
+SRC_EXTRAS_DIR="fis-gtm-src-extras"
 
 TARBALLDIR=../tarballs
 mkdir -p ${TARBALLDIR}
@@ -48,8 +49,9 @@
     mkdir ${OUTPUTDIR}
     cd ${OUTPUTDIR}
     tar -xzf ../${UPSTREAMNAME}_V${VERSION}*src.tar.gz
-    # copy files from extra_src straight into source dir
-    cp -a ../${NAME}/* .
+    # copy files from extra_src into side helper directory
+    mkdir ${SRC_EXTRAS_DIR}
+    cp -a ../${NAME}/* ${SRC_EXTRAS_DIR}
     cd ..
 
     GZIP="--best --no-name" tar --owner=root --group=root --mode=a+rX -czf ${NAME}_${PKGVERSION}.orig.tar.gz ${OUTPUTDIR}

Modified: trunk/packages/fis-gtm/fis-gtm/trunk/debian/rules
===================================================================
--- trunk/packages/fis-gtm/fis-gtm/trunk/debian/rules	2012-02-12 15:07:35 UTC (rev 9655)
+++ trunk/packages/fis-gtm/fis-gtm/trunk/debian/rules	2012-02-12 17:09:05 UTC (rev 9656)
@@ -5,18 +5,21 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
+SRC_EXTRAS_DIR=fis-gtm-src-extras
+
 %:
 	dh $@ 
 
+override_dh_auto_configure:
+	cp -a ./$(SRC_EXTRAS_DIR)/* .
+	dh_auto_configure
+
 override_dh_clean:
 	dh_clean
-	find $(CURDIR)         -name "*.o"   -delete
-	find $(CURDIR)         -name "*.i"   -delete
-	find $(CURDIR)         -name "*.log" -delete
-	find $(CURDIR)/pro/obj -name "*.txt" -delete
+	tcsh ./$(SRC_EXTRAS_DIR)/setupenv.sh clean
 
 override_dh_auto_build:
-	tcsh ./setupenv.sh
+	tcsh ./$(SRC_EXTRAS_DIR)/setupenv.sh
 
 override_dh_auto_install: