[med-svn] [fis-gtm] 01/01: Patch updates and Multi-arch support

Fri Sep 19 02:39:59 UTC 2014

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 def2dd550abd64950324925cc248e5cdc4128d20
Author: Amul Shah <Amul.Shah at fisglobal.com>
Date:   Thu Sep 18 22:22:17 2014 -0400

    Patch updates and Multi-arch support
    
    Add DEP-3 headers for all patches
    Add patch to backport ICU 4.9+ handling for gtmprofile
    
    Add multiarch support to control and rules files. Eliminate the
    override_dh_link that sets up the 'current' link.
    
    Add zlib as a recommended dependency
---
 debian/control                                         |  3 +++
 debian/patches/series                                  |  1 +
 debian/patches/upstream_backport_README_change         |  4 ++++
 .../patches/upstream_backport_build_encryption_plugin  |  8 +++++++-
 .../patches/upstream_backport_encryption_build_fixes   | 11 +++++++++--
 debian/patches/upstream_backport_gtmprofile_icu_49     | 18 ++++++++++++++++++
 .../patches/upstream_backport_i586_default_32bit_linux |  4 ++++
 debian/rules                                           |  7 ++-----
 8 files changed, 48 insertions(+), 8 deletions(-)

diff --git a/debian/control b/debian/control
index ed31f4f..f908d8c 100644
--- a/debian/control
+++ b/debian/control
@@ -63,11 +63,14 @@ Description: metapackage for the latest version of FIS-GT.M database
 
 Package: fis-gtm-6.1-000
 Architecture: amd64 i386
+Pre-Depends: multiarch-support
 Depends: ${shlibs:Depends},
          ${misc:Depends},
          libicu-dev
 Provides: gtm,
           mumps
+Recommends: zlib1g
+Multi-Arch: same
 Description: package for 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
diff --git a/debian/patches/series b/debian/patches/series
index 804ac08..4d1ad0b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,3 +6,4 @@ upstream_backport_README_change
 
 upstream_backport_encryption_build_fixes
 upstream_backport_build_encryption_plugin
+upstream_backport_gtmprofile_icu_49
diff --git a/debian/patches/upstream_backport_README_change b/debian/patches/upstream_backport_README_change
index d6c758f..57439aa 100644
--- a/debian/patches/upstream_backport_README_change
+++ b/debian/patches/upstream_backport_README_change
@@ -1,3 +1,7 @@
+From: Amul Shah <Amul.Shah at fisglobal.com>
+Description: Backport upstream changes to the source README file
+Applied-Upstream: V6.2-000
+
 --- a/README
 +++ b/README
 @@ -31,9 +31,9 @@
diff --git a/debian/patches/upstream_backport_build_encryption_plugin b/debian/patches/upstream_backport_build_encryption_plugin
index 11e5839..8a499a7 100644
--- a/debian/patches/upstream_backport_build_encryption_plugin
+++ b/debian/patches/upstream_backport_build_encryption_plugin
@@ -1,4 +1,10 @@
-The CMakeLists.txt in the V6.1-000 source release did not build the encryption plugins.
+From: Amul Shah <Amul.Shah at fisglobal.com>
+Description: Backport upstream changes to the source CMakeLists.txt file
+  The CMakeLists.txt in the V6.1-000 source release did not build the
+  encryption plugins. The upstream CMakeLists.txt includes these changes
+  and set the default encryption engine and algorithm
+Applied-Upstream: V6.2-000
+
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
 @@ -57,8 +57,8 @@
diff --git a/debian/patches/upstream_backport_encryption_build_fixes b/debian/patches/upstream_backport_encryption_build_fixes
index 483551a..26969b6 100644
--- a/debian/patches/upstream_backport_encryption_build_fixes
+++ b/debian/patches/upstream_backport_encryption_build_fixes
@@ -1,6 +1,13 @@
-Encryption plugin Makefile.mk needed some extra library paths to build on all platforms.
+From: Amul Shah <Amul.Shah at fisglobal.com>
+Description: Backport upstream changes to the source sr_unix/Makefile.mk file
+  The upstream V6.1-000 sources did not correctly the production enryption
+  plugin libraries.
+
+  Encryption plugin Makefile.mk needed some extra library paths to build on all platforms.
+
+  Fix an undefined symbol problem when building a release encryption plugin.
+Applied-Upstream: V6.2-000
 
