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

beathovn-guest at alioth.debian.org beathovn-guest at alioth.debian.org
Tue Jan 6 20:17:52 UTC 2009


Author: beathovn-guest
Date: 2009-01-06 20:17:52 +0000 (Tue, 06 Jan 2009)
New Revision: 2912

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 and improved comments.

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-01-06 20:07:16 UTC (rev 2911)
+++ trunk/packages/gwyddion/trunk/debian/patches/fix-manpage-section-for-debian.diff	2009-01-06 20:17:52 UTC (rev 2912)
@@ -1,12 +1,13 @@
-© 2007 Jan Beyer, Licensed under GPL v2 or higher
-This patch makes sure, that we do not hide any system call's or other more
-important command's manpages by changing our section to 3pm.
+Author: Jan Beyer <jan at beathovn.de>
+Copyright: Copyright 2007 Jan Beyer
+License: The same as the Gwyddion packaging
+Description: This patch makes sure, that we do not hide any system call's or
+ other more important command's manpages by changing our section to 3pm. This
+ is required by Debian policy for user generated perl modules.
 
-Index: gwyddion-2.9/perl/Makefile.in
-===================================================================
---- gwyddion-2.9.orig/perl/Makefile.in	2007-10-30 22:23:18.000000000 +0100
-+++ gwyddion-2.9/perl/Makefile.in	2007-10-30 22:23:52.000000000 +0100
-@@ -248,7 +248,7 @@
+--- gwyddion-2.12.orig/perl/Makefile.in
++++ gwyddion-2.12/perl/Makefile.in
+@@ -264,7 +264,7 @@
  EXTRA_DIST = $(Gwyddion_PERL)
  perllibdir = $(pkglibdir)/perl/Gwyddion
  @HAVE_PERL_TRUE at man3dir = $(mandir)/man3
@@ -15,11 +16,8 @@
  @HAVE_PERL_TRUE at perllib_DATA = $(Gwyddion_PERL)
  @HAVE_PERL_TRUE at man3_pages = \
  @HAVE_PERL_TRUE@	Gwyddion::dump.3pm
-
-Index: gwyddion-2.9/perl/Makefile.am
-===================================================================
---- gwyddion-2.9.orig/perl/Makefile.am	2007-10-30 22:14:03.000000000 +0100
-+++ gwyddion-2.9/perl/Makefile.am	2007-10-30 22:14:23.000000000 +0100
+--- gwyddion-2.12.orig/perl/Makefile.am
++++ gwyddion-2.12/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-01-06 20:07:16 UTC (rev 2911)
+++ trunk/packages/gwyddion/trunk/debian/patches/fix-rpath-issue.patch	2009-01-06 20:17:52 UTC (rev 2912)
@@ -1,9 +1,11 @@
-Copyright 2008 Jan Beyer, Licensed under GPL v2 or higher
-This patch tries to remove the rpaths from all executables.
+Author: Jan Beyer <jan at beathovn.de>
+Copyright: Copyright 2008 Jan Beyer
+License: The same as the Gwyddion packaging
+Description: This patch tries to remove the rpaths from all libraries.
 
---- gwyddion-2.11.orig/configure
-+++ gwyddion-2.11/configure
-@@ -8216,7 +8216,7 @@
+--- gwyddion-2.12.orig/configure
++++ gwyddion-2.12/configure
+@@ -9186,7 +9186,7 @@
    version_type=linux
    need_lib_prefix=no
    need_version=no
@@ -12,7 +14,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}'
-@@ -8399,16 +8399,16 @@
+@@ -9369,16 +9369,16 @@
      ;;
    freebsd3.[01]* | freebsdelf3.[01]*)
      shlibpath_overrides_runpath=yes
@@ -32,7 +34,7 @@
      ;;
    esac
    ;;
-@@ -8420,7 +8420,7 @@
+@@ -9390,7 +9390,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,7 +43,7 @@
    ;;
  
  hpux9* | hpux10* | hpux11*)
-@@ -8432,7 +8432,7 @@
+@@ -9402,7 +9402,7 @@
    case $host_cpu in
    ia64*)
      shrext_cmds='.so'
@@ -50,7 +52,7 @@
      dynamic_linker="$host_os dld.so"
      shlibpath_var=LD_LIBRARY_PATH
      shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
-@@ -8447,7 +8447,7 @@
+@@ -9417,7 +9417,7 @@
      ;;
     hppa*64*)
       shrext_cmds='.sl'
@@ -59,7 +61,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.
-@@ -8478,7 +8478,7 @@
+@@ -9448,7 +9448,7 @@
    dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)'
    shlibpath_var=LD_LIBRARY_PATH
    shlibpath_overrides_runpath=no
