[med-svn] [gwyddion] 04/04: Adapt patches
Andreas Tille
tille at debian.org
Thu Sep 21 09:04:34 UTC 2017
This is an automated email from the git hooks/post-receive script.
tille pushed a commit to branch master
in repository gwyddion.
commit 47c133b502bc200fe83bcbe4ef0e9f1d846a04e3
Author: Andreas Tille <tille at debian.org>
Date: Thu Sep 21 11:04:02 2017 +0200
Adapt patches
---
debian/patches/fix-manpage-section-for-debian.diff | 4 +-
debian/patches/fix-rpath-issue.patch | 56 +++++++++++-----------
2 files changed, 30 insertions(+), 30 deletions(-)
diff --git a/debian/patches/fix-manpage-section-for-debian.diff b/debian/patches/fix-manpage-section-for-debian.diff
index 0767cb8..d8dff2b 100644
--- a/debian/patches/fix-manpage-section-for-debian.diff
+++ b/debian/patches/fix-manpage-section-for-debian.diff
@@ -10,7 +10,7 @@ Author: Jan Beyer <jan at beathovn.de>
--- a/perl/Makefile.in
+++ b/perl/Makefile.in
-@@ -403,7 +403,7 @@
+@@ -401,7 +401,7 @@ Gwyddion_PERL = \
EXTRA_DIST = $(Gwyddion_PERL)
perllibdir = $(pkglibdir)/perl/Gwyddion
@HAVE_PERL_TRUE at man3dir = $(mandir)/man3
@@ -21,7 +21,7 @@ Author: Jan Beyer <jan at beathovn.de>
@HAVE_PERL_TRUE@ Gwyddion::dump.3pm
--- a/perl/Makefile.am
+++ b/perl/Makefile.am
-@@ -9,7 +9,7 @@
+@@ -9,7 +9,7 @@ perllibdir = $(pkglibdir)/perl/Gwyddion
if HAVE_PERL
man3dir = $(mandir)/man3
diff --git a/debian/patches/fix-rpath-issue.patch b/debian/patches/fix-rpath-issue.patch
index 405b2d0..085e682 100644
--- a/debian/patches/fix-rpath-issue.patch
+++ b/debian/patches/fix-rpath-issue.patch
@@ -4,7 +4,7 @@ Author: Jan Beyer <jan at beathovn.de>
--- a/configure
+++ b/configure
-@@ -12082,7 +12082,7 @@
+@@ -12073,7 +12073,7 @@ aix[4-9]*)
version_type=linux # correct to gnu/linux during the next big refactor
need_lib_prefix=no
need_version=no
@@ -13,7 +13,7 @@ Author: Jan Beyer <jan at beathovn.de>
if test ia64 = "$host_cpu"; then
# AIX 5 supports IA64
library_names_spec='$libname$release$shared_ext$major $libname$release$shared_ext$versuffix $libname$shared_ext'
-@@ -12372,16 +12372,16 @@
+@@ -12363,16 +12363,16 @@ freebsd* | dragonfly*)
;;
freebsd3.[01]* | freebsdelf3.[01]*)
shlibpath_overrides_runpath=yes
@@ -33,7 +33,7 @@ Author: Jan Beyer <jan at beathovn.de>
;;
esac
;;
-@@ -12396,7 +12396,7 @@
+@@ -12387,7 +12387,7 @@ haiku*)
shlibpath_var=LIBRARY_PATH
shlibpath_overrides_runpath=no
sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
@@ -42,7 +42,7 @@ Author: Jan Beyer <jan at beathovn.de>
;;
hpux9* | hpux10* | hpux11*)
-@@ -12408,7 +12408,7 @@
+@@ -12399,7 +12399,7 @@ hpux9* | hpux10* | hpux11*)
case $host_cpu in
ia64*)
shrext_cmds='.so'
@@ -51,7 +51,7 @@ Author: Jan Beyer <jan at beathovn.de>
dynamic_linker="$host_os dld.so"
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
-@@ -12424,7 +12424,7 @@
+@@ -12415,7 +12415,7 @@ hpux9* | hpux10* | hpux11*)
;;
hppa*64*)
shrext_cmds='.sl'
@@ -60,7 +60,7 @@ Author: Jan Beyer <jan at beathovn.de>
dynamic_linker="$host_os dld.sl"
shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
-@@ -12457,7 +12457,7 @@
+@@ -12448,7 +12448,7 @@ interix[3-9]*)
dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)'
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=no
@@ -69,7 +69,7 @@ Author: Jan Beyer <jan at beathovn.de>
;;
irix5* | irix6* | nonstopux*)
-@@ -12494,7 +12494,7 @@
+@@ -12485,7 +12485,7 @@ irix5* | irix6* | nonstopux*)
shlibpath_overrides_runpath=no
sys_lib_search_path_spec="/usr/lib$libsuff /lib$libsuff /usr/local/lib$libsuff"
sys_lib_dlsearch_path_spec="/usr/lib$libsuff /lib$libsuff"
@@ -78,7 +78,7 @@ Author: Jan Beyer <jan at beathovn.de>
;;
# No shared lib support for Linux oldld, aout, or coff.
-@@ -12515,7 +12515,7 @@
+@@ -12506,7 +12506,7 @@ linux*android*)
# This implies no fast_install, which is unacceptable.
# Some rework will be needed to allow for fast_install
# before this can be enabled.
@@ -87,7 +87,7 @@ Author: Jan Beyer <jan at beathovn.de>
dynamic_linker='Android linker'
# Don't embed -rpath directories since the linker doesn't support them.
-@@ -12570,7 +12570,7 @@
+@@ -12561,7 +12561,7 @@ fi
# This implies no fast_install, which is unacceptable.
# Some rework will be needed to allow for fast_install
# before this can be enabled.
@@ -96,7 +96,7 @@ Author: Jan Beyer <jan at beathovn.de>
# Add ABI-specific directories to the system library path.
sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib"
-@@ -12610,7 +12610,7 @@
+@@ -12601,7 +12601,7 @@ netbsd*)
fi
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=yes
@@ -105,7 +105,7 @@ Author: Jan Beyer <jan at beathovn.de>
;;
newsos6)
-@@ -12628,7 +12628,7 @@
+@@ -12619,7 +12619,7 @@ newsos6)
soname_spec='$libname$release$shared_ext$major'
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=no
@@ -114,7 +114,7 @@ Author: Jan Beyer <jan at beathovn.de>
dynamic_linker='ldqnx.so'
;;
-@@ -12700,7 +12700,7 @@
+@@ -12691,7 +12691,7 @@ solaris*)
soname_spec='$libname$release$shared_ext$major'
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=yes
@@ -123,7 +123,7 @@ Author: Jan Beyer <jan at beathovn.de>
# ldd complains unless libraries are executable
postinstall_cmds='chmod +x $lib'
;;
-@@ -12757,7 +12757,7 @@
+@@ -12748,7 +12748,7 @@ sysv5* | sco3.2v5* | sco5v6* | unixware*
soname_spec='$libname$release$shared_ext$major'
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=yes
@@ -132,7 +132,7 @@ Author: Jan Beyer <jan at beathovn.de>
if test yes = "$with_gnu_ld"; then
sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
else
-@@ -12779,7 +12779,7 @@
+@@ -12770,7 +12770,7 @@ tpf*)
library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=no
@@ -141,7 +141,7 @@ Author: Jan Beyer <jan at beathovn.de>
;;
uts4*)
-@@ -16049,7 +16049,7 @@
+@@ -16040,7 +16040,7 @@ aix[4-9]*)
version_type=linux # correct to gnu/linux during the next big refactor
need_lib_prefix=no
need_version=no
@@ -150,7 +150,7 @@ Author: Jan Beyer <jan at beathovn.de>
if test ia64 = "$host_cpu"; then
# AIX 5 supports IA64
library_names_spec='$libname$release$shared_ext$major $libname$release$shared_ext$versuffix $libname$shared_ext'
-@@ -16337,16 +16337,16 @@
+@@ -16328,16 +16328,16 @@ freebsd* | dragonfly*)
;;
freebsd3.[01]* | freebsdelf3.[01]*)
shlibpath_overrides_runpath=yes
@@ -170,7 +170,7 @@ Author: Jan Beyer <jan at beathovn.de>
;;
esac
;;
-@@ -16361,7 +16361,7 @@
+@@ -16352,7 +16352,7 @@ haiku*)
shlibpath_var=LIBRARY_PATH
shlibpath_overrides_runpath=no
sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
@@ -179,7 +179,7 @@ Author: Jan Beyer <jan at beathovn.de>
;;
hpux9* | hpux10* | hpux11*)
-@@ -16373,7 +16373,7 @@
+@@ -16364,7 +16364,7 @@ hpux9* | hpux10* | hpux11*)
case $host_cpu in
ia64*)
shrext_cmds='.so'
@@ -188,7 +188,7 @@ Author: Jan Beyer <jan at beathovn.de>
dynamic_linker="$host_os dld.so"
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
-@@ -16389,7 +16389,7 @@
+@@ -16380,7 +16380,7 @@ hpux9* | hpux10* | hpux11*)
;;
hppa*64*)
shrext_cmds='.sl'
@@ -197,7 +197,7 @@ Author: Jan Beyer <jan at beathovn.de>
dynamic_linker="$host_os dld.sl"
shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
-@@ -16422,7 +16422,7 @@
+@@ -16413,7 +16413,7 @@ interix[3-9]*)
dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)'
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=no
@@ -206,7 +206,7 @@ Author: Jan Beyer <jan at beathovn.de>
;;
irix5* | irix6* | nonstopux*)
-@@ -16459,7 +16459,7 @@
+@@ -16450,7 +16450,7 @@ irix5* | irix6* | nonstopux*)
shlibpath_overrides_runpath=no
sys_lib_search_path_spec="/usr/lib$libsuff /lib$libsuff /usr/local/lib$libsuff"
sys_lib_dlsearch_path_spec="/usr/lib$libsuff /lib$libsuff"
@@ -215,7 +215,7 @@ Author: Jan Beyer <jan at beathovn.de>
;;
# No shared lib support for Linux oldld, aout, or coff.
-@@ -16480,7 +16480,7 @@
+@@ -16471,7 +16471,7 @@ linux*android*)
# This implies no fast_install, which is unacceptable.
# Some rework will be needed to allow for fast_install
# before this can be enabled.
@@ -224,7 +224,7 @@ Author: Jan Beyer <jan at beathovn.de>
dynamic_linker='Android linker'
# Don't embed -rpath directories since the linker doesn't support them.
-@@ -16535,7 +16535,7 @@
+@@ -16526,7 +16526,7 @@ fi
# This implies no fast_install, which is unacceptable.
# Some rework will be needed to allow for fast_install
# before this can be enabled.
@@ -233,7 +233,7 @@ Author: Jan Beyer <jan at beathovn.de>
# Add ABI-specific directories to the system library path.
sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib"
-@@ -16575,7 +16575,7 @@
+@@ -16566,7 +16566,7 @@ netbsd*)
fi
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=yes
@@ -242,7 +242,7 @@ Author: Jan Beyer <jan at beathovn.de>
;;
newsos6)
-@@ -16593,7 +16593,7 @@
+@@ -16584,7 +16584,7 @@ newsos6)
soname_spec='$libname$release$shared_ext$major'
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=no
@@ -251,7 +251,7 @@ Author: Jan Beyer <jan at beathovn.de>
dynamic_linker='ldqnx.so'
;;
-@@ -16665,7 +16665,7 @@
+@@ -16656,7 +16656,7 @@ solaris*)
soname_spec='$libname$release$shared_ext$major'
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=yes
@@ -260,7 +260,7 @@ Author: Jan Beyer <jan at beathovn.de>
# ldd complains unless libraries are executable
postinstall_cmds='chmod +x $lib'
;;
-@@ -16722,7 +16722,7 @@
+@@ -16713,7 +16713,7 @@ sysv5* | sco3.2v5* | sco5v6* | unixware*
soname_spec='$libname$release$shared_ext$major'
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=yes
@@ -269,7 +269,7 @@ Author: Jan Beyer <jan at beathovn.de>
if test yes = "$with_gnu_ld"; then
sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
else
-@@ -16744,7 +16744,7 @@
+@@ -16735,7 +16735,7 @@ tpf*)
library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=no
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/gwyddion.git
More information about the debian-med-commit
mailing list