Author: tuskentower-guest
Date: 2013-02-06 20:07:20 +0000 (Wed, 06 Feb 2013)
New Revision: 12928

Modified:
   trunk/packages/fis-gtm/trunk/debian/changelog
   trunk/packages/fis-gtm/trunk/debian/control
   trunk/packages/fis-gtm/trunk/debian/get-orig-source
   trunk/packages/fis-gtm/trunk/debian/rules
Log:
Update get-orig-source
- drop bootstrap files

Minor changes to GT.M version in various places



Modified: trunk/packages/fis-gtm/trunk/debian/changelog
===================================================================
--- trunk/packages/fis-gtm/trunk/debian/changelog       2013-02-06 18:59:24 UTC 
(rev 12927)
+++ trunk/packages/fis-gtm/trunk/debian/changelog       2013-02-06 20:07:20 UTC 
(rev 12928)
@@ -1,4 +1,4 @@
-fis-gtm (6.0.001) UNRELEASED; urgency=low
+fis-gtm (6.0-001-1) UNRELEASED; urgency=low
 
   [ Amul Shah ]
   * Initial release (Closes: #541239)
@@ -6,6 +6,7 @@
   * Update patches to match the new sources.
     Special thanks to Brad King for reissuing them
   * Add the V6.0-001 release note
+  * fix get-orig-source and drop references to extra bootstrap files
 
  -- Amul Shah <[email protected]>  Fri, 25 Jan 2013 23:13:11 -0500
 

Modified: trunk/packages/fis-gtm/trunk/debian/control
===================================================================
--- trunk/packages/fis-gtm/trunk/debian/control 2013-02-06 18:59:24 UTC (rev 
12927)
+++ trunk/packages/fis-gtm/trunk/debian/control 2013-02-06 20:07:20 UTC (rev 
12928)
@@ -20,7 +20,7 @@
 
 Package: fis-gtm
 Architecture: all
-Depends: ${misc:Depends}, fis-gtm-6.0.001
+Depends: ${misc:Depends}, fis-gtm-6.0-001
 Description: metapackage for the latest version of FIS-GT.M database
  GT.M is a database engine with scalability proven in large real-time
  transaction processing systems that have thousands of concurrent
@@ -50,7 +50,7 @@
  .
  This metapackage always depends from the default fis-gtm version.
 
-Package: fis-gtm-6.0.001
+Package: fis-gtm-6.0-001
 Architecture: amd64 i386
 Depends: ${shlibs:Depends}, ${misc:Depends}, libicu-dev
 Provides: gtm, mumps

Modified: trunk/packages/fis-gtm/trunk/debian/get-orig-source
===================================================================
--- trunk/packages/fis-gtm/trunk/debian/get-orig-source 2013-02-06 18:59:24 UTC 
(rev 12927)
+++ trunk/packages/fis-gtm/trunk/debian/get-orig-source 2013-02-06 20:07:20 UTC 
(rev 12928)
@@ -2,60 +2,20 @@
 # 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
-NAME=`dpkg-parsechangelog | awk '/^Source/ { print $2 }'`
-UPSTREAMNAME=`echo $NAME | sed 's/^fis-//'`
 
-if ! echo $@ | grep -q upstream-version ; then
-    VERSION=`dpkg-parsechangelog | awk '/^Version:/ { print $2 }' | sed 
's/\([0-9\.]\+\)-[0-9]\+$/\1/'`
-    # regard dversionmangle
-    VERSION=`echo ${VERSION} | sed 's/[.-]//g'`
-else
-    VERSION=`echo $@ | sed "s?^.*--upstream-version \([0-9A-Z]\+\) 
.*${NAME}.*?\1?"`
-    if echo "$VERSION" | grep -q "upstream-version" ; then
-        echo "Unable to parse version number"
-        exit
-    fi
-fi
+wget -q -N 
http://sourceforge.net/projects/fis-gtm/files/GT.M-x86-Linux-src/V6.0-001/gtm_V60001_linux_i686_src.tar.gz
+NAME="fis-gtm"
+PKGVERSION="V6.0-001"
 
-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"
+OUTPUTDIR=${NAME}-${PKGVERSION}
+mkdir ${OUTPUTDIR}
+cd ${OUTPUTDIR}
+tar -xzf ../gtm_V60001_linux_i686_src.tar.gz
+cd ..
+GZIP="--best --no-name" tar --owner=root --group=root --mode=a+rX -czf 
../${NAME}_${PKGVERSION}.orig.tar.gz ${OUTPUTDIR}
+rm -rf ${OUTPUTDIR}
+rm gtm_V60001_linux_i686_src.tar.gz
 
-TARBALLDIR=../tarballs
-mkdir -p ${TARBALLDIR}
-cd ${TARBALLDIR}
-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/
-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}*src.tar.gz
-    # 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}
-    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/trunk/debian/rules
===================================================================
--- trunk/packages/fis-gtm/trunk/debian/rules   2013-02-06 18:59:24 UTC (rev 
12927)
+++ trunk/packages/fis-gtm/trunk/debian/rules   2013-02-06 20:07:20 UTC (rev 
12928)
@@ -8,9 +8,7 @@
 SRC_EXTRAS_DIR=fis-gtm-src-extras
 
 ARCH := $(shell dpkg-architecture -qDEB_HOST_GNU_CPU)
