[Pkg-wmaker-commits] [wmaker] 01/01: Go back to using dh_installwm with wmaker, not wmaker-common.

[Doug Torrance]

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

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

commit 32209b93623c80b756f8e19b75fccf07a4863d6f
Author: Doug Torrance <dtorrance at piedmont.edu>
Date:   Sun Aug 13 08:29:38 2017 -0400

    Go back to using dh_installwm with wmaker, not wmaker-common.
    
    We need wmaker installed to have a functional window manager, so
    the alternatives system should use it.
    
    We also revise the d/changelog entry. Moving the manpages was more
    about dh_installwm than policy.
---
 debian/changelog                       | 8 ++++++--
 debian/control                         | 2 ++
 debian/wmaker-common.manpages          | 2 --
 debian/wmaker.manpages                 | 2 ++
 debian/{wmaker-common.wm => wmaker.wm} | 0
 5 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index e384abf..d32f377 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,8 +8,10 @@ wmaker (0.95.8-2) UNRELEASED; urgency=medium
     compliance with freedesktop.org's menu standards (Closes: #868431).
   * Bump Standards-Version to 4.0.1.
   * Use dh_installwm to register Window Maker with update-alternatives.
-    In particular, we add a new file, debian/wmaker-common.wm, and a new
-    target, override_dh_installwm, to debian/rules which sets the priority.
+    In particular, we add a new file, debian/wmaker.wm, and a new target,
+    override_dh_installwm, to debian/rules which sets the priority.
+    To accomodate this, we move the manpage from wmaker-common to
+    wmaker.
   * Remove maintainer scripts.  They either dealt with the Debian menu
     or are now automatically generated by dh_installwm.
   * Bump debhelper compatibility level to 10.
@@ -21,6 +23,8 @@ wmaker (0.95.8-2) UNRELEASED; urgency=medium
     debian/wmaker{,-common}.maintscript. Remove generated menufiles
     (etc/GNUstep/Defaults/appearance.menu and /etc/GNUstep/Defaults/menu.hook
     on upgrades and purge.
+  * Because of the moved manpage (which in turn is needed for using
+    dh_installwm) wmaker breaks/replaces wmaker-common (<< 0.95.8-2~).
   * Ship our menu (in classic format) as /etc/GNUstep/Defaults/menu.Debian and
     add a symlink to it as /usr/share/WindowMaker/menu.hook to make the menu
     accessible for upgraded installations. Also ship the menu in PropList
diff --git a/debian/control b/debian/control
index 785b583..7b7647b 100644
--- a/debian/control
+++ b/debian/control
@@ -43,6 +43,8 @@ Suggests: desktop-base,
           x-terminal-emulator,
           x11-apps,
           xterm
+Breaks: wmaker-common (<< 0.95.8-2~)
+Replaces: wmaker-common (<< 0.95.8-2~)
 Description: NeXTSTEP-like window manager for X
  Written by Alfredo Kojima almost from scratch, resembles the NeXTStep look
  very closely, and it is now an official GNU project. Window Maker (originally
diff --git a/debian/wmaker-common.manpages b/debian/wmaker-common.manpages
deleted file mode 100644
index 98dc491..0000000
--- a/debian/wmaker-common.manpages
+++ /dev/null
@@ -1,2 +0,0 @@
-doc/WindowMaker.1
-doc/wmaker.1
diff --git a/debian/wmaker.manpages b/debian/wmaker.manpages
index 68412b9..0563656 100644
--- a/debian/wmaker.manpages
+++ b/debian/wmaker.manpages
@@ -1,4 +1,5 @@
 doc/WPrefs.1
+doc/WindowMaker.1
 doc/geticonset.1
 doc/getstyle.1
 doc/seticons.1
@@ -6,6 +7,7 @@ doc/setstyle.1
 doc/wdread.1
 doc/wdwrite.1
 doc/wmagnify.1
+doc/wmaker.1
 doc/wmgenmenu.1
 doc/wmiv.1
 doc/wmmenugen.1
diff --git a/debian/wmaker-common.wm b/debian/wmaker.wm
similarity index 100%
rename from debian/wmaker-common.wm
rename to debian/wmaker.wm

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