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

Jan Beyer beathovn-guest at moszumanska.debian.org
Thu Jan 21 21:27:40 UTC 2016


Author: beathovn-guest
Date: 2016-01-21 21:27:39 +0000 (Thu, 21 Jan 2016)
New Revision: 21247

Modified:
   trunk/packages/gwyddion/trunk/debian/changelog
   trunk/packages/gwyddion/trunk/debian/copyright
   trunk/packages/gwyddion/trunk/debian/patches/fix-rpath-issue.patch
Log:
Preparations for gwyddion 2.44 - d/changelog and refreshed patches.

Modified: trunk/packages/gwyddion/trunk/debian/changelog
===================================================================
--- trunk/packages/gwyddion/trunk/debian/changelog	2016-01-21 10:30:25 UTC (rev 21246)
+++ trunk/packages/gwyddion/trunk/debian/changelog	2016-01-21 21:27:39 UTC (rev 21247)
@@ -1,3 +1,9 @@
+gwyddion (2.44-1) UNRELEASED; urgency=medium
+
+  * New upstream release
+
+ -- Jan Beyer <jan at beathovn.de>  Thu, 21 Jan 2016 22:01:45 +0100
+
 gwyddion (2.43-2) unstable; urgency=medium
 
   * cme fix dpkg-control

Modified: trunk/packages/gwyddion/trunk/debian/copyright
===================================================================
--- trunk/packages/gwyddion/trunk/debian/copyright	2016-01-21 10:30:25 UTC (rev 21246)
+++ trunk/packages/gwyddion/trunk/debian/copyright	2016-01-21 21:27:39 UTC (rev 21247)
@@ -5,7 +5,7 @@
 Source: http://gwyddion.net/download
 
 Files: *
-Copyright: 2003-2015 David Necas (Yeti) <yeti at gwyddion.net>
+Copyright: 2003-2016 David Necas (Yeti) <yeti at gwyddion.net>
            2003-2014 Petr Klapetek <klapetek at gwyddion.net>
 License: GPL-2+
 
@@ -202,7 +202,8 @@
 Copyright: 2009 Francois Bianco (fbianco) <francois.bianco at unige.ch>
 License: GPL-2+
 
-Files: modules/file/nanoscantech.c modules/file/oldmda.c modules/file/renishaw.c modules/file/tiaser.c
+Files: modules/file/leica.c modules/file/nanoscantech.c modules/file/oldmda.c
+       modules/file/renishaw.c modules/file/tiaser.c
        modules/file/wipfile.c modules/graph/graph_dos_spectrum.c modules/graph/graph_filter.c
        modules/process/averaging.c modules/process/grain_edge.c modules/process/mcrop.c
 Copyright: 2010-2014 David Necas (Yeti) <yeti at gwyddion.net>

Modified: trunk/packages/gwyddion/trunk/debian/patches/fix-rpath-issue.patch
===================================================================
--- trunk/packages/gwyddion/trunk/debian/patches/fix-rpath-issue.patch	2016-01-21 10:30:25 UTC (rev 21246)
+++ trunk/packages/gwyddion/trunk/debian/patches/fix-rpath-issue.patch	2016-01-21 21:27:39 UTC (rev 21247)
@@ -1,280 +1,276 @@
-Description: This patch tries to remove the rpaths from all libraries.
-Forwarded: no
-Author: Jan Beyer <jan at beathovn.de>
-
 --- a/configure
 +++ b/configure
-@@ -11556,7 +11556,7 @@
+@@ -12073,7 +12073,7 @@
    version_type=linux # correct to gnu/linux during the next big refactor
    need_lib_prefix=no
    need_version=no
 -  hardcode_into_libs=yes
-+  harcode_into_libs=no
-   if test "$host_cpu" = ia64; then
++  hardcode_into_libs=no
+   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}'
-@@ -11795,16 +11795,16 @@
+     library_names_spec='$libname$release$shared_ext$major $libname$release$shared_ext$versuffix $libname$shared_ext'
+@@ -12363,16 +12363,16 @@
      ;;
    freebsd3.[01]* | freebsdelf3.[01]*)
      shlibpath_overrides_runpath=yes
 -    hardcode_into_libs=yes
-+    harcode_into_libs=no
++    hardcode_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
-+    harcode_into_libs=no
++    hardcode_into_libs=no
      ;;
    *) # from 4.6 on, and DragonFly
      shlibpath_overrides_runpath=yes
 -    hardcode_into_libs=yes
-+    harcode_into_libs=no
++    hardcode_into_libs=no
      ;;
    esac
    ;;
-@@ -11817,7 +11817,7 @@
-   soname_spec='${libname}${release}${shared_ext}$major'
-   shlibpath_var=LD_LIBRARY_PATH
-   shlibpath_overrides_runpath=no
--  hardcode_into_libs=yes
-+  harcode_into_libs=no
-   ;;
- 
- haiku*)
-@@ -11830,7 +11830,7 @@
+@@ -12387,7 +12387,7 @@
    shlibpath_var=LIBRARY_PATH
-   shlibpath_overrides_runpath=yes
+   shlibpath_overrides_runpath=no
    sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
 -  hardcode_into_libs=yes
-+  harcode_into_libs=no
++  hardcode_into_libs=no
    ;;
  
  hpux9* | hpux10* | hpux11*)
-@@ -11842,7 +11842,7 @@
+@@ -12399,7 +12399,7 @@
    case $host_cpu in
    ia64*)
      shrext_cmds='.so'
 -    hardcode_into_libs=yes
-+    harcode_into_libs=no
++    hardcode_into_libs=no
      dynamic_linker="$host_os dld.so"
      shlibpath_var=LD_LIBRARY_PATH
      shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
-@@ -11857,7 +11857,7 @@
+@@ -12415,7 +12415,7 @@
      ;;
    hppa*64*)
      shrext_cmds='.sl'
 -    hardcode_into_libs=yes
-+    harcode_into_libs=no
++    hardcode_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.
-@@ -11890,7 +11890,7 @@
+@@ -12448,7 +12448,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
-+  harcode_into_libs=no
++  hardcode_into_libs=no
    ;;
  
  irix5* | irix6* | nonstopux*)
-@@ -11927,7 +11927,7 @@
+@@ -12485,7 +12485,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}"
+   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
-+  harcode_into_libs=no
++  hardcode_into_libs=no
    ;;
  
  # No shared lib support for Linux oldld, aout, or coff.
-@@ -11983,7 +11983,7 @@
+@@ -12506,7 +12506,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
-+  harcode_into_libs=no
++  hardcode_into_libs=no
  
+   dynamic_linker='Android linker'
+   # Don't embed -rpath directories since the linker doesn't support them.
+@@ -12561,7 +12561,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
+ 
    # Add ABI-specific directories to the system library path.
    sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib"
-@@ -12019,7 +12019,7 @@
+@@ -12601,7 +12601,7 @@
    fi
    shlibpath_var=LD_LIBRARY_PATH
    shlibpath_overrides_runpath=yes
 -  hardcode_into_libs=yes
-+  harcode_into_libs=no
++  hardcode_into_libs=no
    ;;
  
  newsos6)
-@@ -12037,7 +12037,7 @@
-   soname_spec='${libname}${release}${shared_ext}$major'
+@@ -12619,7 +12619,7 @@
+   soname_spec='$libname$release$shared_ext$major'
    shlibpath_var=LD_LIBRARY_PATH
    shlibpath_overrides_runpath=no
 -  hardcode_into_libs=yes
-+  harcode_into_libs=no
++  hardcode_into_libs=no
    dynamic_linker='ldqnx.so'
    ;;
  
-@@ -12099,7 +12099,7 @@
-   soname_spec='${libname}${release}${shared_ext}$major'
+@@ -12691,7 +12691,7 @@
+   soname_spec='$libname$release$shared_ext$major'
    shlibpath_var=LD_LIBRARY_PATH
    shlibpath_overrides_runpath=yes
 -  hardcode_into_libs=yes
-+  harcode_into_libs=no
++  hardcode_into_libs=no
    # ldd complains unless libraries are executable
    postinstall_cmds='chmod +x $lib'
    ;;
-@@ -12156,7 +12156,7 @@
-   soname_spec='${libname}${release}${shared_ext}$major'
+@@ -12748,7 +12748,7 @@
+   soname_spec='$libname$release$shared_ext$major'
    shlibpath_var=LD_LIBRARY_PATH
    shlibpath_overrides_runpath=yes
 -  hardcode_into_libs=yes
-+  harcode_into_libs=no
-   if test "$with_gnu_ld" = yes; then
++  hardcode_into_libs=no
+   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
-@@ -12178,7 +12178,7 @@
-   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+@@ -12770,7 +12770,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
-+  harcode_into_libs=no
++  hardcode_into_libs=no
    ;;
  
  uts4*)
-@@ -15393,7 +15393,7 @@
+@@ -16040,7 +16040,7 @@
    version_type=linux # correct to gnu/linux during the next big refactor
    need_lib_prefix=no
    need_version=no
 -  hardcode_into_libs=yes
-+  harcode_into_libs=no
-   if test "$host_cpu" = ia64; then
++  hardcode_into_libs=no
+   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}'
-@@ -15630,16 +15630,16 @@
+     library_names_spec='$libname$release$shared_ext$major $libname$release$shared_ext$versuffix $libname$shared_ext'
+@@ -16328,16 +16328,16 @@
      ;;
    freebsd3.[01]* | freebsdelf3.[01]*)
      shlibpath_overrides_runpath=yes
 -    hardcode_into_libs=yes
