Author: tille
Date: 2012-02-08 09:10:20 +0000 (Wed, 08 Feb 2012)
New Revision: 9626
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:
Merge in files needed to enable building without working Mumps
Modified: trunk/packages/fis-gtm/fis-gtm/trunk/debian/changelog
===================================================================
--- trunk/packages/fis-gtm/fis-gtm/trunk/debian/changelog 2012-02-08
08:51:40 UTC (rev 9625)
+++ trunk/packages/fis-gtm/fis-gtm/trunk/debian/changelog 2012-02-08
09:10:20 UTC (rev 9626)
@@ -17,13 +17,13 @@
version number
- unpack original tarball into separate and versioned dir
- pack tarball as "non-dirty" tarball
- TODO: Add separate files prepared by Luis
+ - merge in additional files needed to build without running Mumps
* debian/rules:
- get-orig-source target uses uscan
- dropped info about UPSTREAM_SITE which is implicitely given
in debian/watch
- -- Andreas Tille <[email protected]> Wed, 08 Feb 2012 09:45:13 +0100
+ -- Andreas Tille <[email protected]> Wed, 08 Feb 2012 10:08:11 +0100
fis-gtm (5.4-002A-1) UNRELEASED; urgency=low
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-08
08:51:40 UTC (rev 9625)
+++ trunk/packages/fis-gtm/fis-gtm/trunk/debian/get-orig-source 2012-02-08
09:10:20 UTC (rev 9626)
@@ -2,8 +2,10 @@
# get source for fis-gtm including extra autogenerated files provided
separately
# to enable build without existing Mumps compiler
+UPSTREAM_EXTRAS_SITE="http://public.kitware.com/pub/itk/OSEHRA";
+
+#set -x
set -e
-set -x
NAME=`dpkg-parsechangelog | awk '/^Source/ { print $2 }'`
UPSTREAMNAME=`echo $NAME | sed 's/^fis-//'`
@@ -19,28 +21,39 @@
fi
fi
+UPSTREAM_EXTRAS_SRC="gtm_V${VERSION}_linux_i686_src_extras"
+UPSTREAM_EXTRAS_SRC_TGZ="${UPSTREAM_EXTRAS_SRC}.tar.gz"
+
TARBALLDIR=../tarballs
mkdir -p ${TARBALLDIR}
cd ${TARBALLDIR}
-mv ../${UPSTREAMNAME}_V${VERSION}*.tar.gz .
+mv ../${UPSTREAMNAME}_V${VERSION}*src.tar.gz .
+rm -f ../${NAME}_${VERSION}.orig.tar.gz
# obtain "real" version number from subdirectory name at SF
wget -q -N http://sourceforge.net/projects/fis-gtm/files/GT.M-x86-Linux-src/
-grep $VERSION index.html > index_tmp
PKGVERSION=`grep $VERSION index.html | sed
"s?.*x86-Linux/V\([-0-9.A-Z]\+\)/gtm_V${VERSION}_linux_.*?\1?" | head -n 1`
# check whether we found the real version
TMPVERSION=`echo $PKGVERSION | sed 's/[.-]//g'`
if [ "$TMPVERSION" = "$VERSION" ] ; then
+ rm -f index.html
+
+ # fetch additional files to enable build without working Mumps installation
+ wget -N ${UPSTREAM_EXTRAS_SITE}/${UPSTREAM_EXTRAS_SRC_TGZ}
+ tar -xzf ${UPSTREAM_EXTRAS_SRC_TGZ}
+
OUTPUTDIR=${NAME}-${PKGVERSION}
mkdir ${OUTPUTDIR}
cd ${OUTPUTDIR}
- tar -xzf ../${UPSTREAMNAME}_V${VERSION}*.tar.gz
+ tar -xzf ../${UPSTREAMNAME}_V${VERSION}*src.tar.gz
+ # copy files from extra_src straight into source dir
+ cp -a ../${NAME}/* .
cd ..
GZIP="--best --no-name" tar --owner=root --group=root --mode=a+rX -czf
${NAME}_${PKGVERSION}.orig.tar.gz ${OUTPUTDIR}
- rm -rf ${OUTPUTDIR}
+ rm -rf ${OUTPUTDIR} ${NAME}
else
echo "Failed to detect real version from Sourceforge index file. Please
check regular expression"
fi
Modified: trunk/packages/fis-gtm/fis-gtm/trunk/debian/rules
===================================================================
--- trunk/packages/fis-gtm/fis-gtm/trunk/debian/rules 2012-02-08 08:51:40 UTC
(rev 9625)
+++ trunk/packages/fis-gtm/fis-gtm/trunk/debian/rules 2012-02-08 09:10:20 UTC
(rev 9626)
@@ -5,10 +5,6 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
-UPSTREAM_EXTRAS_SRC = gtm_V54002B_linux_i686_src_extras
-UPSTREAM_EXTRAS_SITE = http://public.kitware.com/pub/itk/OSEHRA
-UPSTREAM_EXTRAS_SRC_TGZ = $(UPSTREAM_EXTRAS_SRC).tar.gz
-
%:
dh $@
@@ -19,8 +15,6 @@
override_dh_auto_install:
-$(UPSTREAM_EXTRAS_SRC_TGZ):
- wget $(UPSTREAM_EXTRAS_SITE)/$(UPSTREAM_EXTRAS_SRC_TGZ)
get-orig-source:
uscan --verbose --force-download
_______________________________________________
debian-med-commit mailing list
[email protected]
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit
