[Debian-astro-commits] [iausofa] 01/05: Rediff patches
Ole Streicher
olebole at moszumanska.debian.org
Sat Jul 30 11:22:17 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 13e8b70268cd23944f3fa8c5f3303cb53e29dd4f
Author: Ole Streicher <olebole at debian.org>
Date: Sat Jul 30 13:16:26 2016 +0200
Rediff patches
Added Create-a-shared-library.patch: <REASON>
Added Set-the-installation-path-according-to-the-FHS.patch: <REASON>
Added Propagate-CFLAGS-and-CPPFLAGS-to-the-build-system.patch: <REASON>
Dropped create_shared_lib.patch: <REASON>
Dropped set_installation_path.patch: <REASON>
Dropped propagate_buildflags.patch: <REASON>
---
...red_lib.patch => Create-a-shared-library.patch} | 22 +++++++++++++++-------
...-CFLAGS-and-CPPFLAGS-to-the-build-system.patch} | 16 ++++++++++++----
...e-installation-path-according-to-the-FHS.patch} | 16 ++++++++++++----
debian/patches/series | 6 +++---
4 files changed, 42 insertions(+), 18 deletions(-)
diff --git a/debian/patches/create_shared_lib.patch b/debian/patches/Create-a-shared-library.patch
similarity index 79%
rename from debian/patches/create_shared_lib.patch
rename to debian/patches/Create-a-shared-library.patch
index dd7c7df..b6473fe 100644
--- a/debian/patches/create_shared_lib.patch
+++ b/debian/patches/Create-a-shared-library.patch
@@ -1,8 +1,16 @@
-Author: Ole Streicher <debian at liska.ath.cx>
-Description: Create a shared library
+From: Ole Streicher <debian at liska.ath.cx>
+Date: Sat, 30 Jul 2016 13:15:26 +0200
+Subject: Create a shared library
+
+---
+ 20160503/c/src/makefile | 23 +++++++++++++++++------
+ 1 file changed, 17 insertions(+), 6 deletions(-)
+
+diff --git a/20160503/c/src/makefile b/20160503/c/src/makefile
+index 8fa0597..4ed66fe 100644
--- a/20160503/c/src/makefile
+++ b/20160503/c/src/makefile
-@@ -64,7 +64,7 @@
+@@ -64,7 +64,7 @@ SOFA_INC_DIR = $(INSTALL_DIR)/include/
# for functions, CFLAGX for executables) here.
CCOMPC = gcc
@@ -11,7 +19,7 @@ Description: Create a shared library
CFLAGX = -pedantic -Wall -W -O
#----YOU SHOULDN'T HAVE TO MODIFY ANYTHING BELOW THIS LINE---------
-@@ -80,6 +80,11 @@
+@@ -80,6 +80,11 @@ INSTALL_DIRS = $(SOFA_LIB_DIR) $(SOFA_INC_DIR)
SOFA_LIB_NAME = libsofa_c.a
SOFA_LIB = $(SOFA_LIB_DIR)$(SOFA_LIB_NAME)
@@ -23,7 +31,7 @@ Description: Create a shared library
# Name the SOFA/C testbed in its source and target locations.
SOFA_TEST_NAME = t_sofa_c.c
-@@ -338,18 +343,21 @@
+@@ -338,18 +343,21 @@ all : $(SOFA_LIB_NAME)
-@ echo ""
# Install the library and header files.
@@ -49,7 +57,7 @@ Description: Create a shared library
# Test the installed library.
installcheck: $(SOFA_TEST_NAME) $(SOFA_INC) $(SOFA_LIB)
-@@ -363,7 +371,7 @@
+@@ -363,7 +371,7 @@ clean :
# Delete all generated binaries in the current directory.
realclean distclean : clean
@@ -58,7 +66,7 @@ Description: Create a shared library
# Create the installation directories if not already present.
$(INSTALL_DIRS):
-@@ -373,6 +381,9 @@
+@@ -373,6 +381,9 @@ $(INSTALL_DIRS):
$(SOFA_LIB_NAME): $(SOFA_OBS)
ar ru $(SOFA_LIB_NAME) $?
diff --git a/debian/patches/propagate_buildflags.patch b/debian/patches/Propagate-CFLAGS-and-CPPFLAGS-to-the-build-system.patch
similarity index 60%
rename from debian/patches/propagate_buildflags.patch
rename to debian/patches/Propagate-CFLAGS-and-CPPFLAGS-to-the-build-system.patch
index 7171c71..980f526 100644
--- a/debian/patches/propagate_buildflags.patch
+++ b/debian/patches/Propagate-CFLAGS-and-CPPFLAGS-to-the-build-system.patch
@@ -1,8 +1,16 @@
-Author: Ole Streicher <debian at liska.ath.cx>
-Description: Propagate CFLAGS and CPPFLAGS to the build system
+From: Ole Streicher <debian at liska.ath.cx>
+Date: Sat, 30 Jul 2016 13:15:26 +0200
+Subject: Propagate CFLAGS and CPPFLAGS to the build system
+
+---
+ 20160503/c/src/makefile | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/20160503/c/src/makefile b/20160503/c/src/makefile
+index 4ed66fe..4dc712a 100644
--- a/20160503/c/src/makefile
+++ b/20160503/c/src/makefile
-@@ -64,8 +64,8 @@
+@@ -64,8 +64,8 @@ SOFA_INC_DIR = $(INSTALL_DIR)/include/
# for functions, CFLAGX for executables) here.
CCOMPC = gcc
@@ -13,7 +21,7 @@ Description: Propagate CFLAGS and CPPFLAGS to the build system
#----YOU SHOULDN'T HAVE TO MODIFY ANYTHING BELOW THIS LINE---------
-@@ -382,7 +382,7 @@
+@@ -382,7 +382,7 @@ $(SOFA_LIB_NAME): $(SOFA_OBS)
ar ru $(SOFA_LIB_NAME) $?
$(SOFA_SHLIB_NAME): $(SOFA_OBS)
diff --git a/debian/patches/set_installation_path.patch b/debian/patches/Set-the-installation-path-according-to-the-FHS.patch
similarity index 60%
rename from debian/patches/set_installation_path.patch
rename to debian/patches/Set-the-installation-path-according-to-the-FHS.patch
index f21ea6b..dd489b4 100644
--- a/debian/patches/set_installation_path.patch
+++ b/debian/patches/Set-the-installation-path-according-to-the-FHS.patch
@@ -1,6 +1,14 @@
-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).
+From: Ole Streicher <debian at liska.ath.cx>
+Date: Sat, 30 Jul 2016 13:15:25 +0200
+Subject: Set the installation path according to the FHS.
+
+Also, remove the "test" target alias (use installcheck instead).
+---
+ 20160503/c/src/makefile | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/20160503/c/src/makefile b/20160503/c/src/makefile
+index 5321ebc..8fa0597 100644
--- a/20160503/c/src/makefile
+++ b/20160503/c/src/makefile
@@ -49,11 +49,11 @@
@@ -17,7 +25,7 @@ Description: Set the installation path according to the FHS. Also, remove the
# Specify the installation directory for the include files.
-@@ -352,7 +352,7 @@
+@@ -352,7 +352,7 @@ check: $(SOFA_TEST_NAME) $(SOFA_INC_NAMES) $(SOFA_LIB_NAME)
./$(SOFA_TEST)
# Test the installed library.
diff --git a/debian/patches/series b/debian/patches/series
index b0114e9..5ddf045 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,3 @@
-set_installation_path.patch
-create_shared_lib.patch
-propagate_buildflags.patch
+Set-the-installation-path-according-to-the-FHS.patch
+Create-a-shared-library.patch
+Propagate-CFLAGS-and-CPPFLAGS-to-the-build-system.patch
--
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