-+    harcode_into_libs=no
++    hardcode_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
-+    harcode_into_libs=no
++    hardcode_into_libs=no
      ;;
    *) # from 4.6 on, and DragonFly
      shlibpath_overrides_runpath=yes
 -    hardcode_into_libs=yes
-+    harcode_into_libs=no
++    hardcode_into_libs=no
      ;;
    esac
    ;;
-@@ -15652,7 +15652,7 @@
-   soname_spec='${libname}${release}${shared_ext}$major'
-   shlibpath_var=LD_LIBRARY_PATH
-   shlibpath_overrides_runpath=no
--  hardcode_into_libs=yes
-+  harcode_into_libs=no
-   ;;
- 
- haiku*)
-@@ -15665,7 +15665,7 @@
+@@ -16352,7 +16352,7 @@
    shlibpath_var=LIBRARY_PATH
-   shlibpath_overrides_runpath=yes
+   shlibpath_overrides_runpath=no
    sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
 -  hardcode_into_libs=yes
-+  harcode_into_libs=no
++  hardcode_into_libs=no
    ;;
  
  hpux9* | hpux10* | hpux11*)
-@@ -15677,7 +15677,7 @@
+@@ -16364,7 +16364,7 @@
    case $host_cpu in
    ia64*)
      shrext_cmds='.so'
 -    hardcode_into_libs=yes
-+    harcode_into_libs=no
++    hardcode_into_libs=no
      dynamic_linker="$host_os dld.so"
      shlibpath_var=LD_LIBRARY_PATH
      shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
-@@ -15692,7 +15692,7 @@
+@@ -16380,7 +16380,7 @@
      ;;
    hppa*64*)
      shrext_cmds='.sl'
 -    hardcode_into_libs=yes
-+    harcode_into_libs=no
++    hardcode_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.
-@@ -15725,7 +15725,7 @@
+@@ -16413,7 +16413,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
-+  harcode_into_libs=no
++  hardcode_into_libs=no
    ;;
  
  irix5* | irix6* | nonstopux*)
-@@ -15762,7 +15762,7 @@
+@@ -16450,7 +16450,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}"
+   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
-+  harcode_into_libs=no
++  hardcode_into_libs=no
    ;;
  
  # No shared lib support for Linux oldld, aout, or coff.
-@@ -15818,7 +15818,7 @@
+@@ -16471,7 +16471,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
-+  harcode_into_libs=no
++  hardcode_into_libs=no
  
+   dynamic_linker='Android linker'
+   # Don't embed -rpath directories since the linker doesn't support them.
+@@ -16526,7 +16526,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
+ 
    # Add ABI-specific directories to the system library path.
    sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib"
-@@ -15854,7 +15854,7 @@
+@@ -16566,7 +16566,7 @@
    fi
    shlibpath_var=LD_LIBRARY_PATH
    shlibpath_overrides_runpath=yes
 -  hardcode_into_libs=yes
-+  harcode_into_libs=no
++  hardcode_into_libs=no
    ;;
  
  newsos6)
-@@ -15872,7 +15872,7 @@
-   soname_spec='${libname}${release}${shared_ext}$major'
+@@ -16584,7 +16584,7 @@
+   soname_spec='$libname$release$shared_ext$major'
    shlibpath_var=LD_LIBRARY_PATH
    shlibpath_overrides_runpath=no
 -  hardcode_into_libs=yes
-+  harcode_into_libs=no
++  hardcode_into_libs=no
    dynamic_linker='ldqnx.so'
    ;;
  
-@@ -15934,7 +15934,7 @@
-   soname_spec='${libname}${release}${shared_ext}$major'
+@@ -16656,7 +16656,7 @@
+   soname_spec='$libname$release$shared_ext$major'
    shlibpath_var=LD_LIBRARY_PATH
    shlibpath_overrides_runpath=yes
 -  hardcode_into_libs=yes
-+  harcode_into_libs=no
++  hardcode_into_libs=no
    # ldd complains unless libraries are executable
    postinstall_cmds='chmod +x $lib'
    ;;
-@@ -15991,7 +15991,7 @@
-   soname_spec='${libname}${release}${shared_ext}$major'
+@@ -16713,7 +16713,7 @@
+   soname_spec='$libname$release$shared_ext$major'
    shlibpath_var=LD_LIBRARY_PATH
    shlibpath_overrides_runpath=yes
 -  hardcode_into_libs=yes
-+  harcode_into_libs=no
-   if test "$with_gnu_ld" = yes; then
++  hardcode_into_libs=no
+   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
-@@ -16013,7 +16013,7 @@
-   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+@@ -16735,7 +16735,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
-+  harcode_into_libs=no
++  hardcode_into_libs=no
    ;;
  
  uts4*)




More information about the debian-med-commit mailing list