[med-svn] r12915 - in trunk/packages/fis-gtm/trunk/debian: . patches
Amul Shah
tuskentower-guest at alioth.debian.org
Tue Feb 5 19:45:48 UTC 2013
Author: tuskentower-guest
Date: 2013-02-05 19:45:48 +0000 (Tue, 05 Feb 2013)
New Revision: 12915
Modified:
trunk/packages/fis-gtm/trunk/debian/changelog
trunk/packages/fis-gtm/trunk/debian/compat
trunk/packages/fis-gtm/trunk/debian/control
trunk/packages/fis-gtm/trunk/debian/copyright
trunk/packages/fis-gtm/trunk/debian/patches/up_gtm_destdir_Refactor-object-file-source-name-storage
trunk/packages/fis-gtm/trunk/debian/patches/up_gtm_destdir_Support-source-to-object-compilation-in-a-DESTDIR
trunk/packages/fis-gtm/trunk/debian/patches/up_gtm_destdir_substitution
trunk/packages/fis-gtm/trunk/debian/rules
Log:
V6.0-001 builds do not work yet
debian/patches/*
Brad King re-issued patches for GT.M V6.0-001 sources
debian/*
Amul Shah updates the version and maintainership information
Amul Shah attempts to grok the debian packaging system which means some stuff might be out of place
Modified: trunk/packages/fis-gtm/trunk/debian/changelog
===================================================================
--- trunk/packages/fis-gtm/trunk/debian/changelog 2013-02-05 18:13:50 UTC (rev 12914)
+++ trunk/packages/fis-gtm/trunk/debian/changelog 2013-02-05 19:45:48 UTC (rev 12915)
@@ -1,3 +1,12 @@
+fis-gtm (6.0.001) UNRELEASED; urgency=low
+
+ [ Amul Shah ]
+ * Change target release version V6.0.001
+ * Update patches to match the new sources.
+ Special thanks to Brad King for reissuing them
+
+ -- Amul Shah <amul.shah at fisglobal.com> Fri, 25 Jan 2013 23:13:11 -0500
+
fis-gtm (5.5-000+git109-g57f2d89-1) UNRELEASED; urgency=low
[ Luis Ibanez ]
Modified: trunk/packages/fis-gtm/trunk/debian/compat
===================================================================
--- trunk/packages/fis-gtm/trunk/debian/compat 2013-02-05 18:13:50 UTC (rev 12914)
+++ trunk/packages/fis-gtm/trunk/debian/compat 2013-02-05 19:45:48 UTC (rev 12915)
@@ -1 +1 @@
-9
+8
Modified: trunk/packages/fis-gtm/trunk/debian/control
===================================================================
--- trunk/packages/fis-gtm/trunk/debian/control 2013-02-05 18:13:50 UTC (rev 12914)
+++ trunk/packages/fis-gtm/trunk/debian/control 2013-02-05 19:45:48 UTC (rev 12915)
@@ -1,14 +1,15 @@
Source: fis-gtm
Section: database
Priority: extra
-Build-Depends: debhelper (>= 9),
+Build-Depends: debhelper (>= 8.0.0),
libicu-dev, locales,
tcsh, libncurses-dev,
gnupg, zlib1g-dev, libgcrypt11-dev, libgpgme11-dev,
linux-libc-dev, libelf-dev,
gcc-multilib, cmake (>= 2.8.5)
Standards-Version: 3.9.3
-Maintainer: Debian Med Packaging Team <debian-med-packaging at lists.alioth.debian.org>
+Maintainer: Amul Shah <Amul.Shah at fisglobal.com>
+ Debian Med Packaging Team <debian-med-packaging at lists.alioth.debian.org>
DM-Upload-Allowed: yes
Uploaders: Andreas Tille <tille at debian.org>,
Thorsten Alteholz <debian at alteholz.de>,
@@ -19,7 +20,7 @@
Package: fis-gtm
Architecture: all
-Depends: ${misc:Depends}, fis-gtm-5.5.000
+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
@@ -49,7 +50,7 @@
.
This metapackage always depends from the default fis-gtm version.
-Package: fis-gtm-5.5.000
+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/copyright
===================================================================
--- trunk/packages/fis-gtm/trunk/debian/copyright 2013-02-05 18:13:50 UTC (rev 12914)
+++ trunk/packages/fis-gtm/trunk/debian/copyright 2013-02-05 19:45:48 UTC (rev 12915)
@@ -1,4 +1,4 @@
-Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Name: fis-gtm
Upstream-Contact: http://sourceforge.net/mailarchive/forum.php?forum_name=fis-gtm-core
Source: http://sf.net/fis-gtm/gtm_V(.*)_linux_i686_pro\.tar\.gz
@@ -9,7 +9,7 @@
Files: *
Copyright: 1987 - 2003 Sanchez Computer Associates
- 1987 - 2012 Fidelity Information Services, Inc
+ 1987 - 2013 Fidelity Information Services, Inc
Comment: Sanchez Computer Associates was acquired by FIS in 2004
License: AGPL-3.0
Modified: trunk/packages/fis-gtm/trunk/debian/patches/up_gtm_destdir_Refactor-object-file-source-name-storage
===================================================================
--- trunk/packages/fis-gtm/trunk/debian/patches/up_gtm_destdir_Refactor-object-file-source-name-storage 2013-02-05 18:13:50 UTC (rev 12914)
+++ trunk/packages/fis-gtm/trunk/debian/patches/up_gtm_destdir_Refactor-object-file-source-name-storage 2013-02-05 19:45:48 UTC (rev 12915)
@@ -1,7 +1,6 @@
-From 9e807f2434e3425f0a4e71860ae051deb7709e8f Mon Sep 17 00:00:00 2001
From: Brad King <brad.king at kitware.com>
Date: Mon, 18 Jun 2012 14:04:28 -0400
-Subject: [PATCH 1/2] Refactor object file source name storage
+Subject: [PATCH 2/3] Refactor object file source name storage
Teach 'comp_lits' and 'emit_literals' to lookup the source file name
through a new 'obj_source' structure. This will allow the source file
@@ -18,7 +17,7 @@
create mode 100644 sr_unix/obj_source.h
diff --git a/sr_i386/obj_file.c b/sr_i386/obj_file.c
-index da40b0e..8b7278a 100644
+index 3ff8953..3ae55ca 100644
--- a/sr_i386/obj_file.c
+++ b/sr_i386/obj_file.c
@@ -30,6 +30,7 @@
@@ -147,11 +146,11 @@
+
+#endif
diff --git a/sr_unix_nsb/comp_lits.c b/sr_unix_nsb/comp_lits.c
-index 06df2e2..2e64bef 100644
+index 5db7087..2c3a7da 100644
--- a/sr_unix_nsb/comp_lits.c
+++ b/sr_unix_nsb/comp_lits.c
@@ -14,10 +14,10 @@
- #include "rtnhdr.h"
+ #include <rtnhdr.h>
#include "mdq.h"
#include "stringpool.h"
+#include <obj_source.h>
@@ -179,5 +178,5 @@
rhead->routine_name.len = routine_name.len;
rhead->routine_name.addr = (char *)offset;
--
-1.7.9.1
+1.7.10.4
Modified: trunk/packages/fis-gtm/trunk/debian/patches/up_gtm_destdir_Support-source-to-object-compilation-in-a-DESTDIR
===================================================================
--- trunk/packages/fis-gtm/trunk/debian/patches/up_gtm_destdir_Support-source-to-object-compilation-in-a-DESTDIR 2013-02-05 18:13:50 UTC (rev 12914)
+++ trunk/packages/fis-gtm/trunk/debian/patches/up_gtm_destdir_Support-source-to-object-compilation-in-a-DESTDIR 2013-02-05 19:45:48 UTC (rev 12915)
@@ -1,7 +1,6 @@
-From 74aa25e0751a28a08202a13f9f13c79e532c29ab Mon Sep 17 00:00:00 2001
From: Brad King <brad.king at kitware.com>
Date: Mon, 18 Jun 2012 14:18:32 -0400
-Subject: [PATCH 2/2] Support source-to-object compilation in a DESTDIR
+Subject: [PATCH 3/3] Support source-to-object compilation in a DESTDIR
If environment variable 'gtm_destdir' is set, treat it as a prefix to be
removed from any source file paths contained inside it. This will allow
@@ -10,7 +9,7 @@
distribution.
---
sr_unix/obj_source.c | 13 +++++++++++++
- 1 files changed, 13 insertions(+), 0 deletions(-)
+ 1 file changed, 13 insertions(+)
diff --git a/sr_unix/obj_source.c b/sr_unix/obj_source.c
index 55f79b0..8fc4250 100644
@@ -40,5 +39,5 @@
return sn;
}
--
-1.7.9.1
+1.7.10.4
Modified: trunk/packages/fis-gtm/trunk/debian/patches/up_gtm_destdir_substitution
===================================================================
--- trunk/packages/fis-gtm/trunk/debian/patches/up_gtm_destdir_substitution 2013-02-05 18:13:50 UTC (rev 12914)
+++ trunk/packages/fis-gtm/trunk/debian/patches/up_gtm_destdir_substitution 2013-02-05 19:45:48 UTC (rev 12915)
@@ -1,12 +1,17 @@
From: Yaroslav Halchenko <debian at onerussian.com>
-Subject: Remove builddir prefix from the paths
+Subject: [PATCH 1/3] Remove builddir prefix from the paths
Origin: Debian
Last-Update: 2012-06-19
+---
+ sr_unix/configure.gtc | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+diff --git a/sr_unix/configure.gtc b/sr_unix/configure.gtc
+index 7db8be7..b9d2ca0 100644
--- a/sr_unix/configure.gtc
+++ b/sr_unix/configure.gtc
-@@ -371,7 +371,7 @@ fi
+@@ -372,7 +372,7 @@ fi
cat << SEDSCRIPT > sedin$$
s|ARCH|$arch|g
s|ECHO|"$echo"|g
@@ -15,7 +20,7 @@
s|SERVERID|$server_id|g
SEDSCRIPT
for i in $pathmods
-@@ -592,7 +592,7 @@ if [ -d "$plugin_gtmcrypt" ]; then
+@@ -615,7 +615,7 @@ if [ -d "$plugin_gtmcrypt" ]; then
# Install gpgagent.tab
# This is an external call table so the path to the shared library has to be adjusted
@@ -24,3 +29,6 @@
cat $plugin/gpgagent.tab | sed 1d >> $gtmdist/$plugin/gpgagent.tab
# Tar the source files
+--
+1.7.10.4
+
Modified: trunk/packages/fis-gtm/trunk/debian/rules
===================================================================
--- trunk/packages/fis-gtm/trunk/debian/rules 2013-02-05 18:13:50 UTC (rev 12914)
+++ trunk/packages/fis-gtm/trunk/debian/rules 2013-02-05 19:45:48 UTC (rev 12915)
@@ -3,12 +3,12 @@
# debian/rules for fis-gtm
# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
+export DH_VERBOSE=1
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;}' | sed -e 's,-[^-]*$$,,g')
+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
UAPIVER := $(shell echo $(UVER) | sed -e 's,+.*,,')
@@ -19,11 +19,11 @@
LOCAL_GTM_INSTALL_DIR := $(CURDIR)/debian/$(BINPKG)/usr/$(GTM_INSTALL_DIR)
# Set up some global environment variables needed for correct locale support
-export LOCPATH=$(CURDIR)/debian/tmp/locale
-export LC_ALL=en_US.UTF-8
+#TEMP#export LOCPATH=$(CURDIR)/debian/tmp/locale
+#TEMP#export LC_ALL=en_US.UTF-8
# Setup locales asap
-DUMMY := $(shell [ -e debian/tmp/locale/en_US.UTF-8 ] || { mkdir -p debian/tmp/locale/ && localedef -f UTF-8 -i en_US debian/tmp/locale/en_US.UTF-8; })
-DUMMY := $(shell [ -e debian/tmp/locale/en_US.utf8 ] || { mkdir -p debian/tmp/locale/ && localedef -f UTF-8 -i en_US debian/tmp/locale/en_US.utf8; })
+#TEMP#DUMMY := $(shell [ -e debian/tmp/locale/en_US.UTF-8 ] || { mkdir -p debian/tmp/locale/ && localedef -f UTF-8 -i en_US debian/tmp/locale/en_US.UTF-8; })
+#TEMP#DUMMY := $(shell [ -e debian/tmp/locale/en_US.utf8 ] || { mkdir -p debian/tmp/locale/ && localedef -f UTF-8 -i en_US debian/tmp/locale/en_US.utf8; })
%:
dh $@ --parallel
@@ -81,22 +81,24 @@
dh_lintian
-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
+# 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
+# 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-5.5.000.lintian-overrides
+ rm -f debian/fis-gtm.links debian/fis-gtm-6.0.001.lintian-overrides
override_dh_installchangelogs:
- dh_installchangelogs debian/upstream-files/GTM_V5.5-000_Release_Notes.html
+ dh_installchangelogs debian/upstream-files/GTM_V6.0-001_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
More information about the debian-med-commit
mailing list