-UVER := $(shell LC_ALL=C dpkg-parsechangelog | awk '/^Version:/{print $$2;}')
-UVERGIT := $(shell echo $(UVER) | sed 's,.*+git[0-9]*-g,,' 2>/dev/null | grep 
-v '-')
-# Strip any +REV, e.g. +gitXX-gTREEISH
+UVER := $(shell LC_ALL=C dpkg-parsechangelog | awk 
'/^Version:/{sub(/-[0-9]*$$/,"");print $$2;}')
 UAPIVER := $(shell echo $(UVER) | sed -e 's,+.*,,')
 UAPIDIR := V$(UAPIVER)_$(ARCH)
 SRCPKG := $(shell dpkg-parsechangelog | sed -n 's/^Source: //p')
@@ -51,15 +49,34 @@
        echo "I: Fixing up permissions for removed write rights -- we aren't 
done yet!"
        chmod +w -R $(LOCAL_GTM_INSTALL_DIR)
        chmod +w -R $(LOCAL_GTM_INSTALL_DIR)/utf8
+       chmod 0755 $(LOCAL_GTM_INSTALL_DIR)/utf8
+       chmod 0755 $(LOCAL_GTM_INSTALL_DIR)/plugin
        echo "I: Fixing up permissions for setuid rights -- we aren't done yet!"
        chmod 4755 $(LOCAL_GTM_INSTALL_DIR)/gtmsecshr
        chmod 0500 $(LOCAL_GTM_INSTALL_DIR)/gtmsecshrdir
        chmod 4500 $(LOCAL_GTM_INSTALL_DIR)/gtmsecshrdir/gtmsecshr
-       echo "changing permissions to 644 for files that will be sourced"
+       echo "I: changing permissions to 644 for files that will be sourced"
        chmod 0644 $(LOCAL_GTM_INSTALL_DIR)/gtmprofile
        chmod 0644 $(LOCAL_GTM_INSTALL_DIR)/gtmprofile_preV54000
        chmod 0644 $(LOCAL_GTM_INSTALL_DIR)/gtcm_slist
        chmod 0644 $(LOCAL_GTM_INSTALL_DIR)/gtmcshrc
+       echo "I: Fixing executable permissions"
+       chmod 0755 $(LOCAL_GTM_INSTALL_DIR)/dse
+       chmod 0755 $(LOCAL_GTM_INSTALL_DIR)/ftok
+       chmod 0755 $(LOCAL_GTM_INSTALL_DIR)/geteuid
+       chmod 0755 $(LOCAL_GTM_INSTALL_DIR)/gtcm_gnp_server
+       chmod 0755 $(LOCAL_GTM_INSTALL_DIR)/gtcm_pkdisp
+       chmod 0755 $(LOCAL_GTM_INSTALL_DIR)/gtcm_play
+       chmod 0755 $(LOCAL_GTM_INSTALL_DIR)/gtcm_run
+       chmod 0755 $(LOCAL_GTM_INSTALL_DIR)/gtcm_server
+       chmod 0755 $(LOCAL_GTM_INSTALL_DIR)/gtcm_shmclean
+       chmod 0755 $(LOCAL_GTM_INSTALL_DIR)/gtmstart
+       chmod 0755 $(LOCAL_GTM_INSTALL_DIR)/gtmstop
+       chmod 0755 $(LOCAL_GTM_INSTALL_DIR)/lke
+       chmod 0755 $(LOCAL_GTM_INSTALL_DIR)/mumps
+       chmod 0755 $(LOCAL_GTM_INSTALL_DIR)/mupip
+       chmod 0755 $(LOCAL_GTM_INSTALL_DIR)/semstat2
+
        echo "I: Final permissions after dh_fixperms"
        ls -l $(LOCAL_GTM_INSTALL_DIR)
 
@@ -81,24 +98,17 @@
 
        dh_lintian
 
-# FIXME : cvs export from SF.net
-#get-orig-source:
-#      : # If no treeish -- standard release -- fetch using uscan,
-#      : # otherwise fetch corresponding treeish from GIT
-#      if [ -z '$(UVERGIT)' ]; then \
-#              uscan --verbose --force-download; \
-#      else \
-#              wget -q -O../fis-gtm_$(UVER).orig.tar.gz 
https://github.com/luisibanez/fis-gtm/tarball/$(UVERGIT); \
-#      fi
+get-orig-source:
+       ./debian/get-orig-source
 
 # FIXME : use the version from changelog
 override_dh_auto_clean:
        dh_auto_clean
        rm -rf debian/$(BINPKG)-stage1
-       rm -f debian/fis-gtm.links debian/fis-gtm-6.0.001.lintian-overrides
+       rm -f debian/fis-gtm.links debian/fis-gtm-$(UVER).lintian-overrides
 
 override_dh_installchangelogs:
-       dh_installchangelogs 
debian/upstream-files/GTM_V6.0-001_Release_Notes.html
+       dh_installchangelogs 
debian/upstream-files/GTM_$(UVER)_Release_Notes.html
 
 # for some strange reason dh_strip does not seem to do a reliable job
 # FIXME: there should be some more elegant solution like this


_______________________________________________
debian-med-commit mailing list
[email protected]
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit

Reply via email to