tags 926182 + patch
thanks
Hi.
/usr/bin/guile uses alternatives system and the real binary is under
/usr/lib, as well as providing /usr/bin/guile-2.2 as a symlink.
My patch gives the same treatment for the binaries in guile-2.2-dev.
diff -Nru guile-2.2-2.2.4+1/debian/changelog guile-2.2-2.2.4+1/debian/changelog
--- guile-2.2-2.2.4+1/debian/changelog 2018-07-28 23:10:51.000000000 +0300
+++ guile-2.2-2.2.4+1/debian/changelog 2019-05-03 21:58:01.000000000 +0300
@@ -1,3 +1,11 @@
+guile-2.2 (2.2.4+1-1.1) unstable; urgency=medium
+
+ * NMU
+ * Use alternatives system for guild, guile-config, guile-snarf and
+ guile-tools and use version suffixed names. (Closes: #926182)
+
+ -- Kari Pahula <k...@debian.org> Fri, 03 May 2019 21:58:01 +0300
+
guile-2.2 (2.2.4+1-1) unstable; urgency=medium
* Upgrade to 2.2.4.
diff -Nru guile-2.2-2.2.4+1/debian/guile-dev.install guile-2.2-2.2.4+1/debian/guile-dev.install
--- guile-2.2-2.2.4+1/debian/guile-dev.install 2018-07-28 23:10:09.000000000 +0300
+++ guile-2.2-2.2.4+1/debian/guile-dev.install 2019-05-03 21:56:57.000000000 +0300
@@ -1,7 +1,7 @@
-debian/tmp/usr/bin/guild
-debian/tmp/usr/bin/guile-config
-debian/tmp/usr/bin/guile-snarf
-debian/tmp/usr/bin/guile-tools
+debian/tmp/usr/bin/guild /usr/lib/@MARCH@guile-@DEB_SRC_EFF_VER@/bin
+debian/tmp/usr/bin/guile-config /usr/lib/@MARCH@guile-@DEB_SRC_EFF_VER@/bin
+debian/tmp/usr/bin/guile-snarf /usr/lib/@MARCH@guile-@DEB_SRC_EFF_VER@/bin
+debian/tmp/usr/bin/guile-tools /usr/lib/@MARCH@guile-@DEB_SRC_EFF_VER@/bin
debian/tmp/usr/include/*
debian/tmp/usr/lib/*/*.a
debian/tmp/usr/lib/*/libguile-@DEB_SRC_EFF_VER@.so
diff -Nru guile-2.2-2.2.4+1/debian/guile-dev.links guile-2.2-2.2.4+1/debian/guile-dev.links
--- guile-2.2-2.2.4+1/debian/guile-dev.links 1970-01-01 02:00:00.000000000 +0200
+++ guile-2.2-2.2.4+1/debian/guile-dev.links 2019-05-03 21:56:57.000000000 +0300
@@ -0,0 +1,4 @@
+usr/lib/@MARCH@guile-@DEB_SRC_EFF_VER@/bin/guild usr/bin/guild-@DEB_SRC_EFF_VER@
+usr/lib/@MARCH@guile-@DEB_SRC_EFF_VER@/bin/guile-config usr/bin/guile-config-@DEB_SRC_EFF_VER@
+usr/lib/@MARCH@guile-@DEB_SRC_EFF_VER@/bin/guile-snarf usr/bin/guile-snarf-@DEB_SRC_EFF_VER@
+usr/lib/@MARCH@guile-@DEB_SRC_EFF_VER@/bin/guile-tools usr/bin/guile-tools-@DEB_SRC_EFF_VER@
diff -Nru guile-2.2-2.2.4+1/debian/guile-dev.postinst guile-2.2-2.2.4+1/debian/guile-dev.postinst
--- guile-2.2-2.2.4+1/debian/guile-dev.postinst 1970-01-01 02:00:00.000000000 +0200
+++ guile-2.2-2.2.4+1/debian/guile-dev.postinst 2019-05-03 21:56:57.000000000 +0300
@@ -0,0 +1,14 @@
+#!/bin/sh
+
+set -e
+
+for bin in guild guile-config guile-snarf guile-tools; do
+ update-alternatives \
+ --install \
+ /usr/bin/$bin \
+ $bin \
+ /usr/lib/@MARCH@guile-@DEB_SRC_EFF_VER@/bin/$bin \
+ @DEB_ALT_PRIORITY@
+done
+
+#DEBHELPER#
diff -Nru guile-2.2-2.2.4+1/debian/guile-dev.prerm guile-2.2-2.2.4+1/debian/guile-dev.prerm
--- guile-2.2-2.2.4+1/debian/guile-dev.prerm 1970-01-01 02:00:00.000000000 +0200
+++ guile-2.2-2.2.4+1/debian/guile-dev.prerm 2019-05-03 21:56:57.000000000 +0300
@@ -0,0 +1,12 @@
+#! /bin/sh
+
+set -e
+
+if [ "$1" != "upgrade" ] ; then
+ for bin in guild guile-config guile-snarf guile-tools; do
+ update-alternatives --remove $bin \
+ /usr/lib/@MARCH@guile-@DEB_SRC_EFF_VER@/bin/$bin
+ done
+fi
+
+#DEBHELPER#
diff -Nru guile-2.2-2.2.4+1/debian/rules guile-2.2-2.2.4+1/debian/rules
--- guile-2.2-2.2.4+1/debian/rules 2018-07-28 23:10:09.000000000 +0300
+++ guile-2.2-2.2.4+1/debian/rules 2019-05-03 21:56:57.000000000 +0300
@@ -129,6 +129,7 @@
guile-$(deb_src_eff_ver).menu \
guile-$(deb_src_eff_ver).undocumented \
guile-$(deb_src_eff_ver)-dev.install \
+ guile-$(deb_src_eff_ver)-dev.links \
guile-$(deb_src_eff_ver)-doc.README.Debian \
guile-$(deb_src_eff_ver)-doc.install \
guile-$(deb_src_eff_ver)-libs.install \
@@ -137,6 +138,8 @@
autogen_installdeb_files := $(addprefix debian/, \
guile-$(deb_src_eff_ver).postinst \
guile-$(deb_src_eff_ver).prerm \
+ guile-$(deb_src_eff_ver)-dev.postinst \
+ guile-$(deb_src_eff_ver)-dev.prerm \
guile-$(deb_src_eff_ver)-doc.postinst \
guile-$(deb_src_eff_ver)-doc.prerm \
guile-$(deb_src_eff_ver)-libs.postinst \
@@ -233,12 +236,6 @@
-Xusr/lib/$(march)guile/$(deb_src_eff_ver)/extensions/guile-readline.a \
-Xusr/lib/$(march)guile/$(deb_src_eff_ver)/extensions/guile-readline.la
- sed -i'' '0,\|/usr/bin/guile|s||$(deb_guile_bin_path)|' \
- debian/$(deb_pkg_basename)-dev/usr/bin/guile-config
-
- sed -i'' '0,\|\$${exec_prefix}/bin/guile|s||$(deb_guile_bin_path)|' \
- debian/$(deb_pkg_basename)-dev/usr/bin/guild
-
test -e $(gdb_ext)
mkdir -p $(gdb_ext_dir)
mv $(gdb_ext) $(gdb_ext_dir)
