[Debian-astro-commits] [iausofa] 02/03: Adjust patches for new version

Ole Streicher olebole at moszumanska.debian.org
Sat May 7 12:47:24 UTC 2016


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

olebole pushed a commit to branch debian
in repository iausofa.

commit f614875dfd16482004d70e49d7cf1feb2b8783f2
Author: Ole Streicher <ole at aip.de>
Date:   Wed May 4 21:13:08 2016 -0300

    Adjust patches for new version
---
 debian/changelog                           |  5 +++--
 debian/patches/create_shared_lib.patch     | 10 +++++-----
 debian/patches/propagate_buildflags.patch  |  6 +++---
 debian/patches/set_installation_path.patch |  6 +++---
 debian/rules                               |  2 +-
 5 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 9cab602..15c3cd2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,10 @@
-iausofa-c (2015.02.09.a-2) UNRELEASED; urgency=low
+iausofa-c (2016.05.03-1) UNRELEASED; urgency=low
 
   * Update standards-version to 3.9.7 (no changes)
   * Update VCS fields, add ASCL-Id
+  * New upstream version
 
- -- Ole Streicher <olebole at debian.org>  Fri, 26 Feb 2016 15:58:35 +0100
+ -- Ole Streicher <olebole at debian.org>  Wed, 04 May 2016 21:11:08 -0300
 
 iausofa-c (2015.02.09.a-1) unstable; urgency=low
 
diff --git a/debian/patches/create_shared_lib.patch b/debian/patches/create_shared_lib.patch
index 0061684..dd7c7df 100644
--- a/debian/patches/create_shared_lib.patch
+++ b/debian/patches/create_shared_lib.patch
@@ -1,7 +1,7 @@
 Author: Ole Streicher <debian at liska.ath.cx>
 Description: Create a shared library
---- a/20150209/c/src/makefile
-+++ b/20150209/c/src/makefile
+--- a/20160503/c/src/makefile
++++ b/20160503/c/src/makefile
 @@ -64,7 +64,7 @@
  # for functions, CFLAGX for executables) here.
  
@@ -23,7 +23,7 @@ Description: Create a shared library
  # Name the SOFA/C testbed in its source and target locations.
  
  SOFA_TEST_NAME = t_sofa_c.c
-@@ -328,18 +333,21 @@
+@@ -338,18 +343,21 @@
  	-@ echo ""
  
  # Install the library and header files.
@@ -49,7 +49,7 @@ Description: Create a shared library
  
  # Test the installed library.
  installcheck: $(SOFA_TEST_NAME) $(SOFA_INC) $(SOFA_LIB)
-@@ -353,7 +361,7 @@
+@@ -363,7 +371,7 @@
  
  # Delete all generated binaries in the current directory.
  realclean distclean : clean
@@ -58,7 +58,7 @@ Description: Create a shared library
  
  # Create the installation directories if not already present.
  $(INSTALL_DIRS):
-@@ -363,6 +371,9 @@
+@@ -373,6 +381,9 @@
  $(SOFA_LIB_NAME): $(SOFA_OBS)
  	ar ru $(SOFA_LIB_NAME) $?
  
diff --git a/debian/patches/propagate_buildflags.patch b/debian/patches/propagate_buildflags.patch
index 4d45d89..7171c71 100644
--- a/debian/patches/propagate_buildflags.patch
+++ b/debian/patches/propagate_buildflags.patch
@@ -1,7 +1,7 @@
 Author: Ole Streicher <debian at liska.ath.cx>
 Description: Propagate CFLAGS and CPPFLAGS to the build system
---- a/20150209/c/src/makefile
-+++ b/20150209/c/src/makefile
+--- a/20160503/c/src/makefile
++++ b/20160503/c/src/makefile
 @@ -64,8 +64,8 @@
  # for functions, CFLAGX for executables) here.
  
@@ -13,7 +13,7 @@ Description: Propagate CFLAGS and CPPFLAGS to the build system
  
  #----YOU SHOULDN'T HAVE TO MODIFY ANYTHING BELOW THIS LINE---------
  
-@@ -372,7 +372,7 @@
+@@ -382,7 +382,7 @@
  	ar ru $(SOFA_LIB_NAME) $?
  
  $(SOFA_SHLIB_NAME): $(SOFA_OBS)
diff --git a/debian/patches/set_installation_path.patch b/debian/patches/set_installation_path.patch
index 3ce4e2b..f21ea6b 100644
--- a/debian/patches/set_installation_path.patch
+++ b/debian/patches/set_installation_path.patch
@@ -1,8 +1,8 @@
 Author: Ole Streicher <debian at liska.ath.cx>
 Description: Set the installation path according to the FHS. Also, remove the
  "test" target alias (use installcheck instead).
---- a/20150209/c/src/makefile
-+++ b/20150209/c/src/makefile
+--- a/20160503/c/src/makefile
++++ b/20160503/c/src/makefile
 @@ -49,11 +49,11 @@
  
  # Specify the installation home directory.
@@ -17,7 +17,7 @@ Description: Set the installation path according to the FHS. Also, remove the
  
  # Specify the installation directory for the include files.
  
-@@ -342,7 +342,7 @@
+@@ -352,7 +352,7 @@
  	./$(SOFA_TEST)
  
  # Test the installed library.
diff --git a/debian/rules b/debian/rules
index 16a2f91..44e5fdf 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,7 +3,7 @@
 #export DH_VERBOSE=1
 
 %:
-	dh $@ -D20150209/c/src
+	dh $@ -D20160503/c/src
 
 override_dh_installchangelogs:
 	dh_installchangelogs */c/doc/changes.lis

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



More information about the Debian-astro-commits mailing list