[med-svn] r23007 - trunk/packages/gwyddion/trunk/debian/patches

Jan Beyer beathovn-guest at moszumanska.debian.org
Mon Nov 7 20:03:33 UTC 2016 

Author: beathovn-guest
Date: 2016-11-07 20:03:31 +0000 (Mon, 07 Nov 2016)
New Revision: 23007

Modified:
   trunk/packages/gwyddion/trunk/debian/patches/fix-manpage-section-for-debian.diff
   trunk/packages/gwyddion/trunk/debian/patches/fix-rpath-issue.patch
Log:
Refreshed patches.

Modified: trunk/packages/gwyddion/trunk/debian/patches/fix-manpage-section-for-debian.diff
===================================================================
--- trunk/packages/gwyddion/trunk/debian/patches/fix-manpage-section-for-debian.diff	2016-11-07 14:34:39 UTC (rev 23006)
+++ trunk/packages/gwyddion/trunk/debian/patches/fix-manpage-section-for-debian.diff	2016-11-07 20:03:31 UTC (rev 23007)
@@ -8,9 +8,9 @@
 Forwarded: not-needed
 Author: Jan Beyer <jan at beathovn.de>
 
---- gwyddion-2.26.orig/perl/Makefile.in
-+++ gwyddion-2.26/perl/Makefile.in
-@@ -345,7 +345,7 @@
+--- a/perl/Makefile.in
++++ b/perl/Makefile.in
+@@ -403,7 +403,7 @@
  EXTRA_DIST = $(Gwyddion_PERL)
  perllibdir = $(pkglibdir)/perl/Gwyddion
  @HAVE_PERL_TRUE at man3dir = $(mandir)/man3
@@ -19,8 +19,8 @@
  @HAVE_PERL_TRUE at perllib_DATA = $(Gwyddion_PERL)
  @HAVE_PERL_TRUE at man3_pages = \
  @HAVE_PERL_TRUE@	Gwyddion::dump.3pm
---- gwyddion-2.26.orig/perl/Makefile.am
-+++ gwyddion-2.26/perl/Makefile.am
+--- a/perl/Makefile.am
++++ b/perl/Makefile.am
 @@ -9,7 +9,7 @@
  
  if HAVE_PERL

Modified: trunk/packages/gwyddion/trunk/debian/patches/fix-rpath-issue.patch
===================================================================
--- trunk/packages/gwyddion/trunk/debian/patches/fix-rpath-issue.patch	2016-11-07 14:34:39 UTC (rev 23006)
+++ trunk/packages/gwyddion/trunk/debian/patches/fix-rpath-issue.patch	2016-11-07 20:03:31 UTC (rev 23007)
@@ -1,6 +1,6 @@
 --- a/configure
 +++ b/configure
-@@ -12073,7 +12073,7 @@
+@@ -12082,7 +12082,7 @@
    version_type=linux # correct to gnu/linux during the next big refactor
    need_lib_prefix=no
    need_version=no
@@ -9,7 +9,7 @@
    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'
-@@ -12363,16 +12363,16 @@
+@@ -12372,16 +12372,16 @@
      ;;
    freebsd3.[01]* | freebsdelf3.[01]*)
      shlibpath_overrides_runpath=yes
@@ -29,7 +29,7 @@
      ;;
    esac
    ;;
-@@ -12387,7 +12387,7 @@
+@@ -12396,7 +12396,7 @@
    shlibpath_var=LIBRARY_PATH
    shlibpath_overrides_runpath=no
    sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
@@ -38,7 +38,7 @@
    ;;
  
  hpux9* | hpux10* | hpux11*)
-@@ -12399,7 +12399,7 @@
+@@ -12408,7 +12408,7 @@
    case $host_cpu in
    ia64*)
      shrext_cmds='.so'
@@ -47,7 +47,7 @@
      dynamic_linker="$host_os dld.so"
      shlibpath_var=LD_LIBRARY_PATH
      shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
-@@ -12415,7 +12415,7 @@
+@@ -12424,7 +12424,7 @@
      ;;
    hppa*64*)
      shrext_cmds='.sl'
@@ -56,7 +56,7 @@
      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.
-@@ -12448,7 +12448,7 @@
+@@ -12457,7 +12457,7 @@
    dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)'
    shlibpath_var=LD_LIBRARY_PATH
    shlibpath_overrides_runpath=no
@@ -65,7 +65,7 @@
    ;;
  
  irix5* | irix6* | nonstopux*)
-@@ -12485,7 +12485,7 @@
+@@ -12494,7 +12494,7 @@
    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"
@@ -74,7 +74,7 @@
    ;;
  
  # No shared lib support for Linux oldld, aout, or coff.
-@@ -12506,7 +12506,7 @@
+@@ -12515,7 +12515,7 @@
    # This implies no fast_install, which is unacceptable.
    # Some rework will be needed to allow for fast_install
    # before this can be enabled.
@@ -83,7 +83,7 @@
  
    dynamic_linker='Android linker'
    # Don't embed -rpath directories since the linker doesn't support them.
-@@ -12561,7 +12561,7 @@
+@@ -12570,7 +12570,7 @@
    # This implies no fast_install, which is unacceptable.
    # Some rework will be needed to allow for fast_install
    # before this can be enabled.
@@ -92,7 +92,7 @@
  
    # Add ABI-specific directories to the system library path.
    sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib"
-@@ -12601,7 +12601,7 @@
+@@ -12610,7 +12610,7 @@
    fi
    shlibpath_var=LD_LIBRARY_PATH
    shlibpath_overrides_runpath=yes
