[emos] 36/37: Add bufrnum back

Alastair McKinstry mckinstry at moszumanska.debian.org
Sat Jun 27 08:14:35 UTC 2015


This is an automated email from the git hooks/post-receive script.

mckinstry pushed a commit to branch master
in repository emos.

commit 12ff4b09523a444f3c75b204df77f8a8aab33f95
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Fri Jun 26 22:24:19 2015 +0100

    Add bufrnum back
---
 debian/changelog             |  3 ++-
 debian/patches/bufrnum.patch | 26 ++++++++++++++++++++------
 2 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 2e64534..79fa6e1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,8 +2,9 @@ emoslib (2:4.0.3+dfsg.1-2) UNRELEASED; urgency=medium
 
   * Remove rpath from shlibs. B-D on chrpath. 
   * Fix sed rules that broke some symlinks
+  * Add bufrnum back to shlib in new cmake-build system.
 
- -- Alastair McKinstry <mckinstry at debian.org>  Mon, 22 Jun 2015 06:33:00 +0100
+ -- Alastair McKinstry <mckinstry at debian.org>  Sat, 27 Jun 2015 06:33:00 +0100
 
 emoslib (2:4.0.3+dfsg.1-1) unstable; urgency=medium
 
diff --git a/debian/patches/bufrnum.patch b/debian/patches/bufrnum.patch
index 54901fc..7f9cfc9 100644
--- a/debian/patches/bufrnum.patch
+++ b/debian/patches/bufrnum.patch
@@ -8,9 +8,10 @@ Last-Updated: 2015-05-13
 # emoscyc.F used BUFRNUM, but it was never defined; I've defined it here
 # matching gribnum, intpnum, etc.
 # -- AMCK, 2009-04-16
-diff -Nur -x '*.orig' -x '*~' emos/bufrdc/bufrnum.F emos.new/bufrdc/bufrnum.F
---- emos/bufrdc_wmo/bufrnum.F	1970-01-01 01:00:00.000000000 +0100
-+++ emos.new/bufrdc_wmo/bufrnum.F	2009-04-17 21:40:59.000000000 +0100
+Index: emoslib-4.0.3+dfsg.1/bufrdc_wmo/bufrnum.F
+===================================================================
+--- /dev/null
++++ emoslib-4.0.3+dfsg.1/bufrdc_wmo/bufrnum.F
 @@ -0,0 +1,122 @@
 +C 
 +C 
@@ -134,9 +135,10 @@ diff -Nur -x '*.orig' -x '*~' emos/bufrdc/bufrnum.F emos.new/bufrdc/bufrnum.F
 +C
 +      RETURN
 +      END
-diff -Nur -x '*.orig' -x '*~' emos/bufrdc/grprs.h emos.new/bufrdc/grprs.h
---- emos/bufrdc_wmo/grprs.h	1970-01-01 01:00:00.000000000 +0100
-+++ emos.new/bufrdc_wmo/grprs.h	2009-04-17 21:41:47.000000000 +0100
+Index: emoslib-4.0.3+dfsg.1/bufrdc_wmo/grprs.h
+===================================================================
+--- /dev/null
++++ emoslib-4.0.3+dfsg.1/bufrdc_wmo/grprs.h
 @@ -0,0 +1,7 @@
 +C
 +C     Common blocks holding default or user supplied values for printing.
@@ -145,3 +147,15 @@ diff -Nur -x '*.orig' -x '*~' emos/bufrdc/grprs.h emos.new/bufrdc/grprs.h
 +      INTEGER GRPRSM
 +C
 +      COMMON /GRPRSCM/ GRPRSM, GRPRSET
+Index: emoslib-4.0.3+dfsg.1/bufrdc_wmo/CMakeLists.txt
+===================================================================
+--- emoslib-4.0.3+dfsg.1.orig/bufrdc_wmo/CMakeLists.txt
++++ emoslib-4.0.3+dfsg.1/bufrdc_wmo/CMakeLists.txt
+@@ -2,6 +2,7 @@
+ #   Sources for bufrdc
+ #
+ list( APPEND bufrdc_wmo_src_files
++   bufrnum.F
+    bbuprs0.F
+    bbuprs1.F
+    bbuprs2.F

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/emos.git



More information about the debian-science-commits mailing list