Bug#678437: [PATCH] Fix #678437 and simplify debian/rules
Tags: patch
Dear Maintainer,
I've attached a patch which resolves #678437 while greatly simplifying
the debian/rules file for src:mp3blaster.
Please let me know if there's anything you'd like me to change or
clarify.
--
Plasma
>From 7cced11bf3d4cb23e7556d2792adacc3ae2a9928 Mon Sep 17 00:00:00 2001
From: "David (Plasma) Paul" <davidpaul@librem.one>
Date: Sun, 19 Feb 2023 21:48:17 -0600
Subject: [PATCH] Fix #678437 and simplify debian/rules
---
debian/changelog | 31 +++++++++++++++++++++++++++++++
debian/control | 10 +++++++++-
debian/mp3blaster.dirs | 2 --
debian/mp3blaster.docs | 5 ++++-
debian/mp3blaster.examples | 4 ++--
debian/mp3blaster.install | 4 ++++
debian/mp3blaster.links | 1 +
debian/mp3blaster.manpages | 2 ++
debian/not-installed | 1 +
debian/rules | 23 ++++-------------------
10 files changed, 58 insertions(+), 25 deletions(-)
delete mode 100644 debian/mp3blaster.dirs
create mode 100755 debian/mp3blaster.install
create mode 100644 debian/mp3blaster.links
create mode 100644 debian/not-installed
diff --git a/debian/changelog b/debian/changelog
index 573b9e6..a1b5708 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,34 @@
+mp3blaster (1:3.2.6-2.1) UNRELEASED; urgency=low
+
+ * debian/control: Build-Depend on dh-exec.
+ * debian/mp3blaster.dirs: Delete.
+ * debian/mp3blaster.docs: Remove doc/commands.txt.
+ * debian/mp3blaster.examples:
+ - Copy charmap/ and sample.mp3blasterrc from debian/tmp.
+ * debian/mp3blaster.install:
+ - Use dh-exec to move and rename nmixer/Changelog to
+ changelog.nmixer in the doc/ directory.
+ - Install binaries into /usr/bin.
+ - Install commands.txt into /usr/share/mp3blaster,
+ as per Policy section 12.3.
+ (Closes: #678437) (See also: #158595, #226926)
+ * debian/mp3blaster.links:
+ - Link to /usr/share/mp3blaster/commands.txt from
+ /usr/share/doc/mp3blaster/commands.txt, as per
+ Policy section 12.3.
+ * debian/mp3blaster.manpages: Add mp3blaster.1 and nmixer.1.
+ * debian/not-installed: Mark splay.1 as not installed.
+ * debian/rules:
+ - Greatly simplify makefile.
+ - Remove the confusing hack conflating datadir and docdir
+ in the configure target.
+ - Install files into debian/tmp then copy into place.
+ - Eliminate duplicate installation of charmap/ and
+ sample.mp3blasterrc.
+ - Exclude /usr/bin/splay from installation.
+
+ -- David (Plasma) Paul <davidpaul@librem.one> Sun, 19 Feb 2023 21:41:41 -0600
+
mp3blaster (1:3.2.6-2) unstable; urgency=medium
* QA upload.
diff --git a/debian/control b/debian/control
index 0473baa..8bdd202 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,15 @@ Priority: optional
Maintainer: Debian QA Group <packages@qa.debian.org>
Standards-Version: 4.5.1
Rules-Requires-Root: no
-Build-Depends: libncurses5-dev, libvorbis-dev (>= 1.0.0-3), debhelper-compat (= 13), libsidplay1-dev (>= 1.36.59-3), libsdl1.2-dev, autoconf, automake
+Build-Depends:
+ autoconf,
+ automake,
+ dh-exec,
+ debhelper-compat (= 13),
+ libncurses5-dev,
+ libsdl1.2-dev,
+ libsidplay1-dev (>= 1.36.59-3),
+ libvorbis-dev (>= 1.0.0-3),
Homepage: http://mp3blaster.sf.net
Vcs-Browser: https://browse.dgit.debian.org/mp3blaster.git/
Vcs-Git: https://git.dgit.debian.org/mp3blaster.git
diff --git a/debian/mp3blaster.dirs b/debian/mp3blaster.dirs
deleted file mode 100644
index 98d1583..0000000
--- a/debian/mp3blaster.dirs
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/bin
-usr/share/man/man1
diff --git a/debian/mp3blaster.docs b/debian/mp3blaster.docs
index 60f7575..c17f037 100644
--- a/debian/mp3blaster.docs
+++ b/debian/mp3blaster.docs
@@ -1 +1,4 @@
-NEWS README AUTHORS TODO doc/commands.txt
+AUTHORS
+NEWS
+README
+TODO
diff --git a/debian/mp3blaster.examples b/debian/mp3blaster.examples
index c3c6c9b..4b50ab1 100644
--- a/debian/mp3blaster.examples
+++ b/debian/mp3blaster.examples
@@ -1,2 +1,2 @@
-doc/charmap
-doc/sample.mp3blasterrc
+debian/tmp/usr/share/mp3blaster/charmap/
+debian/tmp/usr/share/mp3blaster/sample.mp3blasterrc
diff --git a/debian/mp3blaster.install b/debian/mp3blaster.install
new file mode 100755
index 0000000..ab14606
--- /dev/null
+++ b/debian/mp3blaster.install
@@ -0,0 +1,4 @@
+#!/usr/bin/dh-exec
+nmixer/ChangeLog => /usr/share/doc/mp3blaster/changelog.nmixer
+usr/bin
+usr/share/mp3blaster/commands.txt
diff --git a/debian/mp3blaster.links b/debian/mp3blaster.links
new file mode 100644
index 0000000..991f419
--- /dev/null
+++ b/debian/mp3blaster.links
@@ -0,0 +1 @@
+usr/share/mp3blaster/commands.txt usr/share/doc/mp3blaster/commands.txt
diff --git a/debian/mp3blaster.manpages b/debian/mp3blaster.manpages
index 1708b80..8ce4d6b 100644
--- a/debian/mp3blaster.manpages
+++ b/debian/mp3blaster.manpages
@@ -1 +1,3 @@
debian/manpages/mp3tag.1
+usr/share/man/man1/mp3blaster.1
+usr/share/man/man1/nmixer.1
diff --git a/debian/not-installed b/debian/not-installed
new file mode 100644
index 0000000..a910cdc
--- /dev/null
+++ b/debian/not-installed
@@ -0,0 +1 @@
+usr/share/man/man1/splay.1
diff --git a/debian/rules b/debian/rules
index 9aeec7f..7811546 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,27 +1,12 @@
#!/usr/bin/make -f
-DESTDIR=debian/mp3blaster
-DEB_COMPRESS_EXCLUDE=commands.txt
-
export DEB_CXXFLAGS_MAINT_APPEND=-std=gnu++98
%:
dh $@
-.PHONY: override_dh_auto_configure
-override_dh_auto_configure:
- dh_auto_configure -- --datadir=/usr/share/doc
-
-.PHONY: override_dh_installdocs
-override_dh_installdocs:
- rm $(DESTDIR)/usr/share/man/man1/splay.1
- rm $(DESTDIR)/usr/bin/splay
- dh_installdocs
- install -m 644 nmixer/ChangeLog \
- $(DESTDIR)/usr/share/doc/mp3blaster/changelog.nmixer
+override_dh_auto_install:
+ dh_auto_install --destdir=debian/tmp
-override_dh_installexamples:
- dh_installexamples
- # Remove example Makefile as it contains embedded build paths
- # and binary paths, making builds unreproducible.
- rm -f $(DESTDIR)/usr/share/doc/mp3blaster/examples/charmap/Makefile
+override_dh_install:
+ dh_install -Xbin/splay
--
2.28.0
Reply to: