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

Jan Beyer beathovn-guest at alioth.debian.org
Thu Dec 9 21:04:44 UTC 2010 

Author: beathovn-guest
Date: 2010-12-09 21:04:43 +0000 (Thu, 09 Dec 2010)
New Revision: 5569

Modified:
   trunk/packages/gwyddion/trunk/debian/changelog
   trunk/packages/gwyddion/trunk/debian/copyright
   trunk/packages/gwyddion/trunk/debian/patches/fix-manpage-section-for-debian.diff
   trunk/packages/gwyddion/trunk/debian/patches/fix-rpath-issue.patch
Log:
New upstream version - no special changes done.

Modified: trunk/packages/gwyddion/trunk/debian/changelog
===================================================================
--- trunk/packages/gwyddion/trunk/debian/changelog	2010-12-09 20:48:41 UTC (rev 5568)
+++ trunk/packages/gwyddion/trunk/debian/changelog	2010-12-09 21:04:43 UTC (rev 5569)
@@ -1,3 +1,9 @@
+gwyddion (2.22-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Jan Beyer <jan at beathovn.de>  Thu, 09 Dec 2010 21:07:50 +0100
+
 gwyddion (2.21-1) unstable; urgency=low
 
   * New upstream release

Modified: trunk/packages/gwyddion/trunk/debian/copyright
===================================================================
--- trunk/packages/gwyddion/trunk/debian/copyright	2010-12-09 20:48:41 UTC (rev 5568)
+++ trunk/packages/gwyddion/trunk/debian/copyright	2010-12-09 21:04:43 UTC (rev 5569)
@@ -59,7 +59,7 @@
 Copyright: Copyright 2007 Petr Klapetek <klapetek at gwyddion.net>
 License: GPL-2+
 
-Files: app/remote-unique.c, app/validate.[c,h], libgwyddion/gwymathfallback.h, libgwydgets/gwygrainvaluemenu.[c,h], libprocess/gwygrainvalue.[c,h], libprocess/triangulation.[c,h], modules/file/aistfile.c, modules/file/attocube.c, modules/file/burleigh_exp.c, modules/file/gdeffile.c, modules/file/gwytiff.h, modules/file/mapvue.c, modules/file/nanoscan.c, modules/file/pltfile.c, modules/file/pt3file.c, modules/file/rawxyz.c, modules/file/sensolytics.c, modules/file/shimadzu.c, modules/file/spip-asc.c, modules/process/acf2d.c, modules/process/fft_synth.c, modules/process/grain_cross.c, modules/process/mark_with.c, modules/tools/grainmeasure.c, modules/file/gsffile.c, modules/tools/pathlevel.c, modules/file/igorfile.c, modules/file/nanoeducator.c, modules/file/nanonics.c, modules/file/opdfile.c, modules/file/rawgraph.c, modules/file/rhk-sm4.c, modules/spmlabf.c, modules/process/curvature.c, modules/process/dimensions.h, modules/process/obj_synth.c, modules/process/tilt.c, modules/process/threshold.c, modules/process/fft_profile.c, modules/tools/selectionmanager.c
+Files: app/remote-unique.c, app/validate.[c,h], libgwyddion/gwymathfallback.h, libgwydgets/gwygrainvaluemenu.[c,h], libprocess/gwygrainvalue.[c,h], libprocess/triangulation.[c,h], modules/file/aistfile.c, modules/file/anfatec.c, modules/file/attocube.c, modules/file/burleigh_exp.c, modules/file/gdeffile.c, modules/file/gwytiff.h, modules/file/mapvue.c, modules/file/miffile.c, modules/file/nanoscan.c, modules/file/pltfile.c, modules/file/pt3file.c, modules/file/rawxyz.c, modules/file/sensolytics.c, modules/file/shimadzu.c, modules/file/spip-asc.c, modules/process/acf2d.c, modules/process/fft_synth.c, modules/process/grain_cross.c, modules/process/mark_with.c, modules/tools/grainmeasure.c, modules/file/gsffile.c, modules/tools/pathlevel.c, modules/file/igorfile.c, modules/file/nanoeducator.c, modules/file/nanonics.c, modules/file/opdfile.c, modules/file/rawgraph.c, modules/file/rhk-sm4.c, modules/spmlabf.c, modules/process/curvature.c, modules/process/deposit_synth.c, modules/process/dimensions.h, modules/process/lno_synth.c, modules/process/noise_synth.c, modules/process/obj_synth.c, modules/process/pat_synth.c, modules/process/synth.h, modules/process/tilt.c, modules/process/threshold.c, modules/process/fft_profile.c, modules/tools/selectionmanager.c
 Copyright: Copyright 2007-2010 David Necas (Yeti) <yeti at gwyddion.net>
 License: GPL-2+
 
@@ -234,7 +234,7 @@
 Copyright: Copyright 2009 Francois Bianco (fbianco) <francois.bianco at unige.ch>
 License: GPL-2+
 
-Files: modules/graph/graph_dos_spectrum.c, modules/process/mcrop.c
+Files: modules/file/wipfile.c, modules/graph/graph_dos_spectrum.c, modules/process/mcrop.c
 Copyright: Copyright 2010 David Necas (Yeti) <yeti at gwyddion.net>
 Copyright: Copyright 2010 Petr Klapetek <klapetek at gwyddion.net>
 Copyright: Copyright 2010 Daniil Bratashov <dn2010 at gmail.com>

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	2010-12-09 20:48:41 UTC (rev 5568)
+++ trunk/packages/gwyddion/trunk/debian/patches/fix-manpage-section-for-debian.diff	2010-12-09 21:04:43 UTC (rev 5569)
@@ -8,9 +8,9 @@
 Forwarded: not-needed
 Author: Jan Beyer <jan at beathovn.de>
 
---- gwyddion-2.18.orig/perl/Makefile.in
-+++ gwyddion-2.18/perl/Makefile.in
-@@ -302,7 +302,7 @@
+--- gwyddion-2.22.orig/perl/Makefile.in
++++ gwyddion-2.22/perl/Makefile.in
+@@ -301,7 +301,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.18.orig/perl/Makefile.am
-+++ gwyddion-2.18/perl/Makefile.am
+--- gwyddion-2.22.orig/perl/Makefile.am
++++ gwyddion-2.22/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	2010-12-09 20:48:41 UTC (rev 5568)
+++ trunk/packages/gwyddion/trunk/debian/patches/fix-rpath-issue.patch	2010-12-09 21:04:43 UTC (rev 5569)
@@ -2,9 +2,9 @@
 Forwarded: no
 Author: Jan Beyer <jan at beathovn.de>
 
---- gwyddion-2.18.orig/configure
-+++ gwyddion-2.18/configure
-@@ -11494,7 +11494,7 @@
+--- gwyddion-2.22.orig/configure
++++ gwyddion-2.22/configure
+@@ -10640,7 +10640,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}'
-@@ -11689,16 +11689,16 @@
+@@ -10824,16 +10824,16 @@
      ;;
    freebsd3.[01]* | freebsdelf3.[01]*)
      shlibpath_overrides_runpath=yes
