[med-svn] [fis-gtm] 05/05: Adapt patches to new upstream version
Andreas Tille
tille at debian.org
Sun Nov 24 09:01:30 UTC 2013
This is an automated email from the git hooks/post-receive script.
tille pushed a commit to branch master
in repository fis-gtm.
commit e7a7c899a61cf6a71f108e89912801eea5afeafc
Author: Andreas Tille <tille at debian.org>
Date: Sun Nov 24 10:00:11 2013 +0100
Adapt patches to new upstream version
---
debian/changelog | 2 +-
..._destdir_Refactor-object-file-source-name-storage | 20 ++++++++++----------
...Support-source-to-object-compilation-in-a-DESTDIR | 4 ++--
debian/patches/up_gtm_destdir_substitution | 4 ++--
4 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 5c0d554..38ff1d6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-fis-gtm (6.0-003-1) UNRELEASED; urgency=low
+fis-gtm (6.0-003-1) unstable; urgency=low
* Initial release (Closes: #541239)
diff --git a/debian/patches/up_gtm_destdir_Refactor-object-file-source-name-storage b/debian/patches/up_gtm_destdir_Refactor-object-file-source-name-storage
index 35a8263..f252d97 100644
--- a/debian/patches/up_gtm_destdir_Refactor-object-file-source-name-storage
+++ b/debian/patches/up_gtm_destdir_Refactor-object-file-source-name-storage
@@ -16,8 +16,8 @@ to be modified before storage in the object file.
create mode 100644 sr_unix/obj_source.c
create mode 100644 sr_unix/obj_source.h
---- fis-gtm.orig/sr_i386/obj_file.c
-+++ fis-gtm/sr_i386/obj_file.c
+--- fis-gtm-V6.0-003.orig/sr_i386/obj_file.c
++++ fis-gtm-V6.0-003/sr_i386/obj_file.c
@@ -30,6 +30,7 @@
#include "gtmio.h"
#include "mmemory.h"
@@ -40,8 +40,8 @@ to be modified before storage in the object file.
/* comp_lits aligns the start of routine_name on a NATIVE_WSIZE boundary.*/
padsize = PADLEN(offset, NATIVE_WSIZE);
if (padsize)
---- fis-gtm.orig/sr_unix/comp_lits.c
-+++ fis-gtm/sr_unix/comp_lits.c
+--- fis-gtm-V6.0-003.orig/sr_unix/comp_lits.c
++++ fis-gtm-V6.0-003/sr_unix/comp_lits.c
@@ -14,10 +14,10 @@
#include <rtnhdr.h>
#include "mdq.h"
@@ -70,8 +70,8 @@ to be modified before storage in the object file.
offset += PADLEN(offset, NATIVE_WSIZE);
rhead->routine_name.len = routine_name.len;
rhead->routine_name.addr = (char *)offset;
---- fis-gtm.orig/sr_unix/obj_file.c
-+++ fis-gtm/sr_unix/obj_file.c
+--- fis-gtm-V6.0-003.orig/sr_unix/obj_file.c
++++ fis-gtm-V6.0-003/sr_unix/obj_file.c
@@ -28,6 +28,7 @@
#include "gtmio.h"
#include "mmemory.h"
@@ -104,7 +104,7 @@ to be modified before storage in the object file.
if (padsize)
{
--- /dev/null
-+++ fis-gtm/sr_unix/obj_source.c
++++ fis-gtm-V6.0-003/sr_unix/obj_source.c
@@ -0,0 +1,12 @@
+#include "mdef.h"
+
@@ -119,7 +119,7 @@ to be modified before storage in the object file.
+ return sn;
+}
--- /dev/null
-+++ fis-gtm/sr_unix/obj_source.h
++++ fis-gtm-V6.0-003/sr_unix/obj_source.h
@@ -0,0 +1,12 @@
+#ifndef __OBJ_SOURCE_H__
+#define __OBJ_SOURCE_H__
@@ -133,8 +133,8 @@ to be modified before storage in the object file.
+struct obj_source get_obj_source(void);
+
+#endif
---- fis-gtm.orig/sr_unix_nsb/comp_lits.c
-+++ fis-gtm/sr_unix_nsb/comp_lits.c
+--- fis-gtm-V6.0-003.orig/sr_unix_nsb/comp_lits.c
++++ fis-gtm-V6.0-003/sr_unix_nsb/comp_lits.c
@@ -14,10 +14,10 @@
#include <rtnhdr.h>
#include "mdq.h"
diff --git a/debian/patches/up_gtm_destdir_Support-source-to-object-compilation-in-a-DESTDIR b/debian/patches/up_gtm_destdir_Support-source-to-object-compilation-in-a-DESTDIR
index df18a65..9fc3e43 100644
--- a/debian/patches/up_gtm_destdir_Support-source-to-object-compilation-in-a-DESTDIR
+++ b/debian/patches/up_gtm_destdir_Support-source-to-object-compilation-in-a-DESTDIR
@@ -11,8 +11,8 @@ distribution.
sr_unix/obj_source.c | 13 +++++++++++++
1 file changed, 13 insertions(+)
---- fis-gtm.orig/sr_unix/obj_source.c
-+++ fis-gtm/sr_unix/obj_source.c
+--- fis-gtm-V6.0-003.orig/sr_unix/obj_source.c
++++ fis-gtm-V6.0-003/sr_unix/obj_source.c
@@ -1,3 +1,5 @@
+#include "gtm_stdlib.h"
+#include "gtm_string.h"
diff --git a/debian/patches/up_gtm_destdir_substitution b/debian/patches/up_gtm_destdir_substitution
index a14fa89..b69d337 100644
--- a/debian/patches/up_gtm_destdir_substitution
+++ b/debian/patches/up_gtm_destdir_substitution
@@ -7,8 +7,8 @@ Last-Update: 2012-06-19
sr_unix/configure.gtc | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
---- fis-gtm.orig/sr_unix/configure.gtc
-+++ fis-gtm/sr_unix/configure.gtc
+--- fis-gtm-V6.0-003.orig/sr_unix/configure.gtc
++++ fis-gtm-V6.0-003/sr_unix/configure.gtc
@@ -376,7 +376,7 @@
cat << SEDSCRIPT > sedin$$
s|ARCH|$arch|g
--
Alioth's /git/debian-med/git-commit-notice on /srv/git.debian.org/git/debian-med/fis-gtm.git
More information about the debian-med-commit
mailing list