[med-svn] [fis-gtm] 02/02: Upstream version is now GT.M V6.3-000
Amul Shah
tuskentower-guest at moszumanska.debian.org
Wed Mar 30 21:21:06 UTC 2016
This is an automated email from the git hooks/post-receive script.
tuskentower-guest pushed a commit to branch master
in repository fis-gtm.
commit 99646672c214c77a29e609f7e69e081f366aa284
Author: Amul Shah <amul.shah at fisglobal.com>
Date: Tue Mar 29 15:44:30 2016 -0400
Upstream version is now GT.M V6.3-000
debian/changelog
debian/control
- Update relevant files for the new version numbering
debian/patches/series
debian/patches/upstream_fix_depency_order
- Remove outdated patches
debian/patches/series
debian/patches/correct_rundown_state_definition.patch
debian/patches/upstream_disable_autorelink
debian/patches/upstream_donot_deploy_all_encryption_libs
- Update and refresh existing patches
debian/patches/upstream_disable_autorelink
- Noticed another case that needed auto-relink disabled
debian/patches/upstream_fix_speeling_errors
- Apparently there are NEW spelling errores
debian/rules
debian/patches/upstream_donot_deploy_all_encryption_libs
- Drop locale creation as it is not used
- FIS stopped shipping the encryption plugins as binaries due to
library dependencies being different across hosts. So the install
script tars up the reference encryption plugin script and source
files. Undo that action for the Debian build system
- Add more lintian warning overrides to debian/rules
debian/watch
- Improve GT.M version matching. Some GT.M versions have a trailing
"letter"
These changes were build tested using git-buildpackage and cowbuilder on
a Debian 7.9 server targetting amd64 and i386 for wheezy and jessie.
---
debian/changelog | 6 +++
debian/control | 4 +-
.../patches/correct_rundown_state_definition.patch | 6 +--
debian/patches/series | 1 -
debian/patches/upstream_disable_autorelink | 8 ++-
.../upstream_donot_deploy_all_encryption_libs | 33 ++++++++++--
debian/patches/upstream_fix_depency_order | 20 -------
debian/patches/upstream_fix_speeling_errors | 63 ++++++----------------
debian/rules | 14 +++--
debian/watch | 2 +-
10 files changed, 71 insertions(+), 86 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 310eae7..de97ac0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+fis-gtm (6.3-000-1) UNRELEASED; urgency=medium
+
+ * Import latest sources and update package version
+
+ -- Amul Shah <Amul.Shah at fisglobal.com> Tue, 29 Mar 2016 14:44:37 -0400
+
fis-gtm (6.2-002A-3) unstable; urgency=medium
[ Gert Wollny ]
diff --git a/debian/control b/debian/control
index a01de6f..0835652 100644
--- a/debian/control
+++ b/debian/control
@@ -31,7 +31,7 @@ Homepage: http://sourceforge.net/projects/fis-gtm
Package: fis-gtm
Architecture: all
Depends: ${misc:Depends},
- fis-gtm-6.2-002
+ fis-gtm-6.3-000
Provides: mumps
Description: metapackage for the latest version of FIS-GT.M database
GT.M is a database engine with scalability proven in large real-time
@@ -62,7 +62,7 @@ Description: metapackage for the latest version of FIS-GT.M database
.
This metapackage always depends from the default fis-gtm version.
-Package: fis-gtm-6.2-002
+Package: fis-gtm-6.3-000
Architecture: amd64 i386
Multi-Arch: same
Depends: ${shlibs:Depends},
diff --git a/debian/patches/correct_rundown_state_definition.patch b/debian/patches/correct_rundown_state_definition.patch
index a38af75..514569d 100644
--- a/debian/patches/correct_rundown_state_definition.patch
+++ b/debian/patches/correct_rundown_state_definition.patch
@@ -4,8 +4,8 @@ Bug: https://bugs.debian.org/818861
--- a/sr_unix/gtm_exit_handler.c
+++ b/sr_unix/gtm_exit_handler.c
-@@ -57,6 +57,15 @@
- GBLREF boolean_t exit_handler_active;
+@@ -58,6 +58,15 @@
+ GBLREF boolean_t skip_exit_handler;
GBLREF boolean_t is_tracing_on;
+enum rundown_state
@@ -20,7 +20,7 @@ Bug: https://bugs.debian.org/818861
static enum rundown_state attempting;
#ifdef DEBUG
-@@ -137,14 +146,6 @@
+@@ -142,14 +151,6 @@
error_def(ERR_LKRUNDOWN);
error_def(ERR_MPROFRUNDOWN);
diff --git a/debian/patches/series b/debian/patches/series
index 4a5816c..365380e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,5 +2,4 @@
upstream_disable_autorelink
upstream_fix_speeling_errors
upstream_donot_deploy_all_encryption_libs
-upstream_fix_depency_order
correct_rundown_state_definition.patch
diff --git a/debian/patches/upstream_disable_autorelink b/debian/patches/upstream_disable_autorelink
index 0726e55..4db3d47 100644
--- a/debian/patches/upstream_disable_autorelink
+++ b/debian/patches/upstream_disable_autorelink
@@ -10,7 +10,13 @@ Last-Update: 2015-01-14
--- a/sr_unix/gtmprofile.gtc
+++ b/sr_unix/gtmprofile.gtc
-@@ -147,7 +147,7 @@
+@@ -150,12 +150,12 @@
+ if [ -d $gtm_dist/plugin/o/utf8 ] ; then
+ gtmroutines=`$gtm_dist/mumps -run %XCMD 'set x=$ztrnlnm("gtm_dist")_"/plugin/o/utf8/*."_$ztrnlnm("tmp_gtm_shlib") for set y=$zsearch(x) quit:""=y write y," "'`"$gtm_dist/plugin/o/utf8($gtm_dist/plugin/r) $gtmroutines"
+ fi
+- gtmroutines=`$gtm_dist/mumps -run %XCMD 'set x=$ztrnlnm("gtmdir")_"/"_$ztrnlnm("gtmver")_"/o/utf8/*."_$ztrnlnm("tmp_gtm_shlib") for set y=$zsearch(x) quit:""=y write y," "'`"$gtmdir/$gtmver/o/utf8*($gtmdir/$gtmver/r $gtmdir/r) $gtmroutines"
++ gtmroutines=`$gtm_dist/mumps -run %XCMD 'set x=$ztrnlnm("gtmdir")_"/"_$ztrnlnm("gtmver")_"/o/utf8/*."_$ztrnlnm("tmp_gtm_shlib") for set y=$zsearch(x) quit:""=y write y," "'`"$gtmdir/$gtmver/o/utf8($gtmdir/$gtmver/r $gtmdir/r) $gtmroutines"
+ else
if [ -d $gtm_dist/plugin/o ] ; then
gtmroutines=`$gtm_dist/mumps -run %XCMD 'set x=$ztrnlnm("gtm_dist")_"/plugin/o/*."_$ztrnlnm("tmp_gtm_shlib") for set y=$zsearch(x) quit:""=y write y," "'`"$gtm_dist/plugin/o($gtm_dist/plugin/r) $gtmroutines"
fi
diff --git a/debian/patches/upstream_donot_deploy_all_encryption_libs b/debian/patches/upstream_donot_deploy_all_encryption_libs
index 0822bda..ae43f7b 100644
--- a/debian/patches/upstream_donot_deploy_all_encryption_libs
+++ b/debian/patches/upstream_donot_deploy_all_encryption_libs
@@ -11,7 +11,7 @@ Last-Update: 2015-01-11
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
-@@ -544,7 +544,7 @@
+@@ -519,7 +519,7 @@
)
target_link_libraries(libgtmcrypt_openssl_AES256CFB ${GPG_LIBRARIES} ${TLS_LIBRARIES})
add_dependencies(libgtmcrypt_openssl_AES256CFB gen_gtm_threadgbl_deftypes)
@@ -20,7 +20,7 @@ Last-Update: 2015-01-11
# Library=OPENSSL Algorithm=BLOWFISHCFB
add_library(libgtmcrypt_openssl_BLOWFISHCFB MODULE ${libgtmcrypt_SOURCES})
-@@ -555,7 +555,7 @@
+@@ -530,7 +530,7 @@
)
target_link_libraries(libgtmcrypt_openssl_BLOWFISHCFB ${GPG_LIBRARIES} ${TLS_LIBRARIES})
add_dependencies(libgtmcrypt_openssl_BLOWFISHCFB gen_gtm_threadgbl_deftypes)
@@ -29,7 +29,7 @@ Last-Update: 2015-01-11
add_library(libgtmtls MODULE ${libgtmtls_SOURCES})
set_target_properties(libgtmtls PROPERTIES
-@@ -565,7 +565,7 @@
+@@ -540,7 +540,7 @@
)
target_link_libraries(libgtmtls ${TLS_LIBRARIES})
add_dependencies(libgtmtls gen_gtm_threadgbl_deftypes)
@@ -38,3 +38,30 @@ Last-Update: 2015-01-11
add_executable(maskpass ${maskpass_SOURCES})
target_link_libraries(maskpass ${GPG_LIBRARIES} ${TLS_LIBRARIES})
+@@ -768,14 +768,14 @@
+ STRING(REGEX REPLACE "\n" ";" locale_list "${locale_list}")
+ foreach(lc ${locale_list})
+ string(TOLOWER "${lc}" lc_lower)
+- if("x${lc_lower}" MATCHES "^xen_us\\.?utf-?8")
++ if("x${lc_lower}" MATCHES "^x[a-zA-Z_]+\\.?utf-?8")
+ set(LC_ALL ${lc})
+ message("-- Setting locale to ${LC_ALL}")
+ break()
+ endif()
+ endforeach(lc)
+ if("${LC_ALL}" STREQUAL "")
+- message("Locale undefined. Expect to see NONUTF8LOCALE during MUMPS routine compilation\n")
++ message("Locale undefined. Expect to see NONUTF8LOCALE during MUMPS routine compilation: ${locale_list}\n")
+ endif()
+ else()
+ message(FATAL_ERROR "Unable to find 'locale'. Set LOCALECFG in CMake cache.")
+--- a/sr_unix/configure.gtc
++++ b/sr_unix/configure.gtc
+@@ -544,6 +544,7 @@
+ chmod 0644 $gtmdist/$plugin_gtmcrypt/source.tar
+ chown ${owner}:${bingroup} $gtmdist/$plugin_gtmcrypt/source.tar
+ rm $plugin_gtmcrypt/README
++ (cd $gtmdist/$plugin_gtmcrypt && tar -xvf source.tar)
+ fi
+
+ # Install GDE, GTMHELP, and all the percent routines
diff --git a/debian/patches/upstream_fix_depency_order b/debian/patches/upstream_fix_depency_order
deleted file mode 100644
index cee2c1a..0000000
--- a/debian/patches/upstream_fix_depency_order
+++ /dev/null
@@ -1,20 +0,0 @@
-From: Amul Shah <Amul.Shah at fisglobal.com>
-Forwarded: not-needed
-Summary: xfer_desc is being built out of order
-Description: Due to a change in build order, xfer_desc.i is not generated prior
- to building libmumps.a. libmumps.a depends on xfer_desc.i, so make that
- dependency explicit.
-Last-Update: 2015-06-08
-
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -418,6 +418,9 @@
- set_property(TARGET lib${lib} PROPERTY OUTPUT_NAME ${lib})
- add_dependencies(lib${lib} gen_gtm_threadgbl_deftypes)
- endforeach()
-+if(gen_xfer_desc)
-+ add_dependencies(libmumps gen_xfer_desc)
-+endif()
-
- # TODO: find_package or find_library for system libs?
- include_directories (/usr/local/include)
diff --git a/debian/patches/upstream_fix_speeling_errors b/debian/patches/upstream_fix_speeling_errors
index 5eaf037..8e2b249 100644
--- a/debian/patches/upstream_fix_speeling_errors
+++ b/debian/patches/upstream_fix_speeling_errors
@@ -1,50 +1,19 @@
From: Amul Shah <Amul.Shah at fisglobal.com>
Forwarded: not-needed
-Summary: Fix spelling errors in errors messages and MUMPS source routines
-Description: Upstream sources contain spelling errors in one message for the
- DSE utility program. This is now fixed to avoid the lintian warning
- spelling-error-in-binary. MUMPS sources are now compiled with -embed_source
- which embeds the source in the object file. Comments in two MUMPS routines
- contained spelling errors. These are now fixed to avoid the lintian warning
- spelling-error-in-binary.
-Applied-Upstream: V6.2-001
-Last-Update: 2014-10-04
+Summary: Fix spelling errors in MUMPS source routines
+Description: Comments in two MUMPS routines contained spelling errors. These
+ are now fixed to avoid the lintian warning spelling-error-in-binary.
+Applied-Upstream: V6.3-001
+Last-Update: 2016-03-30
---- a/sr_port/dse_shift.c
-+++ b/sr_port/dse_shift.c
-@@ -128,7 +128,7 @@
- {
- if (shift + size >= cs_addrs->hdr->blk_size)
- {
-- util_out_print("Error: block not large enough to accomodate shift.", TRUE);
-+ util_out_print("Error: block not large enough to accommodate shift.", TRUE);
- t_abort(gv_cur_region, cs_addrs);
- if (lbp)
- free(lbp);
---- a/sr_port/rsel.mpt
-+++ b/sr_port/rsel.mpt
-@@ -122,11 +122,11 @@
- s end=$p(r,":",2),beg=$p(r,":"),rdf=0
- i end=beg!'$l(end) q:'$l(beg) s stop=last ; if all stripped out, done
- s:'$l(beg) beg="*" s pct=$e(beg) ; CAUTION: ELSE on next line
-- e s strt=$$mask(beg),stop=$$mask(end) i $l($p(stop,"$")) q:stop']strt ; if end before begining, done
-+ e s strt=$$mask(beg),stop=$$mask(end) i $l($p(stop,"$")) q:stop']strt ; if end before beginning, done
- i "*?"[pct s mtch="%*" d start(1) f s r=$$search(1) q:r]stop!'$l(r) d save ; if alls, get _files first
- s pct=pct="%",mtch=beg
- d start(pct)
-- f s r=$$search(pct) q:r]stop!'$l(r) d save ; do begining
-+ f s r=$$search(pct) q:r]stop!'$l(r) d save ; do beginning
- i stop=last q ; no range - we're done
- s stop=$p(stop,"$")
- i $l(stop),stop]$p(strt,"$") d ; if no overlap, do middle
---- a/sr_port/xcmd.mpt
-+++ b/sr_port/xcmd.mpt
-@@ -14,7 +14,7 @@
- ; If no $ETRAP defined, use CLIERR^%XCMD overriding a potential $ZTRAP error handler
- if ""=$ETRAP new $ETRAP set $ETRAP="goto CLIERR^%XCMD"
- new etrap set etrap=$ETRAP
-- ; Protect %XCMD's error handler by NEWing and SETing $ETRAP at the begining of the XECUTEd command
-+ ; Protect %XCMD's error handler by NEWing and SETing $ETRAP at the beginning of the XECUTEd command
- xecute "new $ETRAP set $ETRAP=etrap "_$zcmdline
- quit
-
+--- a/sr_unix/gtmthreadgblasm.m
++++ b/sr_unix/gtmthreadgblasm.m
+@@ -132,7 +132,7 @@
+ ; Routine to take a line of input from the gtm_threadgbl_asm_access.txt file and syntax check it. We allow the following:
+ ;
+ ; - trailing white space
+-; - trailing comments preceeded by a '#' character potentially preceeded by white space
++; - trailing comments preceded by a '#' character potentially preceded by white space
+ ;
+ ; In either of the above conditions, the input line (passed by reference) is stripped of its trailing junk so only the
+ ; variable name itself is left when we return.
diff --git a/debian/rules b/debian/rules
index 4f6c871..cef9eff 100755
--- a/debian/rules
+++ b/debian/rules
@@ -18,14 +18,6 @@ LOCAL_GTM_INSTALL_DIR := $(CURDIR)/debian/$(BINPKG)/usr/$(GTM_INSTALL_DIR)
%:
dh $@ --parallel
-# Set up locale support in the pbuilder environment
-override_dh_auto_build:
- mkdir -p debian/tmp/locale/
- localedef -f UTF-8 -i en_US ./debian/tmp/locale/en_US.UTF-8/
- export LOCPATH=$(CURDIR)/debian/tmp/locale/ && \
- export LC_ALL=en_US.UTF-8 && \
- dh_auto_build
-
override_dh_auto_configure:
dh_auto_configure -- -DCMAKE_INSTALL_PREFIX:PATH=/usr -DGTM_INSTALL_DIR=$(GTM_INSTALL_DIR) -DCMAKE_BUILD_TYPE=Release
@@ -105,6 +97,12 @@ override_dh_lintian:
echo "$(BINPKG): non-standard-dir-perm usr/lib/*/fis-gtm/*/gtmsecshrdir/ 0500 != 0755" >> debian/$(BINPKG).lintian-overrides
echo "$(BINPKG): package-contains-hardlink usr/lib/*/fis-gtm/*/gtmsecshr -> usr/lib/*/fis-gtm/*/utf8/gtmsecshr" >> debian/$(BINPKG).lintian-overrides
echo "$(BINPKG): package-contains-hardlink usr/lib/*/fis-gtm/*/gtmsecshrdir/gtmsecshr -> usr/lib/*/fis-gtm/*/utf8/gtmsecshrdir/gtmsecshr" >> debian/$(BINPKG).lintian-overrides
+ echo "$(BINPKG): non-standard-dir-perm usr/lib/*/fis-gtm/*/ 0755 != 0755" >> debian/$(BINPKG).lintian-overrides
+ echo "$(BINPKG): non-standard-dir-perm usr/lib/*/fis-gtm/*/plugin/gtmcrypt/ 0755 != 0755" >> debian/$(BINPKG).lintian-overrides
+ echo "$(BINPKG): non-standard-dir-perm usr/lib/*/fis-gtm/utf8/gtmsecshrdir/ 0755 != 0755" >> debian/$(BINPKG).lintian-overrides
+ echo "$(BINPKG): non-standard-executable-perm usr/lib/*/fis-gtm/*/plugin/gtmcrypt/maskpass 0755 != 0755" >> debian/$(BINPKG).lintian-overrides
+ echo "$(BINPKG): non-standard-file-perm usr/lib/*/fis-gtm/*/* 0664 != 0644" >> debian/$(BINPKG).lintian-overrides
+ echo "$(BINPKG): non-standard-file-perm usr/lib/*/fis-gtm/*/utf8/* 0664 != 0644" >> debian/$(BINPKG).lintian-overrides
dh_lintian
diff --git a/debian/watch b/debian/watch
index d161b83..f0d754b 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,2 +1,2 @@
version=3
-http://sf.net/fis-gtm/fis-gtm-V(\d[-.\d]+)\.tar\.gz
+http://sf.net/fis-gtm/fis-gtm-V(\d\.\d-\d+[A-F]*)\.tar\.gz
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/fis-gtm.git
More information about the debian-med-commit
mailing list