[med-svn] r12303 - in trunk/packages/gwyddion/trunk/debian: . patches

Jan Beyer beathovn-guest at alioth.debian.org
Sun Sep 30 21:08:59 UTC 2012


Author: beathovn-guest
Date: 2012-09-30 21:08:59 +0000 (Sun, 30 Sep 2012)
New Revision: 12303

Modified:
   trunk/packages/gwyddion/trunk/debian/changelog
   trunk/packages/gwyddion/trunk/debian/patches/fix-manpage-section-for-debian.diff
   trunk/packages/gwyddion/trunk/debian/patches/fix-rpath-issue.patch
Log:
Refresh patch, close update-bug. Still needed: new policy, debian/copyright

Modified: trunk/packages/gwyddion/trunk/debian/changelog
===================================================================
--- trunk/packages/gwyddion/trunk/debian/changelog	2012-09-29 18:55:37 UTC (rev 12302)
+++ trunk/packages/gwyddion/trunk/debian/changelog	2012-09-30 21:08:59 UTC (rev 12303)
@@ -1,3 +1,10 @@
+gwyddion (2.30-1) experimental; urgency=low
+
+  * New upstream release
+    Closes: #688771
+
+ -- Jan Beyer <jan at beathovn.de>  Sun, 30 Sep 2012 23:04:32 +0200
+
 gwyddion (2.29-1) experimental; urgency=low
 
   * New upstream version

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	2012-09-29 18:55:37 UTC (rev 12302)
+++ trunk/packages/gwyddion/trunk/debian/patches/fix-manpage-section-for-debian.diff	2012-09-30 21:08:59 UTC (rev 12303)
@@ -10,7 +10,7 @@
 
 --- gwyddion-2.26.orig/perl/Makefile.in
 +++ gwyddion-2.26/perl/Makefile.in
-@@ -314,7 +314,7 @@
+@@ -345,7 +345,7 @@
  EXTRA_DIST = $(Gwyddion_PERL)
  perllibdir = $(pkglibdir)/perl/Gwyddion
  @HAVE_PERL_TRUE at man3dir = $(mandir)/man3

Modified: trunk/packages/gwyddion/trunk/debian/patches/fix-rpath-issue.patch
===================================================================
--- trunk/packages/gwyddion/trunk/debian/patches/fix-rpath-issue.patch	2012-09-29 18:55:37 UTC (rev 12302)
+++ trunk/packages/gwyddion/trunk/debian/patches/fix-rpath-issue.patch	2012-09-30 21:08:59 UTC (rev 12303)
@@ -2,261 +2,279 @@
 Forwarded: no
 Author: Jan Beyer <jan at beathovn.de>
 
---- gwyddion-2.26.orig/configure
-+++ gwyddion-2.26/configure
-@@ -11303,7 +11303,7 @@
-   version_type=linux
+--- gwyddion-2.30.orig/configure
++++ gwyddion-2.30/configure
+@@ -11496,7 +11496,7 @@
+   version_type=linux # correct to gnu/linux during the next big refactor
    need_lib_prefix=no
    need_version=no
 -  hardcode_into_libs=yes
-+  hardcode_into_libs=no
++  harcode_into_libs=no
    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}'
-@@ -11546,16 +11546,16 @@
+@@ -11735,16 +11735,16 @@
      ;;
    freebsd3.[01]* | freebsdelf3.[01]*)
      shlibpath_overrides_runpath=yes
 -    hardcode_into_libs=yes
-+    hardcode_into_libs=no
++    harcode_into_libs=no
      ;;
    freebsd3.[2-9]* | freebsdelf3.[2-9]* | \
    freebsd4.[0-5] | freebsdelf4.[0-5] | freebsd4.1.1 | freebsdelf4.1.1)
      shlibpath_overrides_runpath=no
 -    hardcode_into_libs=yes
-+    hardcode_into_libs=no
++    harcode_into_libs=no
      ;;
    *) # from 4.6 on, and DragonFly
      shlibpath_overrides_runpath=yes
 -    hardcode_into_libs=yes
-+    hardcode_into_libs=
++    harcode_into_libs=no
      ;;
    esac
    ;;
-@@ -11567,7 +11567,7 @@
-   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
+@@ -11757,7 +11757,7 @@
    soname_spec='${libname}${release}${shared_ext}$major'
    shlibpath_var=LD_LIBRARY_PATH
+   shlibpath_overrides_runpath=no
 -  hardcode_into_libs=yes
-+  hardcode_into_libs=no
++  harcode_into_libs=no
    ;;
  
  haiku*)
