[Debian-astro-commits] [starlink-pal] 04/08: Rediff patches

Fri Feb 3 16:41:32 UTC 2017

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

olebole pushed a commit to branch master
in repository starlink-pal.

commit d5a238863b0aa21efa20e3c09cb46e728f03918c
Author: Ole Streicher <olebole at debian.org>
Date:   Wed Jan 11 18:32:56 2017 +0100

    Rediff patches
---
 debian/patches/rename_library           | 27 +++++++++++--------
 debian/patches/reproducible_build.patch | 15 ++++++++---
 debian/patches/use_std_automake.patch   | 48 ++++++++++++++++++++++-----------
 3 files changed, 59 insertions(+), 31 deletions(-)

diff --git a/debian/patches/rename_library b/debian/patches/rename_library
index b591979..aaad10c 100644
--- a/debian/patches/rename_library
+++ b/debian/patches/rename_library
@@ -1,12 +1,17 @@
-Author: Ole Streicher <debian at liska.ath.cx>
-Last-Update: 2013-04-23
-Description: "pal" is a quite short name for a library that is so 
- specific as this one. Therefore, "pal" is prefixed by the 
- vendor name "starlink".
- .
- This patch can be re-created by running 
-  debian/create_patches_rename_library.sh
- on the freshly unpacked source tarball.
+From: Ole Streicher <debian at liska.ath.cx>
+Date: Wed, 11 Jan 2017 18:29:10 +0100
+Subject: "pal" is a quite short name for a library that is so specific as
+ this one. Therefore,
+ "pal" is prefixed by the vendor name "starlink". . This patch can be
+ re-created by running debian/create_patches_rename_library.sh on the freshly
+ unpacked source tarball.
+
+---
+ Makefile.am | 14 +++++++-------
+ 1 file changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index c698cf1..54882db 100644
 --- a/Makefile.am
 +++ b/Makefile.am
 @@ -1,17 +1,17 @@
@@ -32,7 +37,7 @@ Description: "pal" is a quite short name for a library that is so
  
  # Misc files
  dist_starnews_DATA = pal.news
-@@ -20,7 +20,7 @@
+@@ -20,7 +20,7 @@ dist_pkgdata_DATA = COPYING COPYING.LESSER README.md
  # Make all library code position independent. This is handy for creating
  # shareable libraries from the static ones (Java JNI libraries).
  if !NOPIC
@@ -41,7 +46,7 @@ Description: "pal" is a quite short name for a library that is so
  endif
  
  # install pal as "star/pal.h"
-@@ -122,7 +122,7 @@
+@@ -128,7 +128,7 @@ TESTS = palTest
  
  check_PROGRAMS = palTest
  palTest_SOURCES = palTest.c
diff --git a/debian/patches/reproducible_build.patch b/debian/patches/reproducible_build.patch
index 458378c..c86950d 100644
--- a/debian/patches/reproducible_build.patch
+++ b/debian/patches/reproducible_build.patch
@@ -1,9 +1,16 @@
-Author: Chris Lamb <lamby at debian.org>
-Description: Remove timestamp from latex2html
-Bug: https://bugs.debian.org/803908
+From: Chris Lamb <lamby at debian.org>
+Date: Wed, 11 Jan 2017 18:29:10 +0100
+Subject: Remove timestamp from latex2html
+
+---
+ Makefile.am | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index b652a90..ea2cee7 100644
 --- a/Makefile.am
 +++ b/Makefile.am
-@@ -120,7 +120,7 @@
+@@ -126,7 +126,7 @@ dist_pkgdata_DATA =  @STARDOCS at .pdf @STARDOCS@/index.html
  	pdflatex $^ && pdflatex $^
  
  @STARDOCS@/index.html: @STARDOCS at .tex
diff --git a/debian/patches/use_std_automake.patch b/debian/patches/use_std_automake.patch
index 57752d8..b60cf29 100644
--- a/debian/patches/use_std_automake.patch
+++ b/debian/patches/use_std_automake.patch
@@ -1,20 +1,20 @@
-Author: Ole Streicher <debian at liska.ath.cx>
-Description: Do not depend on the starlink's automake, but use their macro
- file together with the standard automake
---- a/configure.ac
-+++ b/configure.ac
-@@ -7,7 +7,7 @@
- dnl    Require autoconf-2.50 at least
- AC_PREREQ([2.69])
- dnl    Require Starlink automake
--AM_INIT_AUTOMAKE(1.8.2-starlink)
-+AM_INIT_AUTOMAKE([foreign])
- 
- dnl    Sanity-check: name a file in the source directory -- if this
- dnl    isn't found then configure will complain
+From: Ole Streicher <debian at liska.ath.cx>
+Date: Wed, 11 Jan 2017 18:29:10 +0100
+Subject: Do not depend on the starlink's automake,
+ but use their macro file together with the standard automake
+
+---
+ Makefile.am  | 11 ++++++++---
+ acinclude.m4 | 57 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ configure.ac |  2 +-
+ 3 files changed, 66 insertions(+), 4 deletions(-)
+ create mode 100644 acinclude.m4
+
+diff --git a/Makefile.am b/Makefile.am
+index 54882db..b652a90 100644
 --- a/Makefile.am
 +++ b/Makefile.am
-@@ -11,10 +11,9 @@
+@@ -11,10 +11,9 @@ libstarlink_pal_la_CPPFLAGS = $(ERFA_CPPFLAGS)
  libstarlink_pal_la_LDFLAGS = $(ERFA_LDFLAGS)
  
  # Force a link against ERFA and, optionally, starutil
@@ -26,7 +26,7 @@ Description: Do not depend on the starlink's automake, but use their macro
  dist_pkgdata_DATA = COPYING COPYING.LESSER README.md
  
  # Make all library code position independent. This is handy for creating
-@@ -116,7 +115,13 @@
+@@ -122,7 +121,13 @@ PRIVATE_C_FILES = \
  pal1Atms.c \
  pal1Atmt.c
  
@@ -41,6 +41,9 @@ Description: Do not depend on the starlink's automake, but use their macro
  
  TESTS = palTest
  
+diff --git a/acinclude.m4 b/acinclude.m4
+new file mode 100644
+index 0000000..3c2355a
 --- /dev/null
 +++ b/acinclude.m4
 @@ -0,0 +1,57 @@
@@ -101,3 +104,16 @@ Description: Do not depend on the starlink's automake, but use their macro
 +# Starlink bootstrap chain.
 +AC_DEFUN([STAR_CHECK_PROGS], [])
 +
+diff --git a/configure.ac b/configure.ac
+index 10ff801..dc7d0ff 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -8,7 +8,7 @@ AC_CONFIG_AUX_DIR([build-aux])
+ dnl    Require autoconf-2.50 at least
+ AC_PREREQ([2.69])
+ dnl    Require Starlink automake
+-AM_INIT_AUTOMAKE(1.8.2-starlink)
++AM_INIT_AUTOMAKE([foreign])
+ 
+ dnl    Sanity-check: name a file in the source directory -- if this
+ dnl    isn't found then configure will complain

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-astro/packages/starlink-pal.git

