From 5cf4228733514c9cc2cee4b8be97e5b3709de7ca Mon Sep 17 00:00:00 2001 From: Tzafrir Cohen Date: Wed, 19 Aug 2020 23:58:33 +0300 Subject: [PATCH] Don't include non-installed files (fix_install_paths.patch) * Include bash-completion file: * Add fix_install_paths.patch to install it to the correct location. * Add dracut file to the package. * Remove (unpackaged) example configuration files in /etc/dahdi. * Remove (unpackaged and duplicate) /etc/ udev rules. * Remove an unused .la file. --- debian/dahdi.install | 2 ++ debian/patches/fix_install_paths.patch | 16 ++++++++++++++++ debian/patches/series | 1 + debian/rules | 3 +++ 4 files changed, 22 insertions(+) create mode 100644 debian/patches/fix_install_paths.patch diff --git a/debian/dahdi.install b/debian/dahdi.install index 82830af..7cfdfcc 100644 --- a/debian/dahdi.install +++ b/debian/dahdi.install @@ -2,3 +2,5 @@ usr/sbin/* usr/share/perl5/Dahdi* usr/share/dahdi/* usr/share/man/man8/* +usr/lib/dracut/dracut.conf.d/50-dahdi.conf +usr/share/bash-completion/completions/dahdi diff --git a/debian/patches/fix_install_paths.patch b/debian/patches/fix_install_paths.patch new file mode 100644 index 0000000..adcac6f --- /dev/null +++ b/debian/patches/fix_install_paths.patch @@ -0,0 +1,16 @@ +From: Tzafrir Cohen +Subject: Change defaults for some install paths + +Index: dahdi-tools/Makefile.am +=================================================================== +--- dahdi-tools.orig/Makefile.am 2020-08-19 23:41:45.003051626 +0300 ++++ dahdi-tools/Makefile.am 2020-08-19 23:41:44.999051671 +0300 +@@ -111,7 +111,7 @@ + @echo "Compatibility symlinks (should be removed in the future)" + ln -sf libtonezone.so.2.0.0 $(DESTDIR)$(libdir)/libtonezone.so.2.0 + +-bashcompdir = $(sysconfdir)/bash_completion.d ++bashcompdir = $(datadir)/bash-completion/completions + + install-data-hook: + mkdir -p $(DESTDIR)$(bashcompdir) diff --git a/debian/patches/series b/debian/patches/series index aa858b9..62c887f 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -5,3 +5,4 @@ soname.patch dahdi_spantypes.patch typos.patch dahdi-tools-3.1.0-fno-common.patch +fix_install_paths.patch diff --git a/debian/rules b/debian/rules index 47621b5..e4cedf1 100755 --- a/debian/rules +++ b/debian/rules @@ -53,3 +53,6 @@ override_dh_auto_install: # also run the 'config' target, in addition to the 'install' target: dh_auto_install -- config rm $(CURDIR)/debian/tmp/usr/share/dahdi/span_config.d/50-asterisk + rm $(CURDIR)/debian/tmp/usr/lib/*/libtonezone.la + rm -rf $(CURDIR)/debian/tmp/etc/dahdi + rm -rf $(CURDIR)/debian/tmp/etc/udev/rules.d