-@@ -11592,7 +11592,7 @@
+@@ -11770,7 +11770,7 @@
+   shlibpath_var=LIBRARY_PATH
+   shlibpath_overrides_runpath=yes
+   sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
+-  hardcode_into_libs=yes
++  harcode_into_libs=no
+   ;;
+ 
+ hpux9* | hpux10* | hpux11*)
+@@ -11782,7 +11782,7 @@
    case $host_cpu in
    ia64*)
      shrext_cmds='.so'
 -    hardcode_into_libs=yes
-+    hardcode_into_libs=no
++    harcode_into_libs=no
      dynamic_linker="$host_os dld.so"
      shlibpath_var=LD_LIBRARY_PATH
      shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
-@@ -11607,7 +11607,7 @@
+@@ -11797,7 +11797,7 @@
      ;;
    hppa*64*)
      shrext_cmds='.sl'
 -    hardcode_into_libs=yes
-+    hardcode_into_libs=no
++    harcode_into_libs=no
      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.
-@@ -11640,7 +11640,7 @@
+@@ -11830,7 +11830,7 @@
    dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)'
    shlibpath_var=LD_LIBRARY_PATH
    shlibpath_overrides_runpath=no
 -  hardcode_into_libs=yes
-+  hardcode_into_libs=no
++  harcode_into_libs=no
    ;;
  
  irix5* | irix6* | nonstopux*)
-@@ -11677,7 +11677,7 @@
+@@ -11867,7 +11867,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}"
 -  hardcode_into_libs=yes
-+  hardcode_into_libs=no
++  harcode_into_libs=no
    ;;
  
  # No shared lib support for Linux oldld, aout, or coff.
-@@ -11733,7 +11733,7 @@
+@@ -11923,7 +11923,7 @@
    # This implies no fast_install, which is unacceptable.
    # Some rework will be needed to allow for fast_install
    # before this can be enabled.
 -  hardcode_into_libs=yes
-+  hardcode_into_libs=no
++  harcode_into_libs=no
  
    # Add ABI-specific directories to the system library path.
    sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib"
-@@ -11769,7 +11769,7 @@
+@@ -11959,7 +11959,7 @@
    fi
    shlibpath_var=LD_LIBRARY_PATH
    shlibpath_overrides_runpath=yes
 -  hardcode_into_libs=yes
-+  hardcode_into_libs=no
++  harcode_into_libs=no
    ;;
  
  newsos6)
-@@ -11787,7 +11787,7 @@
+@@ -11977,7 +11977,7 @@
    soname_spec='${libname}${release}${shared_ext}$major'
    shlibpath_var=LD_LIBRARY_PATH
    shlibpath_overrides_runpath=no
 -  hardcode_into_libs=yes
-+  hardcode_into_libs=no
++  harcode_into_libs=no
    dynamic_linker='ldqnx.so'
    ;;
  
-@@ -11849,7 +11849,7 @@
+@@ -12039,7 +12039,7 @@
    soname_spec='${libname}${release}${shared_ext}$major'
    shlibpath_var=LD_LIBRARY_PATH
    shlibpath_overrides_runpath=yes
 -  hardcode_into_libs=yes
-+  hardcode_into_libs=no
++  harcode_into_libs=no
    # ldd complains unless libraries are executable
    postinstall_cmds='chmod +x $lib'
    ;;
-@@ -11906,7 +11906,7 @@
+@@ -12096,7 +12096,7 @@
    soname_spec='${libname}${release}${shared_ext}$major'
    shlibpath_var=LD_LIBRARY_PATH
    shlibpath_overrides_runpath=yes
 -  hardcode_into_libs=yes
-+  hardcode_into_libs=no
++  harcode_into_libs=no
    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
-@@ -11928,7 +11928,7 @@
+@@ -12118,7 +12118,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
 -  hardcode_into_libs=yes
-+  hardcode_into_libs=no
++  harcode_into_libs=no
    ;;
  
  uts4*)
-@@ -15142,7 +15142,7 @@
-   version_type=linux
+@@ -15333,7 +15333,7 @@
+   version_type=linux # correct to gnu/linux during the next big refactor
    need_lib_prefix=no
    need_version=no
 -  hardcode_into_libs=yes
-+  hardcode_into_libs=no
++  harcode_into_libs=no
    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}'
-@@ -15383,16 +15383,16 @@
+@@ -15570,16 +15570,16 @@
      ;;
    freebsd3.[01]* | freebsdelf3.[01]*)
      shlibpath_overrides_runpath=yes
 -    hardcode_into_libs=yes
-+    hardcode_into_libs=no
++    harcode_into_libs=no
      ;;
    freebsd3.[2-9]* | freebsdelf3.[2-9]* | \
    freebsd4.[0-5] | freebsdelf4.[0-5] | freebsd4.1.1 | freebsdelf4.1.1)
      shlibpath_overrides_runpath=no
 -    hardcode_into_libs=yes
