[med-svn] r7316 - in trunk/packages/fis-gtm/fis-gtm-initial-i386/trunk/debian: . po

Thorsten Alteholz alteholz-guest at alioth.debian.org
Fri Jul 22 17:57:10 UTC 2011


Author: alteholz-guest
Date: 2011-07-22 17:57:09 +0000 (Fri, 22 Jul 2011)
New Revision: 7316

Added:
   trunk/packages/fis-gtm/fis-gtm-initial-i386/trunk/debian/fis-gtm-initial.config
   trunk/packages/fis-gtm/fis-gtm-initial-i386/trunk/debian/fis-gtm-initial.templates
   trunk/packages/fis-gtm/fis-gtm-initial-i386/trunk/debian/watch.amd64
Removed:
   trunk/packages/fis-gtm/fis-gtm-initial-i386/trunk/debian/fis-gtm-initial-i386.config
   trunk/packages/fis-gtm/fis-gtm-initial-i386/trunk/debian/fis-gtm-initial-i386.templates
Modified:
   trunk/packages/fis-gtm/fis-gtm-initial-i386/trunk/debian/changelog
   trunk/packages/fis-gtm/fis-gtm-initial-i386/trunk/debian/control
   trunk/packages/fis-gtm/fis-gtm-initial-i386/trunk/debian/copyright
   trunk/packages/fis-gtm/fis-gtm-initial-i386/trunk/debian/get-orig-source
   trunk/packages/fis-gtm/fis-gtm-initial-i386/trunk/debian/po/POTFILES.in
   trunk/packages/fis-gtm/fis-gtm-initial-i386/trunk/debian/postinst
Log:
just one package for the inital software on i386 and amd64

Modified: trunk/packages/fis-gtm/fis-gtm-initial-i386/trunk/debian/changelog
===================================================================
--- trunk/packages/fis-gtm/fis-gtm-initial-i386/trunk/debian/changelog	2011-07-21 19:54:38 UTC (rev 7315)
+++ trunk/packages/fis-gtm/fis-gtm-initial-i386/trunk/debian/changelog	2011-07-22 17:57:09 UTC (rev 7316)
@@ -1,4 +1,4 @@
-fis-gtm-initial-i386 (54002A-1) unstable; urgency=low
+fis-gtm-initial (54002A-1) unstable; urgency=low
 
   * Initial release, helps to close #541239
 

Modified: trunk/packages/fis-gtm/fis-gtm-initial-i386/trunk/debian/control
===================================================================
--- trunk/packages/fis-gtm/fis-gtm-initial-i386/trunk/debian/control	2011-07-21 19:54:38 UTC (rev 7315)
+++ trunk/packages/fis-gtm/fis-gtm-initial-i386/trunk/debian/control	2011-07-22 17:57:09 UTC (rev 7316)
@@ -1,4 +1,4 @@
-Source: fis-gtm-initial-i386
+Source: fis-gtm-initial
 Section: science
 Priority: extra
 Build-Depends: debhelper (>= 8), adduser, ucf, po-debconf
@@ -11,11 +11,10 @@
 Vcs-Browser: http://svn.debian.org/wsvn/debian-med/trunk/packages/fis-gtm/fis-gtm/trunk/?rev=0&sc=0
 Vcs-Svn: svn://svn.debian.org/svn/debian-med/trunk/packages/fis-gtm/fis-gtm/trunk/
 
-Package: fis-gtm-initial-i386
-Architecture: i386
+Package: fis-gtm-initial
+Architecture: amd64 i386
 Depends: ${misc:Depends}, adduser, ucf