@@ -33,7 +33,7 @@
      ;;
    esac
    ;;
-@@ -11710,7 +11710,7 @@
+@@ -10845,7 +10845,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
@@ -41,8 +41,8 @@
 +  hardcode_into_libs=no
    ;;
  
- hpux9* | hpux10* | hpux11*)
-@@ -11722,7 +11722,7 @@
+ haiku*)
+@@ -10870,7 +10870,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.
-@@ -11737,7 +11737,7 @@
+@@ -10885,7 +10885,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.
-@@ -11768,7 +11768,7 @@
+@@ -10918,7 +10918,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*)
-@@ -11805,7 +11805,7 @@
+@@ -10955,7 +10955,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.
-@@ -11884,7 +11884,7 @@
+@@ -11011,7 +11011,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"
-@@ -11919,7 +11919,7 @@
+@@ -11047,7 +11047,7 @@
    fi
    shlibpath_var=LD_LIBRARY_PATH
    shlibpath_overrides_runpath=yes
@@ -96,7 +96,7 @@
    ;;
  
  newsos6)
-@@ -11937,7 +11937,7 @@
+@@ -11065,7 +11065,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'
    ;;
  
-@@ -11999,7 +11999,7 @@
+@@ -11127,7 +11127,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'
    ;;
-@@ -12056,7 +12056,7 @@
+@@ -11184,7 +11184,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
-@@ -12078,7 +12078,7 @@
+@@ -11206,7 +11206,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*)
-@@ -15360,7 +15360,7 @@
+@@ -14309,7 +14309,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}'
-@@ -15554,16 +15554,16 @@
+@@ -14491,16 +14491,16 @@
      ;;
    freebsd3.[01]* | freebsdelf3.[01]*)
      shlibpath_overrides_runpath=yes
@@ -161,7 +161,7 @@
      ;;
    esac
    ;;
-@@ -15575,7 +15575,7 @@
+@@ -14512,7 +14512,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
@@ -169,8 +169,8 @@
 +  hardcode_into_libs=no
    ;;
  
- hpux9* | hpux10* | hpux11*)
-@@ -15587,7 +15587,7 @@
+ haiku*)
+@@ -14537,7 +14537,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.
-@@ -15602,7 +15602,7 @@
+@@ -14552,7 +14552,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.
-@@ -15633,7 +15633,7 @@
+@@ -14585,7 +14585,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*)
-@@ -15670,7 +15670,7 @@
+@@ -14622,7 +14622,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.
-@@ -15749,7 +15749,7 @@
+@@ -14678,7 +14678,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"
-@@ -15784,7 +15784,7 @@
+@@ -14714,7 +14714,7 @@
    fi
    shlibpath_var=LD_LIBRARY_PATH
    shlibpath_overrides_runpath=yes
@@ -224,7 +224,7 @@
    ;;
  
  newsos6)
-@@ -15802,7 +15802,7 @@
+@@ -14732,7 +14732,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'
    ;;
  
-@@ -15864,7 +15864,7 @@
+@@ -14794,7 +14794,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'
    ;;
-@@ -15921,7 +15921,7 @@
+@@ -14851,7 +14851,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
-@@ -15943,7 +15943,7 @@
+@@ -14873,7 +14873,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