-Fix an undefined symbol problem when building a release encryption plugin.
 --- a/sr_unix/Makefile.mk
 +++ b/sr_unix/Makefile.mk
 @@ -133,9 +133,11 @@
diff --git a/debian/patches/upstream_backport_gtmprofile_icu_49 b/debian/patches/upstream_backport_gtmprofile_icu_49
new file mode 100644
index 0000000..d548515
--- /dev/null
+++ b/debian/patches/upstream_backport_gtmprofile_icu_49
@@ -0,0 +1,18 @@
+From: Amul Shah <Amul.Shah at fisglobal.com>
+Description: Backport upstream changes to the default GT.M profile script
+  ICU versions after 4.8, <major>.<minor> dropped the dot between the major and
+  minor numbers. The upstream fix handles setting gtm_icu_version correctly for
+  ICU versions after 4.8.
+Applied-Upstream: V6.2-000
+
+--- a/sr_unix/gtmprofile.gtc
++++ b/sr_unix/gtmprofile.gtc
+@@ -81,7 +81,7 @@
+ 	which="which"
+     fi
+     if [ -z "$gtm_icu_version" -a -n "`$which icu-config`" ] ; then
+-        gtm_icu_version=`icu-config --version | gtm_chset=M $gtm_dist/mumps -run %XCMD 'Read x Write $Piece(x,".",1,2)'`
++	gtm_icu_version=`icu-config --version | gtm_chset=M $gtm_dist/mumps -run %XCMD 'Read x Write $Select(+x>48:$Piece(x,".",1)/10,1:$Piece(x,".",1,2))'`
+         export gtm_icu_version
+     fi
+ 
diff --git a/debian/patches/upstream_backport_i586_default_32bit_linux b/debian/patches/upstream_backport_i586_default_32bit_linux
index c87688f..9e5bfdb 100644
--- a/debian/patches/upstream_backport_i586_default_32bit_linux
+++ b/debian/patches/upstream_backport_i586_default_32bit_linux
@@ -1,3 +1,7 @@
+From: Amul Shah <Amul.Shah at fisglobal.com>
+Description: Backport upstream change that makes i586 the default build type for 32bit GT.M
+Applied-Upstream: V6.2-000
+
 --- a/sr_linux/platform.cmake
 +++ b/sr_linux/platform.cmake
 @@ -13,6 +13,9 @@
diff --git a/debian/rules b/debian/rules
index 7ab37e3..85883fb 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,13 +5,14 @@
 # Uncomment this to turn on verbose mode.
 # export DH_VERBOSE=1
 
+MARCH := $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 ARCH := $(shell dpkg-architecture -qDEB_HOST_GNU_CPU)
 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')
 BINPKG := $(shell awk '/Package:.*[0-9]/{print $$2;}' debian/control)
-GTM_INSTALL_DIR := lib/fis-gtm/$(UAPIDIR)
+GTM_INSTALL_DIR := lib/$(MARCH)/fis-gtm/$(UAPIDIR)
 LOCAL_GTM_INSTALL_DIR := $(CURDIR)/debian/$(BINPKG)/usr/$(GTM_INSTALL_DIR)
 
 %:
@@ -90,10 +91,6 @@ override_dh_fixperms:
 # deployed materials, as far as I see it, it is useless, since the
 # user (root) would always be able to revert them to become writable.
 
-override_dh_link:
-	echo '/usr/lib/fis-gtm/$(UAPIDIR) /usr/lib/fis-gtm/current' > debian/fis-gtm.links
-	dh_link
-
 # Because 'the' binary package name will change, let's just generate
 # override files
 # The override is needed according to upstream for GTM to generate executable 'call-in's

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/fis-gtm.git

