[med-svn] r895 - in trunk/packages/gwyddion/trunk/debian: . patches
beathovn-guest at alioth.debian.org
beathovn-guest at alioth.debian.org
Tue Dec 11 21:44:51 UTC 2007
Author: beathovn-guest
Date: 2007-12-11 21:44:51 +0000 (Tue, 11 Dec 2007)
New Revision: 895
Added:
trunk/packages/gwyddion/trunk/debian/patches/fix-rpath-issue.diff
Modified:
trunk/packages/gwyddion/trunk/debian/README.Debian
trunk/packages/gwyddion/trunk/debian/changelog
trunk/packages/gwyddion/trunk/debian/control
trunk/packages/gwyddion/trunk/debian/gwyddion.install
trunk/packages/gwyddion/trunk/debian/patches/series
trunk/packages/gwyddion/trunk/debian/rules
Log:
A big chunk of changes - I know, that's not the way it should be. But I
added a patch to fix most rpath-problems - no idea, why not all. Updated
to policy 3.7.3. Added Build-Depends: python, ruby so that plugins will
work.
Modified: trunk/packages/gwyddion/trunk/debian/README.Debian
===================================================================
--- trunk/packages/gwyddion/trunk/debian/README.Debian 2007-12-10 20:15:19 UTC (rev 894)
+++ trunk/packages/gwyddion/trunk/debian/README.Debian 2007-12-11 21:44:51 UTC (rev 895)
@@ -1,6 +1,13 @@
Gwyddion for Debian
-------------------
+Upstream's configure script adds rpaths to all libraries and /usr/bin/gwyddion.
+The fix-rpath-issue.diff replaces all occurences of hardcode_into_libs=... into
+hardcode_into_libs=no in the configure script. This gets rid off the rpaths in
+the libraries. For /usr/bin/gwyddion, chrpath is still necessary.
+
+ -- Jan Beyer <jan at beathovn.de> Thu, 11 Dec 2007 22:10:03 +0100
+
Following an advice from tiCo (Mario Iselis) on #debian-mentors, I wrote the
debian/copyright file in such a way, that all unique combinations of copyright
holders and licenses got one machine-interpretable entry, regardless of the
@@ -13,11 +20,6 @@
The -dev package is architecture-dependent because of the files
gwyddion.pc and gwyconfig.h which happen to be architecture dependent.
-The funny construction with the --disable-rpath configure-option and
-additionally having chrpath is caused by some strange libtool issue on amd64,
-where rpaths still get set. chrpath will be removed, once I get libtool
-to not set rpaths for real.
-
Patching the Makefiles for the Gwyddion::Dump.3pm manpage was necessary, to
comply to Debian policy, suggesting section 3pm for user generated perl modules.
Modified: trunk/packages/gwyddion/trunk/debian/changelog
===================================================================
--- trunk/packages/gwyddion/trunk/debian/changelog 2007-12-10 20:15:19 UTC (rev 894)
+++ trunk/packages/gwyddion/trunk/debian/changelog 2007-12-11 21:44:51 UTC (rev 895)
@@ -1,3 +1,16 @@
+gwyddion (2.9-3) unstable; urgency=low
+
+ * Changed to new policy 3.7.3.
+ * Ftpmaster's lintian's complaint about rpath in spml.so not fixed,
+ because file doesn't exist.
+ * Adding fix-rpath-issue.diff patch, changing all occurences of
+ hardcode_into_libs={yes,$hardcode_into_libs} in configure into
+ hardcode_into_libs=no, which eliminates almost all rpaths. gwyddion
+ itself still needs chrpath (for whatever reason).
+ * Adding python and ruby to Build-Depends, so that plugins will work.
+
+ -- Jan Beyer <jan at beathovn.de> Tue, 11 Dec 2007 21:25:00 +0100
+
gwyddion (2.9-2) unstable; urgency=low
* Fixed debian/copyright.
Modified: trunk/packages/gwyddion/trunk/debian/control
===================================================================
--- trunk/packages/gwyddion/trunk/debian/control 2007-12-10 20:15:19 UTC (rev 894)
+++ trunk/packages/gwyddion/trunk/debian/control 2007-12-11 21:44:51 UTC (rev 895)
@@ -2,8 +2,8 @@
Section: science
Priority: optional
Maintainer: Jan Beyer <jan at beathovn.de>
-Build-Depends: cdbs, debhelper (>= 5), autotools-dev, pkg-config (>= 0.16), libgtk2.0-dev (>= 2.8), libgtkglext1-dev, libtiff4-dev, libfftw3-dev, libxmu6, chrpath, quilt
-Standards-Version: 3.7.2
+Build-Depends: cdbs, debhelper (>= 5), autotools-dev, pkg-config (>= 0.16), libgtk2.0-dev (>= 2.8), libgtkglext1-dev, libtiff4-dev, libfftw3-dev, libxmu6, python, ruby, chrpath, quilt
+Standards-Version: 3.7.3
Vcs-Browser: http://svn.debian.org/wsvn/debian-med/trunk/packages/gwyddion/trunk/
Vcs-Svn: svn://svn.debian.org/svn/debian-med/trunk/packages/gwyddion
Homepage: http://gwyddion.net/
Modified: trunk/packages/gwyddion/trunk/debian/gwyddion.install
===================================================================
--- trunk/packages/gwyddion/trunk/debian/gwyddion.install 2007-12-10 20:15:19 UTC (rev 894)
+++ trunk/packages/gwyddion/trunk/debian/gwyddion.install 2007-12-11 21:44:51 UTC (rev 895)
@@ -1,9 +1,9 @@
usr/bin/
usr/lib/gwyddion/modules/
usr/share/man/man1/
-usr/lib/gwyddion/perl
-usr/lib/gwyddion/python
-usr/lib/gwyddion/ruby
+usr/lib/gwyddion/perl/
+usr/lib/gwyddion/python/
+usr/lib/gwyddion/ruby/
usr/share/man/man3/
usr/share/applications/
../gwyddion.xpm usr/share/pixmaps
Added: trunk/packages/gwyddion/trunk/debian/patches/fix-rpath-issue.diff
===================================================================
--- trunk/packages/gwyddion/trunk/debian/patches/fix-rpath-issue.diff (rev 0)
+++ trunk/packages/gwyddion/trunk/debian/patches/fix-rpath-issue.diff 2007-12-11 21:44:51 UTC (rev 895)
@@ -0,0 +1,287 @@
+Index: gwyddion-2.9/configure
+===================================================================
+--- gwyddion-2.9.orig/configure 2007-12-07 22:19:28.000000000 +0100
++++ gwyddion-2.9/configure 2007-12-07 22:26:30.000000000 +0100
+@@ -8098,7 +8098,7 @@
+ version_type=linux
+ need_lib_prefix=no
+ need_version=no
+- hardcode_into_libs=yes
++ hardcode_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}'
+@@ -8263,7 +8263,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
+ dynamic_linker='GNU ld.so'
+ ;;
+
+@@ -8297,16 +8297,16 @@
+ ;;
+ freebsd3.[01]* | freebsdelf3.[01]*)
+ shlibpath_overrides_runpath=yes
+- hardcode_into_libs=yes
++ 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
++ hardcode_into_libs=no
+ ;;
+ freebsd*) # from 4.6 on
+ shlibpath_overrides_runpath=yes
+- hardcode_into_libs=yes
++ hardcode_into_libs=no
+ ;;
+ esac
+ ;;
+@@ -8318,7 +8318,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
+- hardcode_into_libs=yes
++ hardcode_into_libs=no
+ ;;
+
+ hpux9* | hpux10* | hpux11*)
+@@ -8330,7 +8330,7 @@
+ case $host_cpu in
+ ia64*)
+ shrext_cmds='.so'
+- hardcode_into_libs=yes
++ hardcode_into_libs=no
+ dynamic_linker="$host_os dld.so"
+ shlibpath_var=LD_LIBRARY_PATH
+ shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
+@@ -8345,7 +8345,7 @@
+ ;;
+ hppa*64*)
+ shrext_cmds='.sl'
+- hardcode_into_libs=yes
++ 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.
+@@ -8376,7 +8376,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
+ ;;
+
+ irix5* | irix6* | nonstopux*)
+@@ -8413,7 +8413,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
+ ;;
+
+ # No shared lib support for Linux oldld, aout, or coff.
+@@ -8434,7 +8434,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
+
+ # find out which ABI we are using
+ libsuff=
+@@ -8480,7 +8480,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
+ dynamic_linker='GNU ld.so'
+ ;;
+
+@@ -8499,7 +8499,7 @@
+ fi
+ shlibpath_var=LD_LIBRARY_PATH
+ shlibpath_overrides_runpath=yes
+- hardcode_into_libs=yes
++ hardcode_into_libs=no
+ ;;
+
+ newsos6)
+@@ -8573,7 +8573,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
+ # ldd complains unless libraries are executable
+ postinstall_cmds='chmod +x $lib'
+ ;;
+@@ -8630,7 +8630,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
+- hardcode_into_libs=yes
++ hardcode_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'
+ shlibpath_overrides_runpath=no
+@@ -9926,7 +9926,7 @@
+ hardcode_action=$hardcode_action
+
+ # Whether we should hardcode library paths into libraries.
+-hardcode_into_libs=$hardcode_into_libs
++hardcode_into_libs=no
+
+ # Flag to hardcode \$libdir into a binary during linking.
+ # This must work even if \$libdir does not exist.
+@@ -11693,7 +11693,7 @@
+ version_type=linux
+ need_lib_prefix=no
+ need_version=no
+- hardcode_into_libs=yes
++ hardcode_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}'
+@@ -11858,7 +11858,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
+ dynamic_linker='GNU ld.so'
+ ;;
+
+@@ -11892,16 +11892,16 @@
+ ;;
+ freebsd3.[01]* | freebsdelf3.[01]*)
+ shlibpath_overrides_runpath=yes
+- hardcode_into_libs=yes
++ 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
++ hardcode_into_libs=no
+ ;;
+ freebsd*) # from 4.6 on
+ shlibpath_overrides_runpath=yes
+- hardcode_into_libs=yes
++ hardcode_into_libs=no
+ ;;
+ esac
+ ;;
+@@ -11913,7 +11913,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
+- hardcode_into_libs=yes
++ hardcode_into_libs=no
+ ;;
+
+ hpux9* | hpux10* | hpux11*)
+@@ -11925,7 +11925,7 @@
+ case $host_cpu in
+ ia64*)
+ shrext_cmds='.so'
+- hardcode_into_libs=yes
++ hardcode_into_libs=no
+ dynamic_linker="$host_os dld.so"
+ shlibpath_var=LD_LIBRARY_PATH
+ shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
+@@ -11940,7 +11940,7 @@
+ ;;
+ hppa*64*)
+ shrext_cmds='.sl'
+- hardcode_into_libs=yes
++ 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.
+@@ -11971,7 +11971,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
+ ;;
+
+ irix5* | irix6* | nonstopux*)
+@@ -12008,7 +12008,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
+ ;;
+
+ # No shared lib support for Linux oldld, aout, or coff.
+@@ -12029,7 +12029,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
+
+ # find out which ABI we are using
+ libsuff=
+@@ -12075,7 +12075,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
+ dynamic_linker='GNU ld.so'
+ ;;
+
+@@ -12094,7 +12094,7 @@
+ fi
+ shlibpath_var=LD_LIBRARY_PATH
+ shlibpath_overrides_runpath=yes
+- hardcode_into_libs=yes
++ hardcode_into_libs=no
+ ;;
+
+ newsos6)
+@@ -12168,7 +12168,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
+ # ldd complains unless libraries are executable
+ postinstall_cmds='chmod +x $lib'
+ ;;
+@@ -12225,7 +12225,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
+- hardcode_into_libs=yes
++ hardcode_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'
+ shlibpath_overrides_runpath=no
+@@ -12630,7 +12630,7 @@
+ hardcode_action=$hardcode_action_GCJ
+
+ # Whether we should hardcode library paths into libraries.
+-hardcode_into_libs=$hardcode_into_libs
++hardcode_into_libs=no
+
+ # Flag to hardcode \$libdir into a binary during linking.
+ # This must work even if \$libdir does not exist.
+@@ -13110,7 +13110,7 @@
+ hardcode_action=$hardcode_action_RC
+
+ # Whether we should hardcode library paths into libraries.
+-hardcode_into_libs=$hardcode_into_libs
++hardcode_into_libs=no
+
+ # Flag to hardcode \$libdir into a binary during linking.
+ # This must work even if \$libdir does not exist.
Modified: trunk/packages/gwyddion/trunk/debian/patches/series
===================================================================
--- trunk/packages/gwyddion/trunk/debian/patches/series 2007-12-10 20:15:19 UTC (rev 894)
+++ trunk/packages/gwyddion/trunk/debian/patches/series 2007-12-11 21:44:51 UTC (rev 895)
@@ -1,2 +1,3 @@
fix-manpage-section-for-debian.diff
fix-manpage-minus-signs.diff
+fix-rpath-issue.diff
Modified: trunk/packages/gwyddion/trunk/debian/rules
===================================================================
--- trunk/packages/gwyddion/trunk/debian/rules 2007-12-10 20:15:19 UTC (rev 894)
+++ trunk/packages/gwyddion/trunk/debian/rules 2007-12-11 21:44:51 UTC (rev 895)
@@ -17,6 +17,3 @@
install/gwyddion::
chrpath -d debian/tmp/usr/bin/gwyddion
-
-install/libgwyddion2-0::
- chrpath -d debian/tmp/usr/lib/libgwy*.so.0
More information about the debian-med-commit
mailing list