-+    hardcode_into_libs=no
++    harcode_into_libs=no
      ;;
    *) # from 4.6 on, and DragonFly
      shlibpath_overrides_runpath=yes
 -    hardcode_into_libs=yes
-+    hardcode_into_libs=no
++    harcode_into_libs=no
      ;;
    esac
    ;;
-@@ -15404,7 +15404,7 @@
-   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
+@@ -15592,7 +15592,7 @@
    soname_spec='${libname}${release}${shared_ext}$major'
    shlibpath_var=LD_LIBRARY_PATH
+   shlibpath_overrides_runpath=no
 -  hardcode_into_libs=yes
-+  hardcode_into_libs=no
++  harcode_into_libs=no
    ;;
  
  haiku*)
-@@ -15429,7 +15429,7 @@
+@@ -15605,7 +15605,7 @@
+   shlibpath_var=LIBRARY_PATH
+   shlibpath_overrides_runpath=yes
+   sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
+-  hardcode_into_libs=yes
++  harcode_into_libs=no
+   ;;
+ 
+ hpux9* | hpux10* | hpux11*)
+@@ -15617,7 +15617,7 @@
    case $host_cpu in
    ia64*)
      shrext_cmds='.so'
 -    hardcode_into_libs=yes
-+    hardcode_into_libs=no
++    harcode_into_libs=no
      dynamic_linker="$host_os dld.so"
      shlibpath_var=LD_LIBRARY_PATH
      shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
-@@ -15444,7 +15444,7 @@
+@@ -15632,7 +15632,7 @@
      ;;
    hppa*64*)
      shrext_cmds='.sl'
 -    hardcode_into_libs=yes
-+    hardcode_into_libs=no
++    harcode_into_libs=no
      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.
-@@ -15477,7 +15477,7 @@
+@@ -15665,7 +15665,7 @@
    dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)'
    shlibpath_var=LD_LIBRARY_PATH
    shlibpath_overrides_runpath=no
 -  hardcode_into_libs=yes
-+  hardcode_into_libs=no
++  harcode_into_libs=no
    ;;
  
  irix5* | irix6* | nonstopux*)
-@@ -15514,7 +15514,7 @@
+@@ -15702,7 +15702,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}"
 -  hardcode_into_libs=yes
-+  hardcode_into_libs=no
++  harcode_into_libs=no
    ;;
  
  # No shared lib support for Linux oldld, aout, or coff.
-@@ -15570,7 +15570,7 @@
+@@ -15758,7 +15758,7 @@
    # This implies no fast_install, which is unacceptable.
    # Some rework will be needed to allow for fast_install
    # before this can be enabled.
 -  hardcode_into_libs=yes
-+  hardcode_into_libs=no
++  harcode_into_libs=no
  
    # Add ABI-specific directories to the system library path.
    sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib"
-@@ -15606,7 +15606,7 @@
+@@ -15794,7 +15794,7 @@
    fi
    shlibpath_var=LD_LIBRARY_PATH
    shlibpath_overrides_runpath=yes
 -  hardcode_into_libs=yes
-+  hardcode_into_libs=no
++  harcode_into_libs=no
    ;;
  
  newsos6)
-@@ -15624,7 +15624,7 @@
+@@ -15812,7 +15812,7 @@
    soname_spec='${libname}${release}${shared_ext}$major'
    shlibpath_var=LD_LIBRARY_PATH
    shlibpath_overrides_runpath=no
 -  hardcode_into_libs=yes
-+  hardcode_into_libs=no
++  harcode_into_libs=no
    dynamic_linker='ldqnx.so'
    ;;
  
-@@ -15686,7 +15686,7 @@
+@@ -15874,7 +15874,7 @@
    soname_spec='${libname}${release}${shared_ext}$major'
    shlibpath_var=LD_LIBRARY_PATH
    shlibpath_overrides_runpath=yes
 -  hardcode_into_libs=yes
-+  hardcode_into_libs=no
++  harcode_into_libs=no
    # ldd complains unless libraries are executable
    postinstall_cmds='chmod +x $lib'
    ;;
-@@ -15743,7 +15743,7 @@
+@@ -15931,7 +15931,7 @@
    soname_spec='${libname}${release}${shared_ext}$major'
    shlibpath_var=LD_LIBRARY_PATH
    shlibpath_overrides_runpath=yes
 -  hardcode_into_libs=yes
-+  hardcode_into_libs=no
++  harcode_into_libs=no
    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
-@@ -15765,7 +15765,7 @@
+@@ -15953,7 +15953,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
 -  hardcode_into_libs=yes
-+  hardcode_into_libs=no
++  harcode_into_libs=no
    ;;
  
  uts4*)




More information about the debian-med-commit mailing list