@@ -68,7 +70,7 @@
    ;;
  
  irix5* | irix6* | nonstopux*)
-@@ -8515,7 +8515,7 @@
+@@ -9485,7 +9485,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}"
@@ -77,7 +79,7 @@
    ;;
  
  # No shared lib support for Linux oldld, aout, or coff.
-@@ -8536,7 +8536,7 @@
+@@ -9506,7 +9506,7 @@
    # This implies no fast_install, which is unacceptable.
    # Some rework will be needed to allow for fast_install
    # before this can be enabled.
@@ -86,7 +88,7 @@
    sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
    sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
  
-@@ -8570,7 +8570,7 @@
+@@ -9540,7 +9540,7 @@
    fi
    shlibpath_var=LD_LIBRARY_PATH
    shlibpath_overrides_runpath=yes
@@ -95,7 +97,7 @@
    ;;
  
  newsos6)
-@@ -8648,7 +8648,7 @@
+@@ -9618,7 +9618,7 @@
    soname_spec='${libname}${release}${shared_ext}$major'
    shlibpath_var=LD_LIBRARY_PATH
    shlibpath_overrides_runpath=yes
@@ -104,7 +106,7 @@
    # ldd complains unless libraries are executable
    postinstall_cmds='chmod +x $lib'
    ;;
-@@ -8705,7 +8705,7 @@
+@@ -9675,7 +9675,7 @@
    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
    soname_spec='${libname}${release}${shared_ext}$major'
    shlibpath_var=LD_LIBRARY_PATH
@@ -113,7 +115,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'
      shlibpath_overrides_runpath=no
-@@ -11805,7 +11805,7 @@
+@@ -13155,7 +13155,7 @@
    version_type=linux
    need_lib_prefix=no
    need_version=no
@@ -122,7 +124,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}'
-@@ -11987,16 +11987,16 @@
+@@ -13337,16 +13337,16 @@
      ;;
    freebsd3.[01]* | freebsdelf3.[01]*)
      shlibpath_overrides_runpath=yes
@@ -142,7 +144,7 @@
      ;;
    esac
    ;;
-@@ -12008,7 +12008,7 @@
+@@ -13358,7 +13358,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
@@ -151,7 +153,7 @@
    ;;
  
  hpux9* | hpux10* | hpux11*)
-@@ -12020,7 +12020,7 @@
+@@ -13370,7 +13370,7 @@
    case $host_cpu in
    ia64*)
      shrext_cmds='.so'
@@ -160,7 +162,7 @@
      dynamic_linker="$host_os dld.so"
      shlibpath_var=LD_LIBRARY_PATH
      shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
-@@ -12035,7 +12035,7 @@
+@@ -13385,7 +13385,7 @@
      ;;
     hppa*64*)
       shrext_cmds='.sl'
@@ -169,7 +171,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.
-@@ -12066,7 +12066,7 @@
+@@ -13416,7 +13416,7 @@
    dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)'
    shlibpath_var=LD_LIBRARY_PATH
    shlibpath_overrides_runpath=no
@@ -178,7 +180,7 @@
    ;;
  
  irix5* | irix6* | nonstopux*)
-@@ -12103,7 +12103,7 @@
+@@ -13453,7 +13453,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}"
@@ -187,7 +189,7 @@
    ;;
  
  # No shared lib support for Linux oldld, aout, or coff.
-@@ -12124,7 +12124,7 @@
+@@ -13474,7 +13474,7 @@
    # This implies no fast_install, which is unacceptable.
    # Some rework will be needed to allow for fast_install
    # before this can be enabled.
@@ -196,7 +198,7 @@
    sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
    sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
  
-@@ -12158,7 +12158,7 @@
+@@ -13508,7 +13508,7 @@
    fi
    shlibpath_var=LD_LIBRARY_PATH
    shlibpath_overrides_runpath=yes
@@ -205,7 +207,7 @@
    ;;
  
  newsos6)
-@@ -12236,7 +12236,7 @@
+@@ -13586,7 +13586,7 @@
    soname_spec='${libname}${release}${shared_ext}$major'
    shlibpath_var=LD_LIBRARY_PATH
    shlibpath_overrides_runpath=yes
@@ -214,7 +216,7 @@
    # ldd complains unless libraries are executable
    postinstall_cmds='chmod +x $lib'
    ;;
-@@ -12293,7 +12293,7 @@
+@@ -13643,7 +13643,7 @@
    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
    soname_spec='${libname}${release}${shared_ext}$major'
    shlibpath_var=LD_LIBRARY_PATH




More information about the debian-med-commit mailing list