-Provides: fis-gtm-initial
-Description: initial package of FIS-GTM for architecture i386
+Description: initial package of FIS-GTM for architecture i386 and amd64
  GT.M is a database engine with scalability proven in large real-time
  transaction processing systems that have thousands of concurrent
  users, individual database file sizes to the Terabyte range (with
@@ -24,4 +23,4 @@
  applications and software appliances (virtual machines).
  .
  FIS-GTM needs an initial package to build other versions from source.
- This package contains the needed binaries for architecture i386.
+ This package contains the needed binaries for architecture i386 and amd64.

Modified: trunk/packages/fis-gtm/fis-gtm-initial-i386/trunk/debian/copyright
===================================================================
--- trunk/packages/fis-gtm/fis-gtm-initial-i386/trunk/debian/copyright	2011-07-21 19:54:38 UTC (rev 7315)
+++ trunk/packages/fis-gtm/fis-gtm-initial-i386/trunk/debian/copyright	2011-07-22 17:57:09 UTC (rev 7316)
@@ -1,5 +1,5 @@
 Format: http://dep.debian.net/deps/dep5
-Upstream-Name: fis-gtm-initial-i386
+Upstream-Name: fis-gtm-initial
 Source: http://sf.net/fis-gtm/gtm_V(.*)_linux_i686_pro\.tar\.gz
 
 Files: *

Deleted: trunk/packages/fis-gtm/fis-gtm-initial-i386/trunk/debian/fis-gtm-initial-i386.config
===================================================================
--- trunk/packages/fis-gtm/fis-gtm-initial-i386/trunk/debian/fis-gtm-initial-i386.config	2011-07-21 19:54:38 UTC (rev 7315)
+++ trunk/packages/fis-gtm/fis-gtm-initial-i386/trunk/debian/fis-gtm-initial-i386.config	2011-07-22 17:57:09 UTC (rev 7316)
@@ -1,27 +0,0 @@
-#!/bin/sh
-
-set -e
-
-. /usr/share/debconf/confmodule
-CONFFILE="/etc/default/fis-gtm-inital"
-
-if [ -e "${CONFFILE}" ]
-then
-        . ${CONFFILE} || true
-
-        if [ -n "${FISGTM_USER}" ]; then
-                db_set fisgtm/username "${FISGTM_USER}"
-        fi
-
-        if [ -n "${FISGTM_GROUP}" ]; then
-                db_set fisgtm/groupname "${FISGTM_GROUP}"
-        fi
-
-fi
-
-db_input low fisgtm/username || true
-db_input low fisgtm/groupname || true
-db_go
-
-db_stop
-

Deleted: trunk/packages/fis-gtm/fis-gtm-initial-i386/trunk/debian/fis-gtm-initial-i386.templates
===================================================================
--- trunk/packages/fis-gtm/fis-gtm-initial-i386/trunk/debian/fis-gtm-initial-i386.templates	2011-07-21 19:54:38 UTC (rev 7315)
+++ trunk/packages/fis-gtm/fis-gtm-initial-i386/trunk/debian/fis-gtm-initial-i386.templates	2011-07-22 17:57:09 UTC (rev 7316)
@@ -1,16 +0,0 @@
-Template: fisgtm/username
-Type: string
-Default: fisgtm
-_Description: Dedicated system account for the FIS-GTM daemon:
- The FIS-GTM server must use a dedicated account for its operation so that
- the system's security is not compromised by running it with superuser
- privileges.
-
-Template: fisgtm/groupname
-Type: string
-Default: fisgtm
-_Description: Dedicated system group for the FIS-GTM daemon:
- The FIS-GTM server must use a dedicated group for its operation so that
- the system's security is not compromised by running it with superuser
- privileges.
-

Added: trunk/packages/fis-gtm/fis-gtm-initial-i386/trunk/debian/fis-gtm-initial.config
===================================================================
--- trunk/packages/fis-gtm/fis-gtm-initial-i386/trunk/debian/fis-gtm-initial.config	                        (rev 0)
+++ trunk/packages/fis-gtm/fis-gtm-initial-i386/trunk/debian/fis-gtm-initial.config	2011-07-22 17:57:09 UTC (rev 7316)
@@ -0,0 +1,27 @@
+#!/bin/sh
+
+set -e
+
+. /usr/share/debconf/confmodule
+CONFFILE="/etc/default/fis-gtm-inital"
+
+if [ -e "${CONFFILE}" ]
+then
+        . ${CONFFILE} || true
+
+        if [ -n "${FISGTM_USER}" ]; then
+                db_set fisgtm/username "${FISGTM_USER}"
+        fi
+
+        if [ -n "${FISGTM_GROUP}" ]; then
+                db_set fisgtm/groupname "${FISGTM_GROUP}"
+        fi
+
+fi
+
+db_input low fisgtm/username || true
+db_input low fisgtm/groupname || true
+db_go
+
+db_stop
+

Added: trunk/packages/fis-gtm/fis-gtm-initial-i386/trunk/debian/fis-gtm-initial.templates
===================================================================
--- trunk/packages/fis-gtm/fis-gtm-initial-i386/trunk/debian/fis-gtm-initial.templates	                        (rev 0)
+++ trunk/packages/fis-gtm/fis-gtm-initial-i386/trunk/debian/fis-gtm-initial.templates	2011-07-22 17:57:09 UTC (rev 7316)
@@ -0,0 +1,16 @@
+Template: fisgtm/username
+Type: string
+Default: fisgtm
+_Description: Dedicated system account for the FIS-GTM daemon:
+ The FIS-GTM server must use a dedicated account for its operation so that
+ the system's security is not compromised by running it with superuser
+ privileges.
+
+Template: fisgtm/groupname
+Type: string
+Default: fisgtm
+_Description: Dedicated system group for the FIS-GTM daemon:
+ The FIS-GTM server must use a dedicated group for its operation so that
+ the system's security is not compromised by running it with superuser
+ privileges.
+

Modified: trunk/packages/fis-gtm/fis-gtm-initial-i386/trunk/debian/get-orig-source
===================================================================
--- trunk/packages/fis-gtm/fis-gtm-initial-i386/trunk/debian/get-orig-source	2011-07-21 19:54:38 UTC (rev 7315)
+++ trunk/packages/fis-gtm/fis-gtm-initial-i386/trunk/debian/get-orig-source	2011-07-22 17:57:09 UTC (rev 7316)
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/dash
 
 echo "check version of software"
 
@@ -7,35 +7,55 @@
 DOWNLOADSEARCH="Downloading updated package"
 tmpfile=`mktemp`
 
-uscan --verbose --force-download --no-symlink> $tmpfile
+getSource()
+{
+ watch=$1
+ arch=$2
 
-grep "$ALREADYSEARCH" $tmpfile
-rc=$?
-if [ $rc -eq 0 ]; then
-  # file already available
-  filename=`grep "$ALREADYSEARCH" $tmpfile|awk '{printf("%s",$2)}'`
-fi
+ uscan --watchfile $watch --verbose --force-download --no-symlink> $tmpfile
 
-grep "$DOWNLOADSEARCH" $tmpfile
-rc=$?
-if [ $rc -eq 0 ]; then
-  # file downloaded
-  filename=`grep "$DOWNLOADSEARCH" $tmpfile|awk '{printf("%s",$5)}'`
-fi
+ grep "$ALREADYSEARCH" $tmpfile
+ rc=$?
+ if [ $rc -eq 0 ]; then
+   # file already available
+   filename=`grep "$ALREADYSEARCH" $tmpfile|awk '{printf("%s",$2)}'`
+ fi
 
-echo "Filename: $filename"
+ grep "$DOWNLOADSEARCH" $tmpfile
+ rc=$?
+ if [ $rc -eq 0 ]; then
+   # file downloaded
+   filename=`grep "$DOWNLOADSEARCH" $tmpfile|awk '{printf("%s",$5)}'`
+ fi
 
-PKG=`dpkg-parsechangelog | awk '/^Source/ { print $2 }'`
-PKGVERSION=`dpkg-parsechangelog | awk '/^Version:/ { print $2 }' | sed 's/\([0-9\.]\+\)-[0-9]\+$/\1/'| cut -d- -f1`
+ echo "Filename i386: $filename"
 
-echo "PKG: $PKG"
-echo "PKGVERSION: $PKGVERSION"
+ PKG=`dpkg-parsechangelog | awk '/^Source/ { print $2 }'`
+ PKGVERSION=`dpkg-parsechangelog | awk '/^Version:/ { print $2 }' | sed 's/\([0-9\.]\+\)-[0-9]\+$/\1/'| cut -d- -f1`
 
-basefile=`basename $filename .tar.gz`
+ echo "PKG: $PKG"
+ echo "PKGVERSION: $PKGVERSION"
+ echo "architecture: $arch"
 
+ basefile=`basename $filename .tar.gz`
+
+# (cd ..; \
+#	mkdir -p $basefile; \
+#	cp $filename $basefile; \
+#	tar -zcf "$PKG-$arch"_"$PKGVERSION".orig.tar.gz $basefile; \
+# )
+
+ (cd ..; \
+	mkdir -p $PKG; \
+	cp $filename $PKG/$basefile-$arch.tar.gz; \
+ )
+
+ rm $tmpfile
+}
+
+getSource ./debian/watch i386
+getSource ./debian/watch.amd64 amd64
+
 cd ..
-mkdir -p $basefile
-cp $filename $basefile
-tar -zcf "$PKG"_"$PKGVERSION".orig.tar.gz $basefile
+tar -zcf "$PKG"_"$PKGVERSION".orig.tar.gz $PKG
 
-rm $tmpfile

Modified: trunk/packages/fis-gtm/fis-gtm-initial-i386/trunk/debian/po/POTFILES.in
===================================================================
--- trunk/packages/fis-gtm/fis-gtm-initial-i386/trunk/debian/po/POTFILES.in	2011-07-21 19:54:38 UTC (rev 7315)
+++ trunk/packages/fis-gtm/fis-gtm-initial-i386/trunk/debian/po/POTFILES.in	2011-07-22 17:57:09 UTC (rev 7316)
@@ -1 +1 @@
-[type: gettext/rfc822deb] fis-gtm-initial-i386.templates
+[type: gettext/rfc822deb] fis-gtm-initial.templates

Modified: trunk/packages/fis-gtm/fis-gtm-initial-i386/trunk/debian/postinst
===================================================================
--- trunk/packages/fis-gtm/fis-gtm-initial-i386/trunk/debian/postinst	2011-07-21 19:54:38 UTC (rev 7315)
+++ trunk/packages/fis-gtm/fis-gtm-initial-i386/trunk/debian/postinst	2011-07-22 17:57:09 UTC (rev 7316)
@@ -53,7 +53,8 @@
 	rm -rf TMPPOSTINST
 	mkdir TMPPOSTINST
 	cd TMPPOSTINST
-	lastversion=`ls -1 ../distribution|head -1`
+	eval `dpkg-architecture -s`
+	lastversion=`ls -1 ../distribution|grep "$DEB_BUILD_ARCH"|head -1`
 	tar -zxf ../distribution/$lastversion
 
 	mkdir -p $FISGTM_ROOT/$FISGTM_VERSION_INITIAL-initial

Added: trunk/packages/fis-gtm/fis-gtm-initial-i386/trunk/debian/watch.amd64
===================================================================
--- trunk/packages/fis-gtm/fis-gtm-initial-i386/trunk/debian/watch.amd64	                        (rev 0)
+++ trunk/packages/fis-gtm/fis-gtm-initial-i386/trunk/debian/watch.amd64	2011-07-22 17:57:09 UTC (rev 7316)
@@ -0,0 +1,3 @@
+version=3
+
+http://sf.net/fis-gtm/gtm_V(.*)_linux_x8664_pro\.tar\.gz




More information about the debian-med-commit mailing list