[Debian-astro-commits] [esorex] 01/01: Switch patch management to gbp
Ole Streicher
olebole at moszumanska.debian.org
Tue Aug 29 11:26:44 UTC 2017
This is an automated email from the git hooks/post-receive script.
olebole pushed a commit to branch master
in repository esorex.
commit b18d4023065557d31bc62dd4c153795e14be6d47
Author: Ole Streicher <olebole at debian.org>
Date: Tue Aug 29 13:25:51 2017 +0200
Switch patch management to gbp
---
...f-an-empty-directory-usr-share-esorex-con.patch | 21 +++++++++++
...itsio-wcs-and-fftw-in-the-standard-paths.patch} | 32 ++++++++++-------
...e.patch => Generate-a-manpage-for-esorex.patch} | 17 +++++++--
...ibrary-libltdl-and-use-the-installed-one.patch} | 19 +++++++---
...ath.patch => Set-the-default-plugin-path.patch} | 42 ++++++++++++++--------
debian/patches/fix_format_strings.patch | 24 -------------
debian/patches/remove-empty-configdir.patch | 13 -------
debian/patches/series | 10 +++---
8 files changed, 103 insertions(+), 75 deletions(-)
diff --git a/debian/patches/Avoid-creation-of-an-empty-directory-usr-share-esorex-con.patch b/debian/patches/Avoid-creation-of-an-empty-directory-usr-share-esorex-con.patch
new file mode 100644
index 0000000..d488ff0
--- /dev/null
+++ b/debian/patches/Avoid-creation-of-an-empty-directory-usr-share-esorex-con.patch
@@ -0,0 +1,21 @@
+From: Ole Streicher <debian at liska.ath.cx>
+Date: Tue, 29 Aug 2017 13:21:57 +0200
+Subject: Avoid creation of an empty directory "/usr/share/esorex/config"
+
+---
+ src/Makefile.am | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/src/Makefile.am b/src/Makefile.am
+index b2f3c1a..ebfdc13 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -51,8 +51,6 @@ EXTRA_esorex_SOURCES = getopt.c getopt1.c getopt.h
+
+ bin_PROGRAMS = esorex
+
+-config_DATA =
+-
+ esorex_LDFLAGS = $(CPL_LDFLAGS) $(LIBLTDL)
+ esorex_LDADD = @GETOPT@ $(LIBCPLDFS) $(LIBCPLUI) $(LIBCPLCORE) $(LIBCEXT) $(LIBLTDL)
+ esorex_DEPENDENCIES = @GETOPT@ $(LIBLTDL)
diff --git a/debian/patches/use-std-paths-for-libs.patch b/debian/patches/Check-cfitsio-wcs-and-fftw-in-the-standard-paths.patch
similarity index 78%
rename from debian/patches/use-std-paths-for-libs.patch
rename to debian/patches/Check-cfitsio-wcs-and-fftw-in-the-standard-paths.patch
index c54b840..636cc1a 100644
--- a/debian/patches/use-std-paths-for-libs.patch
+++ b/debian/patches/Check-cfitsio-wcs-and-fftw-in-the-standard-paths.patch
@@ -1,9 +1,17 @@
-Author: Ole Streicher <debian at liska.ath.cx>
-Description: Check cfitsio, wcs, and fftw in the standard paths if
- they are not mentioned as configure packages.
+From: Ole Streicher <debian at liska.ath.cx>
+Date: Tue, 29 Aug 2017 13:21:57 +0200
+Subject: Check cfitsio, wcs, and fftw in the standard paths
+
+(if they are not mentioned as configure packages)
+---
+ m4/cpl.m4 | 15 ++++++++++-----
+ 1 file changed, 10 insertions(+), 5 deletions(-)
+
+diff --git a/m4/cpl.m4 b/m4/cpl.m4
+index 956b580..57d03a3 100644
--- a/m4/cpl.m4
+++ b/m4/cpl.m4
-@@ -9,7 +9,7 @@
+@@ -9,7 +9,7 @@ AC_DEFUN([CPL_CHECK_CFITSIO],
cpl_cfitsio_check_version="$1"
cpl_cfitsio_check_header="fitsio.h"
@@ -12,7 +20,7 @@ Description: Check cfitsio, wcs, and fftw in the standard paths if
cpl_cfitsio_incdirs=""
cpl_cfitsio_libdirs=""
-@@ -110,6 +110,7 @@
+@@ -110,6 +110,7 @@ AC_DEFUN([CPL_CHECK_CFITSIO],
cpl_cfitsio_libdirs="$cpl_cfitsio_libdirs /usr/lib64"
cpl_cfitsio_libdirs="$cpl_cfitsio_libdirs /usr/lib"
cpl_cfitsio_libdirs="$cpl_cfitsio_libdirs /usr/lib32"
@@ -20,7 +28,7 @@ Description: Check cfitsio, wcs, and fftw in the standard paths if
test -n "$CFITSIODIR" && \
cpl_cfitsio_libdirs="$CFITSIODIR/lib64 $CFITSIODIR/lib \
-@@ -492,6 +493,7 @@
+@@ -492,6 +493,7 @@ AC_DEFUN([CPL_CHECK_CEXT],
cpl_cext_libdirs="$cpl_cext_libdirs /usr/lib64"
cpl_cext_libdirs="$cpl_cext_libdirs /usr/lib"
cpl_cext_libdirs="$cpl_cext_libdirs /usr/lib32"
@@ -28,7 +36,7 @@ Description: Check cfitsio, wcs, and fftw in the standard paths if
test -n "$CPLDIR" && \
cpl_cext_libdirs="$CPLDIR/lib64 \
-@@ -604,7 +606,7 @@
+@@ -604,7 +606,7 @@ AC_DEFUN([CPL_CHECK_WCS],
cpl_wcs_check_version="$1"
cpl_wcs_check_header="wcslib/wcslib.h"
@@ -37,7 +45,7 @@ Description: Check cfitsio, wcs, and fftw in the standard paths if
cpl_wcs_includes=""
cpl_wcs_libraries=""
-@@ -678,6 +680,7 @@
+@@ -678,6 +680,7 @@ AC_DEFUN([CPL_CHECK_WCS],
cpl_wcs_libdirs="$cpl_wcs_libdirs /usr/lib64"
cpl_wcs_libdirs="$cpl_wcs_libdirs /usr/lib"
cpl_wcs_libdirs="$cpl_wcs_libdirs /usr/lib32"
@@ -45,7 +53,7 @@ Description: Check cfitsio, wcs, and fftw in the standard paths if
test -n "$WCSDIR" && \
cpl_wcs_libdirs="$WCSDIR/lib64 \
-@@ -836,8 +839,8 @@
+@@ -836,8 +839,8 @@ AC_DEFUN([CPL_CHECK_FFTW],
cpl_fftw_check_version="$1"
cpl_fftw_check_header="fftw3.h"
@@ -56,7 +64,7 @@ Description: Check cfitsio, wcs, and fftw in the standard paths if
cpl_fftw_includes=""
cpl_fftw_libraries=""
-@@ -912,6 +915,7 @@
+@@ -912,6 +915,7 @@ AC_DEFUN([CPL_CHECK_FFTW],
cpl_fftw_libdirs="$cpl_fftw_libdirs /usr/lib64"
cpl_fftw_libdirs="$cpl_fftw_libdirs /usr/lib"
cpl_fftw_libdirs="$cpl_fftw_libdirs /usr/lib32"
@@ -64,7 +72,7 @@ Description: Check cfitsio, wcs, and fftw in the standard paths if
test -n "$FFTWDIR" && \
cpl_fftw_libdirs="$FFTWDIR/lib64 \
-@@ -1250,7 +1254,7 @@
+@@ -1250,7 +1254,7 @@ AC_DEFUN([CPL_CHECK_LIBS],
AC_MSG_CHECKING([for CPL])
cpl_check_cpl_header="cpl.h"
@@ -73,7 +81,7 @@ Description: Check cfitsio, wcs, and fftw in the standard paths if
cpl_incdirs=""
cpl_libdirs=""
-@@ -1327,6 +1331,7 @@
+@@ -1327,6 +1331,7 @@ AC_DEFUN([CPL_CHECK_LIBS],
cpl_libdirs="$cpl_libdirs /usr/lib64"
cpl_libdirs="$cpl_libdirs /usr/lib"
cpl_libdirs="$cpl_libdirs /usr/lib32"
diff --git a/debian/patches/generate-manpage.patch b/debian/patches/Generate-a-manpage-for-esorex.patch
similarity index 90%
rename from debian/patches/generate-manpage.patch
rename to debian/patches/Generate-a-manpage-for-esorex.patch
index 15066b9..dd3eb70 100644
--- a/debian/patches/generate-manpage.patch
+++ b/debian/patches/Generate-a-manpage-for-esorex.patch
@@ -1,8 +1,18 @@
-Author: Ole Streicher <debian at liska.ath.cx>
+From: Ole Streicher <debian at liska.ath.cx>
+Date: Tue, 29 Aug 2017 13:21:57 +0200
Subject: Generate a manpage for esorex.
+
+---
+ src/Makefile.am | 4 ++
+ src/esorex_create_man.sh | 111 +++++++++++++++++++++++++++++++++++++++++++++++
+ 2 files changed, 115 insertions(+)
+ create mode 100644 src/esorex_create_man.sh
+
+diff --git a/src/Makefile.am b/src/Makefile.am
+index 19e77fd..b2f3c1a 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
-@@ -62,3 +62,7 @@
+@@ -62,3 +62,7 @@ if USE_PURIFY
include $(top_builddir)/Makefile.purify
endif
@@ -10,6 +20,9 @@ Subject: Generate a manpage for esorex.
+ sh esorex_create_man.sh
+
+man1_MANS = esorex.man
+diff --git a/src/esorex_create_man.sh b/src/esorex_create_man.sh
+new file mode 100644
+index 0000000..b184679
--- /dev/null
+++ b/src/esorex_create_man.sh
@@ -0,0 +1,111 @@
diff --git a/debian/patches/remove-private-ltdl.patch b/debian/patches/Remove-private-library-libltdl-and-use-the-installed-one.patch
similarity index 66%
rename from debian/patches/remove-private-ltdl.patch
rename to debian/patches/Remove-private-library-libltdl-and-use-the-installed-one.patch
index edaab05..5f27c6b 100644
--- a/debian/patches/remove-private-ltdl.patch
+++ b/debian/patches/Remove-private-library-libltdl-and-use-the-installed-one.patch
@@ -1,8 +1,17 @@
-Author: Ole Streicher <debian at liska.ath.cx>
+From: Ole Streicher <debian at liska.ath.cx>
+Date: Tue, 29 Aug 2017 13:21:57 +0200
Subject: Remove private library libltdl and use the installed one.
+
+---
+ Makefile.am | 5 +----
+ configure.ac | 7 +++----
+ 2 files changed, 4 insertions(+), 8 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index 036fdd3..52af15a 100644
--- a/Makefile.am
+++ b/Makefile.am
-@@ -37,10 +37,7 @@
+@@ -37,10 +37,7 @@ EXTRA_DIST = BUGS m4/cpl.m4 m4/eso.m4 m4/purify.m4 admin/doxygen.am \
if MAINTAINER_MODE
MAINTAINERCLEANFILES = $(top_srcdir)/Makefile.in $(top_srcdir)/aclocal.m4 \
@@ -14,9 +23,11 @@ Subject: Remove private library libltdl and use the installed one.
clean-local: clean-doxygen
+diff --git a/configure.ac b/configure.ac
+index dc77d82..83b7e14 100644
--- a/configure.ac
+++ b/configure.ac
-@@ -34,7 +34,9 @@
+@@ -34,7 +34,9 @@ AC_PROG_CXX_C_O
ESO_CHECK_DOCTOOLS
@@ -27,7 +38,7 @@ Subject: Remove private library libltdl and use the installed one.
AC_SUBST(INCLTDL)
AC_SUBST(LIBLTDL)
-@@ -80,9 +82,6 @@
+@@ -80,9 +82,6 @@ ESOREX_SET_PATHS
# Determine the shared library suffix on this platform
AC_LTDL_SHLIBEXT
diff --git a/debian/patches/set-default-plugin-path.patch b/debian/patches/Set-the-default-plugin-path.patch
similarity index 57%
rename from debian/patches/set-default-plugin-path.patch
rename to debian/patches/Set-the-default-plugin-path.patch
index 11cc268..1c4ff74 100644
--- a/debian/patches/set-default-plugin-path.patch
+++ b/debian/patches/Set-the-default-plugin-path.patch
@@ -1,20 +1,19 @@
-Author: Ole Streicher <debian at liska.ath.cx>
-Description: Set the default plugin path to the one where recipes are
- installed in Debian.
---- a/etc/esorex.rc.in
-+++ b/etc/esorex.rc.in
-@@ -150,7 +150,7 @@
- # as well. Multiple directory heads may be specified, by separating the
- # starting paths with colons (:). This option may also be set using the
- # environment variable ESOREX_PLUGIN_DIR.
--esorex.caller.recipe-dir=@recipedir@/esopipes-plugins
-+esorex.caller.recipe-dir=@recipedir@
-
- # --suppress-link
- # When TRUE, no symbolic link is created to the output product. However, if
+From: Ole Streicher <debian at liska.ath.cx>
+Date: Tue, 29 Aug 2017 13:21:57 +0200
+Subject: Set the default plugin path
+
+In Debian, they are installed in a path according to the Linux FHS and
+Multi arch compatible.
+---
+ acinclude.m4 | 5 ++++-
+ etc/esorex.rc.in | 2 +-
+ 2 files changed, 5 insertions(+), 2 deletions(-)
+
+diff --git a/acinclude.m4 b/acinclude.m4
+index e2080bb..0d57c36 100644
--- a/acinclude.m4
+++ b/acinclude.m4
-@@ -35,7 +35,10 @@
+@@ -35,7 +35,10 @@ AC_DEFUN([ESOREX_SET_PATHS],
AC_SUBST(configdir)
if test -z "$recipedir"; then
@@ -26,3 +25,16 @@ Description: Set the default plugin path to the one where recipes are
fi
AC_SUBST(recipedir)
+diff --git a/etc/esorex.rc.in b/etc/esorex.rc.in
+index 4f7ec17..f9cd8b3 100644
+--- a/etc/esorex.rc.in
++++ b/etc/esorex.rc.in
+@@ -150,7 +150,7 @@ esorex.caller.recipes=FALSE
+ # as well. Multiple directory heads may be specified, by separating the
+ # starting paths with colons (:). This option may also be set using the
+ # environment variable ESOREX_PLUGIN_DIR.
+-esorex.caller.recipe-dir=@recipedir@/esopipes-plugins
++esorex.caller.recipe-dir=@recipedir@
+
+ # --suppress-link
+ # When TRUE, no symbolic link is created to the output product. However, if
diff --git a/debian/patches/fix_format_strings.patch b/debian/patches/fix_format_strings.patch
deleted file mode 100644
index fe4d37b..0000000
--- a/debian/patches/fix_format_strings.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-Author: Ole Streicher <debian at liska.ath.cx>
-Description: Fix -Werror=format-security errors
---- a/src/er_paramutils.c
-+++ b/src/er_paramutils.c
-@@ -731,7 +731,7 @@
- (void) strcat (tmp, " to ");
- (void) strcat (tmp, er_strutils_dblstr (cpl_parameter_get_range_max_double (p)));
- (void) strcat (tmp, ".\n");
-- cpl_msg_error (er_func, tmp);
-+ cpl_msg_error (er_func, "%s", tmp);
-
- cpl_free(tmp);
- return -1;
---- a/src/er_plugin.c
-+++ b/src/er_plugin.c
-@@ -367,7 +367,7 @@
- if (wer != 0)
- {
- (void) snprintf(estr,(size_t)238,"Expansion of %s failed...",xpath);
-- cpl_msg_error (er_func, estr);
-+ cpl_msg_error (er_func, "%s", estr);
- goto dealloc;
- }
- }
diff --git a/debian/patches/remove-empty-configdir.patch b/debian/patches/remove-empty-configdir.patch
deleted file mode 100644
index d492173..0000000
--- a/debian/patches/remove-empty-configdir.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Author: Ole Streicher <debian at liska.ath.cx>
-Description: Avoid creation of an empty directory "/usr/share/esorex/config"
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -51,8 +51,6 @@
-
- bin_PROGRAMS = esorex
-
--config_DATA =
--
- esorex_LDFLAGS = $(CPL_LDFLAGS) $(LIBLTDL)
- esorex_LDADD = @GETOPT@ $(LIBCPLDFS) $(LIBCPLUI) $(LIBCPLCORE) $(LIBCEXT) $(LIBLTDL)
- esorex_DEPENDENCIES = @GETOPT@ $(LIBLTDL)
diff --git a/debian/patches/series b/debian/patches/series
index 0a0d63a..7277da1 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,5 @@
-remove-private-ltdl.patch
-generate-manpage.patch
-remove-empty-configdir.patch
-set-default-plugin-path.patch
-use-std-paths-for-libs.patch
+Remove-private-library-libltdl-and-use-the-installed-one.patch
+Generate-a-manpage-for-esorex.patch
+Avoid-creation-of-an-empty-directory-usr-share-esorex-con.patch
+Set-the-default-plugin-path.patch
+Check-cfitsio-wcs-and-fftw-in-the-standard-paths.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-astro/packages/esorex.git
More information about the Debian-astro-commits
mailing list