@@ -101,7 +101,7 @@
    ;;
  
  newsos6)
-@@ -12619,7 +12619,7 @@
+@@ -12628,7 +12628,7 @@
    soname_spec='$libname$release$shared_ext$major'
    shlibpath_var=LD_LIBRARY_PATH
    shlibpath_overrides_runpath=no
@@ -110,7 +110,7 @@
    dynamic_linker='ldqnx.so'
    ;;
  
-@@ -12691,7 +12691,7 @@
+@@ -12700,7 +12700,7 @@
    soname_spec='$libname$release$shared_ext$major'
    shlibpath_var=LD_LIBRARY_PATH
    shlibpath_overrides_runpath=yes
@@ -119,7 +119,7 @@
    # ldd complains unless libraries are executable
    postinstall_cmds='chmod +x $lib'
    ;;
-@@ -12748,7 +12748,7 @@
+@@ -12757,7 +12757,7 @@
    soname_spec='$libname$release$shared_ext$major'
    shlibpath_var=LD_LIBRARY_PATH
    shlibpath_overrides_runpath=yes
@@ -128,7 +128,7 @@
    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
-@@ -12770,7 +12770,7 @@
+@@ -12779,7 +12779,7 @@
    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
@@ -137,7 +137,7 @@
    ;;
  
  uts4*)
-@@ -16040,7 +16040,7 @@
+@@ -16049,7 +16049,7 @@
    version_type=linux # correct to gnu/linux during the next big refactor
    need_lib_prefix=no
    need_version=no
@@ -146,7 +146,7 @@
    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'
-@@ -16328,16 +16328,16 @@
+@@ -16337,16 +16337,16 @@
      ;;
    freebsd3.[01]* | freebsdelf3.[01]*)
      shlibpath_overrides_runpath=yes
@@ -166,7 +166,7 @@
      ;;
    esac
    ;;
-@@ -16352,7 +16352,7 @@
+@@ -16361,7 +16361,7 @@
    shlibpath_var=LIBRARY_PATH
    shlibpath_overrides_runpath=no
    sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
@@ -175,7 +175,7 @@
    ;;
  
  hpux9* | hpux10* | hpux11*)
-@@ -16364,7 +16364,7 @@
+@@ -16373,7 +16373,7 @@
    case $host_cpu in
    ia64*)
      shrext_cmds='.so'
@@ -184,7 +184,7 @@
      dynamic_linker="$host_os dld.so"
      shlibpath_var=LD_LIBRARY_PATH
      shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
-@@ -16380,7 +16380,7 @@
+@@ -16389,7 +16389,7 @@
      ;;
    hppa*64*)
      shrext_cmds='.sl'
@@ -193,7 +193,7 @@
      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.
-@@ -16413,7 +16413,7 @@
+@@ -16422,7 +16422,7 @@
    dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)'
    shlibpath_var=LD_LIBRARY_PATH
    shlibpath_overrides_runpath=no
@@ -202,7 +202,7 @@
    ;;
  
  irix5* | irix6* | nonstopux*)
-@@ -16450,7 +16450,7 @@
+@@ -16459,7 +16459,7 @@
    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"
@@ -211,7 +211,7 @@
    ;;
  
  # No shared lib support for Linux oldld, aout, or coff.
-@@ -16471,7 +16471,7 @@
+@@ -16480,7 +16480,7 @@
    # This implies no fast_install, which is unacceptable.
    # Some rework will be needed to allow for fast_install
    # before this can be enabled.
@@ -220,7 +220,7 @@
  
    dynamic_linker='Android linker'
    # Don't embed -rpath directories since the linker doesn't support them.
-@@ -16526,7 +16526,7 @@
+@@ -16535,7 +16535,7 @@
    # This implies no fast_install, which is unacceptable.
    # Some rework will be needed to allow for fast_install
    # before this can be enabled.
@@ -229,7 +229,7 @@
  
    # Add ABI-specific directories to the system library path.
    sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib"
-@@ -16566,7 +16566,7 @@
+@@ -16575,7 +16575,7 @@
    fi
    shlibpath_var=LD_LIBRARY_PATH
    shlibpath_overrides_runpath=yes
@@ -238,7 +238,7 @@
    ;;
  
  newsos6)
-@@ -16584,7 +16584,7 @@
+@@ -16593,7 +16593,7 @@
    soname_spec='$libname$release$shared_ext$major'
    shlibpath_var=LD_LIBRARY_PATH
    shlibpath_overrides_runpath=no
@@ -247,7 +247,7 @@
    dynamic_linker='ldqnx.so'
    ;;
  
-@@ -16656,7 +16656,7 @@
+@@ -16665,7 +16665,7 @@
    soname_spec='$libname$release$shared_ext$major'
    shlibpath_var=LD_LIBRARY_PATH
    shlibpath_overrides_runpath=yes
@@ -256,7 +256,7 @@
    # ldd complains unless libraries are executable
    postinstall_cmds='chmod +x $lib'
    ;;
-@@ -16713,7 +16713,7 @@
+@@ -16722,7 +16722,7 @@
    soname_spec='$libname$release$shared_ext$major'
    shlibpath_var=LD_LIBRARY_PATH
    shlibpath_overrides_runpath=yes
@@ -265,7 +265,7 @@
    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
-@@ -16735,7 +16735,7 @@
+@@ -16744,7 +16744,7 @@
    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

More information about the debian-med-commit mailing list