[Pkg-wmaker-commits] [wmacpi] 76/105: Repack source tarball to remove .arch-ids and .hg*. Explain in debian/changelog and debian/README.source.

[Doug Torrance]

This is an automated email from the git hooks/post-receive script.

dtorrance-guest pushed a commit to branch master
in repository wmacpi.

commit a02e1e8f10ae7a18c334f39c264e48345b21bf4d
Author: Doug Torrance <dtorrance at monmouthcollege.edu>
Date:   Sun Jul 27 00:19:05 2014 -0500

    Repack source tarball to remove .arch-ids and .hg*. Explain in debian/changelog and debian/README.source.
---
 debian/README.source | 17 +++++++++++++++++
 debian/changelog     | 19 +++++++++++++------
 2 files changed, 30 insertions(+), 6 deletions(-)

diff --git a/debian/README.source b/debian/README.source
new file mode 100644
index 0000000..68f400b
--- /dev/null
+++ b/debian/README.source
@@ -0,0 +1,17 @@
+wmacpi for Debian
+-----------------
+
+wmacpi version 2.2~rc5 includes Arch and Mercurial files in the original
+source tarball, resulting in source-contains-arch-control-dir and
+source-contains-hg-tags-file Lintian warnings.  To fix this, the source tarball
+has been repacked to exclude this file, as indicated by the +ds suffix in the
+upstream version number.
+
+In addition, the upstream package includes an executable binary file which
+installs to /usr/bin/acpi.  However, this conflicts with a file in the acpi
+package.  Earlier versions of the wmacpi package excluded this file entirely.
+Beginning with version 2.2~rc5+ds-1, this file has been renamed to
+/usr/bin/acpi-ng to avoid the conflict.  (Note that acpi-ng was the upstream
+name as well in an earlier version.)
+
+ -- Doug Torrance <dtorrance at monmouthcollege.edu>, Sun, 27 Jul 2014 00:15:31 -0500
diff --git a/debian/changelog b/debian/changelog
index c1eb641..429fef6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,22 +1,29 @@
-wmacpi (2.2~rc5-3) unstable; urgency=low
+wmacpi (2.2~rc5+ds-1) unstable; urgency=low
 
+  * Repack source tarball to exclude .arch-ids and .hg*.
+    + Add debian/README.source to explain this.
   * Rename /usr/bin/acpi to /usr/bin/acpi-ng to avoid conflict with the acpi
     package.
+    + Remove Breaks: acpi from debian/control.
+    + Add debian/patches/rename_acpi_to_acpi-ng.patch, which renames all
+      instances of acpi in documentation to acpi-ng.
+    + Add explanation to debian/README.source.
+    + Rename files during dh_auto_install in debian/rules.
   * debian/control:
     + Bump Standards-Version to 3.9.5, no changes required.
+    + Update Homepage.
     + Add Vcs-* fields.
-    + Remove Breaks: acpi.
   * debian/dirs:
     + Remove file; unneccessary as directory is created by make install.
   * debian/manpages:
     + Remove file; manpages now installed by debian/rules.
   * debian/patches:
-    + Remove man_no_acpi.patch since acpi(-ng) is now included in package.
-    + Add patch renaming all instances of acpi in documentation to acpi-ng.
-    + Add patch which correctly installs manpages to /usr/share/man/man1.
+    + Remove man_no_acpi.patch since acpi(-ng) has been included in package
+      since version 2.2~rc5-2.
+    + Add debian/patches/install_manpages_to_usr_share.patch, which correctly
+      installs manpages to /usr/share/man/man1.
   * debian/rules:
     + Change to use upstream make install.
-    + Rename acpi to acpi-ng.
 
  -- Doug Torrance <dtorrance at monmouthcollege.edu>  Mon, 21 Jul 2014 03:18:24 -0500
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-wmaker/wmacpi.git