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

Jan Beyer beathovn-guest at alioth.debian.org
Tue Sep 22 20:16:35 UTC 2009


Author: beathovn-guest
Date: 2009-09-22 20:16:35 +0000 (Tue, 22 Sep 2009)
New Revision: 4012

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


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	2009-09-22 19:28:23 UTC (rev 4011)
+++ trunk/packages/gwyddion/trunk/debian/patches/fix-manpage-section-for-debian.diff	2009-09-22 20:16:35 UTC (rev 4012)
@@ -8,9 +8,9 @@
 Forwarded: not-needed
 Author: Jan Beyer <jan at beathovn.de>
 
---- gwyddion-2.16.orig/perl/Makefile.in
-+++ gwyddion-2.16/perl/Makefile.in
-@@ -279,7 +279,7 @@
+--- gwyddion-2.17.orig/perl/Makefile.in
++++ gwyddion-2.17/perl/Makefile.in
+@@ -298,7 +298,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.16.orig/perl/Makefile.am
-+++ gwyddion-2.16/perl/Makefile.am
+--- gwyddion-2.17.orig/perl/Makefile.am
++++ gwyddion-2.17/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	2009-09-22 19:28:23 UTC (rev 4011)
+++ trunk/packages/gwyddion/trunk/debian/patches/fix-rpath-issue.patch	2009-09-22 20:16:35 UTC (rev 4012)
@@ -2,9 +2,9 @@
 Forwarded: no
 Author: Jan Beyer <jan at beathovn.de>
 
---- gwyddion-2.16.orig/configure
-+++ gwyddion-2.16/configure
-@@ -11376,7 +11376,7 @@
+--- gwyddion-2.17.orig/configure
++++ gwyddion-2.17/configure
+@@ -11477,7 +11477,7 @@
    version_type=linux
    need_lib_prefix=no
    need_version=no
@@ -13,7 +13,7 @@
    if test "$host_cpu" = ia64; then
      # AIX 5 supports IA64
      library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}'
-@@ -11571,16 +11571,16 @@
+@@ -11672,16 +11672,16 @@
      ;;
    freebsd3.[01]* | freebsdelf3.[01]*)
      shlibpath_overrides_runpath=yes
@@ -33,7 +33,7 @@
      ;;
    esac
    ;;
-@@ -11592,7 +11592,7 @@
+@@ -11693,7 +11693,7 @@
    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
    soname_spec='${libname}${release}${shared_ext}$major'
    shlibpath_var=LD_LIBRARY_PATH
@@ -42,7 +42,7 @@
    ;;
  
  hpux9* | hpux10* | hpux11*)
-@@ -11604,7 +11604,7 @@
+@@ -11705,7 +11705,7 @@
    case $host_cpu in
    ia64*)
      shrext_cmds='.so'
@@ -51,7 +51,7 @@
      dynamic_linker="$host_os dld.so"
      shlibpath_var=LD_LIBRARY_PATH
      shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
-@@ -11619,7 +11619,7 @@
+@@ -11720,7 +11720,7 @@
      ;;
    hppa*64*)
      shrext_cmds='.sl'
@@ -60,7 +60,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.
-@@ -11650,7 +11650,7 @@
+@@ -11751,7 +11751,7 @@
    dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)'
    shlibpath_var=LD_LIBRARY_PATH
    shlibpath_overrides_runpath=no
@@ -69,7 +69,7 @@
    ;;
  
  irix5* | irix6* | nonstopux*)
-@@ -11687,7 +11687,7 @@
+@@ -11788,7 +11788,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}"
@@ -78,7 +78,7 @@
    ;;
  
  # No shared lib support for Linux oldld, aout, or coff.
-@@ -11766,7 +11766,7 @@
+@@ -11867,7 +11867,7 @@
    # 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 @@
  
    # Add ABI-specific directories to the system library path.
    sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib"
-@@ -11801,7 +11801,7 @@
+@@ -11902,7 +11902,7 @@
    fi
    shlibpath_var=LD_LIBRARY_PATH
    shlibpath_overrides_runpath=yes
@@ -96,7 +96,7 @@
    ;;
  
  newsos6)
-@@ -11819,7 +11819,7 @@
+@@ -11920,7 +11920,7 @@
    soname_spec='${libname}${release}${shared_ext}$major'
    shlibpath_var=LD_LIBRARY_PATH
    shlibpath_overrides_runpath=no
@@ -105,7 +105,7 @@
    dynamic_linker='ldqnx.so'
    ;;
  
-@@ -11881,7 +11881,7 @@
+@@ -11982,7 +11982,7 @@
    soname_spec='${libname}${release}${shared_ext}$major'
    shlibpath_var=LD_LIBRARY_PATH
    shlibpath_overrides_runpath=yes
@@ -114,7 +114,7 @@
    # ldd complains unless libraries are executable
    postinstall_cmds='chmod +x $lib'
    ;;
-@@ -11938,7 +11938,7 @@
+@@ -12039,7 +12039,7 @@
    soname_spec='${libname}${release}${shared_ext}$major'
    shlibpath_var=LD_LIBRARY_PATH
    shlibpath_overrides_runpath=yes
@@ -123,7 +123,7 @@
    if test "$with_gnu_ld" = yes; then
      sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
    else
-@@ -11960,7 +11960,7 @@
+@@ -12061,7 +12061,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
@@ -132,7 +132,7 @@
    ;;
  
  uts4*)
-@@ -15242,7 +15242,7 @@
+@@ -15343,7 +15343,7 @@
    version_type=linux
    need_lib_prefix=no
    need_version=no
@@ -141,7 +141,7 @@
    if test "$host_cpu" = ia64; then
      # AIX 5 supports IA64
      library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}'
-@@ -15436,16 +15436,16 @@
+@@ -15537,16 +15537,16 @@
      ;;
    freebsd3.[01]* | freebsdelf3.[01]*)
      shlibpath_overrides_runpath=yes
@@ -161,7 +161,7 @@
      ;;
    esac
    ;;
-@@ -15457,7 +15457,7 @@
+@@ -15558,7 +15558,7 @@
    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
    soname_spec='${libname}${release}${shared_ext}$major'
    shlibpath_var=LD_LIBRARY_PATH
@@ -170,7 +170,7 @@
    ;;
  
  hpux9* | hpux10* | hpux11*)
-@@ -15469,7 +15469,7 @@
+@@ -15570,7 +15570,7 @@
    case $host_cpu in
    ia64*)
      shrext_cmds='.so'
@@ -179,7 +179,7 @@
      dynamic_linker="$host_os dld.so"
      shlibpath_var=LD_LIBRARY_PATH
      shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
-@@ -15484,7 +15484,7 @@
+@@ -15585,7 +15585,7 @@
      ;;
    hppa*64*)
      shrext_cmds='.sl'
@@ -188,7 +188,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.
-@@ -15515,7 +15515,7 @@
+@@ -15616,7 +15616,7 @@
    dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)'
    shlibpath_var=LD_LIBRARY_PATH
    shlibpath_overrides_runpath=no
@@ -197,7 +197,7 @@
    ;;
  
  irix5* | irix6* | nonstopux*)
-@@ -15552,7 +15552,7 @@
+@@ -15653,7 +15653,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}"
@@ -206,7 +206,7 @@
    ;;
  
  # No shared lib support for Linux oldld, aout, or coff.
-@@ -15631,7 +15631,7 @@
+@@ -15732,7 +15732,7 @@
    # This implies no fast_install, which is unacceptable.
    # Some rework will be needed to allow for fast_install
    # before this can be enabled.
@@ -215,7 +215,7 @@
  
    # Add ABI-specific directories to the system library path.
    sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib"
-@@ -15666,7 +15666,7 @@
+@@ -15767,7 +15767,7 @@
    fi
    shlibpath_var=LD_LIBRARY_PATH
    shlibpath_overrides_runpath=yes
@@ -224,7 +224,7 @@
    ;;
  
  newsos6)
-@@ -15684,7 +15684,7 @@
+@@ -15785,7 +15785,7 @@
    soname_spec='${libname}${release}${shared_ext}$major'
    shlibpath_var=LD_LIBRARY_PATH
    shlibpath_overrides_runpath=no
@@ -233,7 +233,7 @@
    dynamic_linker='ldqnx.so'
    ;;
  
-@@ -15746,7 +15746,7 @@
+@@ -15847,7 +15847,7 @@
    soname_spec='${libname}${release}${shared_ext}$major'
    shlibpath_var=LD_LIBRARY_PATH
    shlibpath_overrides_runpath=yes
@@ -242,7 +242,7 @@
    # ldd complains unless libraries are executable
    postinstall_cmds='chmod +x $lib'
    ;;
-@@ -15803,7 +15803,7 @@
+@@ -15904,7 +15904,7 @@
    soname_spec='${libname}${release}${shared_ext}$major'
    shlibpath_var=LD_LIBRARY_PATH
    shlibpath_overrides_runpath=yes
@@ -251,7 +251,7 @@
    if test "$with_gnu_ld" = yes; then
      sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
    else
-@@ -15825,7 +15825,7 @@
+@@ -15926,7 +15926,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