[med-svn] [libncl] 02/03: Cleanup packaging
Andreas Tille
tille at debian.org
Mon Jan 4 18:36:53 UTC 2016
This is an automated email from the git hooks/post-receive script.
tille pushed a commit to branch master
in repository libncl.
commit 2207cc8df707511fb21a624d9b03546ea1ace22c
Author: Andreas Tille <tille at debian.org>
Date: Mon Jan 4 16:01:57 2016 +0100
Cleanup packaging
---
debian/changelog | 1 +
debian/control | 1 -
debian/patches/do_not_hardcode_libs.patch | 33 -------
.../patches/do_not_hardcode_libs_not_working.patch | 105 ---------------------
debian/patches/series | 2 -
debian/rules | 22 +----
6 files changed, 2 insertions(+), 162 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 2c002ce..3b7e436 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
libncl (2.1.18+dfsg-1) UNRELEASED; urgency=low
* Initial release (Closes: #<bug>)
+ TODO: d-shlibs issue
-- Andreas Tille <tille at debian.org> Sat, 24 Oct 2015 08:47:31 +0200
diff --git a/debian/control b/debian/control
index 3ff6785..668f4b3 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,6 @@ Section: science
Priority: optional
Build-Depends: debhelper (>= 9),
dh-autoreconf,
- autotools-dev,
d-shlibs,
dh-exec,
python,
diff --git a/debian/patches/do_not_hardcode_libs.patch b/debian/patches/do_not_hardcode_libs.patch
deleted file mode 100644
index 99672ca..0000000
--- a/debian/patches/do_not_hardcode_libs.patch
+++ /dev/null
@@ -1,33 +0,0 @@
---- a/config/ltmain.sh
-+++ b/config/ltmain.sh
-@@ -2652,6 +2652,7 @@ func_mode_finish ()
- libs=
- libdirs=
- admincmds=
-+ hardcode_libdir_flag_spec=" -D__LIBTOOL_IS_A_FOOL__ "
-
- for opt in "$nonopt" ${1+"$@"}
- do
-@@ -5080,6 +5081,9 @@ func_win32_import_lib_p ()
- # func_mode_link arg...
- func_mode_link ()
- {
-+ hardcode_libdir_flag_spec=" -D__LIBTOOL_IS_A_FOOL__ "
-+ hardcode_libdir_flag_spec_ld=" -D__LIBTOOL_IS_A_FOOL__ "
-+
- $opt_debug
- case $host in
- *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*)
---- a/config/libtool.m4
-+++ b/config/libtool.m4
-@@ -4516,8 +4516,8 @@ m4_if([$1], [CXX], [
- _LT_TAGVAR(hardcode_automatic, $1)=no
- _LT_TAGVAR(hardcode_direct, $1)=no
- _LT_TAGVAR(hardcode_direct_absolute, $1)=no
-- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
-- _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
-+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=no
-+ _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=no
- _LT_TAGVAR(hardcode_libdir_separator, $1)=
- _LT_TAGVAR(hardcode_minus_L, $1)=no
- _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
diff --git a/debian/patches/do_not_hardcode_libs_not_working.patch b/debian/patches/do_not_hardcode_libs_not_working.patch
deleted file mode 100644
index 6206285..0000000
--- a/debian/patches/do_not_hardcode_libs_not_working.patch
+++ /dev/null
@@ -1,105 +0,0 @@
---- a/config/libtool.m4
-+++ b/config/libtool.m4
-@@ -1042,7 +1042,7 @@ m4_defun([_LT_DARWIN_LINKER_FEATURES],
- [
- m4_require([_LT_REQUIRED_DARWIN_CHECKS])
- _LT_TAGVAR(archive_cmds_need_lc, $1)=no
-- _LT_TAGVAR(hardcode_direct, $1)=no
-+ _LT_TAGVAR(hardcode_direct, $1)=yes
- _LT_TAGVAR(hardcode_automatic, $1)=yes
- _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
- if test "$lt_cv_ld_force_load" = "yes"; then
-@@ -4514,8 +4514,8 @@ m4_if([$1], [CXX], [
- _LT_TAGVAR(export_dynamic_flag_spec, $1)=
- _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
- _LT_TAGVAR(hardcode_automatic, $1)=no
-- _LT_TAGVAR(hardcode_direct, $1)=no
-- _LT_TAGVAR(hardcode_direct_absolute, $1)=no
-+ _LT_TAGVAR(hardcode_direct, $1)=yes
-+ _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
- _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
- _LT_TAGVAR(hardcode_libdir_separator, $1)=
-@@ -4695,7 +4695,7 @@ _LT_EOF
- ;;
-
- interix[[3-9]]*)
-- _LT_TAGVAR(hardcode_direct, $1)=no
-+ _LT_TAGVAR(hardcode_direct, $1)=yes
- _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-@@ -5215,7 +5215,7 @@ _LT_EOF
-
- case $host_cpu in
- hppa*64*|ia64*)
-- _LT_TAGVAR(hardcode_direct, $1)=no
-+ _LT_TAGVAR(hardcode_direct, $1)=yes
- _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
- ;;
- *)
-@@ -5424,11 +5424,11 @@ _LT_EOF
- ## CC just makes a GrossModule.
- _LT_TAGVAR(archive_cmds, $1)='$LD -G -o $lib $libobjs $deplibs $linker_flags'
- _LT_TAGVAR(reload_cmds, $1)='$CC -r -o $output$reload_objs'
-- _LT_TAGVAR(hardcode_direct, $1)=no
-+ _LT_TAGVAR(hardcode_direct, $1)=yes
- ;;
- motorola)
- _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-- _LT_TAGVAR(hardcode_direct, $1)=no #Motorola manual says yes, but my tests say they lie
-+ _LT_TAGVAR(hardcode_direct, $1)=yes #Motorola manual says yes, but my tests say they lie
- ;;
- esac
- runpath_var='LD_RUN_PATH'
-@@ -5764,8 +5764,8 @@ _LT_TAGVAR(always_export_symbols, $1)=no
- _LT_TAGVAR(archive_expsym_cmds, $1)=
- _LT_TAGVAR(compiler_needs_object, $1)=no
- _LT_TAGVAR(export_dynamic_flag_spec, $1)=
--_LT_TAGVAR(hardcode_direct, $1)=no
--_LT_TAGVAR(hardcode_direct_absolute, $1)=no
-+_LT_TAGVAR(hardcode_direct, $1)=yes
-+_LT_TAGVAR(hardcode_direct_absolute, $1)=yes
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
- _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
- _LT_TAGVAR(hardcode_libdir_separator, $1)=
-@@ -6213,7 +6213,7 @@ if test "$_lt_caught_CXX_error" != yes;
- fi
- case $host_cpu in
- hppa*64*|ia64*)
-- _LT_TAGVAR(hardcode_direct, $1)=no
-+ _LT_TAGVAR(hardcode_direct, $1)=yes
- _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
- ;;
- *)
-@@ -6276,7 +6276,7 @@ if test "$_lt_caught_CXX_error" != yes;
- ;;
-
- interix[[3-9]]*)
-- _LT_TAGVAR(hardcode_direct, $1)=no
-+ _LT_TAGVAR(hardcode_direct, $1)=yes
- _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-@@ -7097,8 +7097,8 @@ _LT_TAGVAR(allow_undefined_flag, $1)=
- _LT_TAGVAR(always_export_symbols, $1)=no
- _LT_TAGVAR(archive_expsym_cmds, $1)=
- _LT_TAGVAR(export_dynamic_flag_spec, $1)=
--_LT_TAGVAR(hardcode_direct, $1)=no
--_LT_TAGVAR(hardcode_direct_absolute, $1)=no
-+_LT_TAGVAR(hardcode_direct, $1)=yes
-+_LT_TAGVAR(hardcode_direct_absolute, $1)=yes
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
- _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
- _LT_TAGVAR(hardcode_libdir_separator, $1)=
-@@ -7230,8 +7230,8 @@ _LT_TAGVAR(allow_undefined_flag, $1)=
- _LT_TAGVAR(always_export_symbols, $1)=no
- _LT_TAGVAR(archive_expsym_cmds, $1)=
- _LT_TAGVAR(export_dynamic_flag_spec, $1)=
--_LT_TAGVAR(hardcode_direct, $1)=no
--_LT_TAGVAR(hardcode_direct_absolute, $1)=no
-+_LT_TAGVAR(hardcode_direct, $1)=yes
-+_LT_TAGVAR(hardcode_direct_absolute, $1)=yes
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
- _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
- _LT_TAGVAR(hardcode_libdir_separator, $1)=
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 961011a..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,2 +0,0 @@
-# do_not_hardcode_libs_not_working.patch
-# do_not_hardcode_libs.patch
diff --git a/debian/rules b/debian/rules
index 0992ebf..5e6727a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,33 +2,13 @@
# DH_VERBOSE := 1
-# some helpful variables - uncomment them if needed
-# shamelessly stolen from http://jmtd.net/log/awk/
-#DEBVERS := $(shell dpkg-parsechangelog | awk '/^Version:/ {print $$2}')
-#VERSION := $(shell echo '$(DEBVERS)' | sed -e 's/^[0-9]*://' -e 's/-.*//')
-#DEBFLAVOR := $(shell dpkg-parsechangelog | awk '/^Distribution:/ {print $$2}')
-#DEBPKGNAME := $(shell dpkg-parsechangelog | awk '/^Source:/ {print $$2}')
-#DEBIAN_BRANCH := $(shell awk 'BEGIN{FS="[= ]+"} /debian-branch/ {print $$2}' debian/gbp.conf)
-#GIT_TAG := $(subst ~,_,$(VERSION))
-
-# alternatively to manually set those variables, you can
-# include /usr/share/dpkg/default.mk
-# and use what is set there.
-
%:
- dh $@ --with autotools_dev,autoreconf
+ dh $@ --with autoreconf
override_dh_clean:
dh_clean
find . -name ".roundTripNCL*" -delete
-do_not_override_dh_auto_configure:
- dh_auto_configure
- # remove rpath specification since I failed to patch the Build-System properly
- sed -i 's/ -rpath $(pkglibdir)//' ncl/Makefile.in
- # Throw error if rpath remains ...
- if grep -- ' -rpath' ncl/Makefile.in ; then exit 1 ; fi
-
override_dh_install:
chrpath --delete debian/tmp/usr/bin/N*
dh_install
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/libncl.git
More information about the debian-med-commit
mailing list