[Pkg-wmaker-commits] [wmaker] 01/01: Temporarily reverting introduction of wmaker-utils package; will wait until after 0.95.7-2 uploaded to sid.

[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 347b83d2d1e16ec28d11cc91388049828074d479
Author: Doug Torrance <dtorrance at piedmont.edu>
Date:   Sat Jan 16 09:06:12 2016 -0500

    Temporarily reverting introduction of wmaker-utils package; will wait until
    after 0.95.7-2 uploaded to sid.
---
 debian/changelog             |  1 -
 debian/control               | 25 +------------------------
 debian/wmaker-utils.install  |  8 --------
 debian/wmaker-utils.manpages |  2 --
 debian/wmaker.install        |  8 ++++++++
 debian/wmaker.manpages       |  2 ++
 6 files changed, 11 insertions(+), 35 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 741765f..2c089bd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,7 +7,6 @@ wmaker (0.95.7-2) UNRELEASED; urgency=medium
   * Switch Build-Depends from libtiff5-dev to libtiff-dev for possible future
     libtiff transitions; also allows backports to earlier releases, e.g.,
     wheezy/precise.
-  * Split wxcopy and wxpaste into new wmaker-utils package (Closes: #78119).
   * The theme that was removed in version 0.92.0-6 has been reintroduced as an
     option, now named "DebianLegacy".  Because it now contains two themes, the
     directory debian/debianfiles/Theme has been renamed to Themes.  The file
diff --git a/debian/control b/debian/control
index 8ef90f0..3421bfe 100644
--- a/debian/control
+++ b/debian/control
@@ -39,12 +39,7 @@ Depends: wmaker-common (= ${source:Version}),
          ${misc:Depends},
          ${shlibs:Depends}
 Provides: x-window-manager
-Suggests: desktop-base,
-          menu,
-          wmaker-data,
-          wmaker-utils,
-          x-terminal-emulator,
-          x11-apps
+Suggests: desktop-base, menu, wmaker-data, x-terminal-emulator, x11-apps
 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
@@ -68,24 +63,6 @@ Description: Window Maker - Architecture independent files
  .
  This package contains the architecture independent files.
 
-Package: wmaker-utils
-Architecture: any
-Multi-Arch: foreign
-Depends: ${misc:Depends}, ${shlibs:Depends}
-Breaks: wmaker (<< 0.95.7-2)
-Replaces: wmaker (<< 0.95.7-2)
-Description: Window Maker - Utilities
- Written by Alfredo Kojima almost from scratch, resembles the NeXTStep look
- very closely, and it is now an official GNU project. Window Maker (originally
- named WindowMaker) is not overloaded with features, and it is easier to
- configure than most other window managers. Its final goal is to produce a
- window manager that doesn't require editing of configuration files.
- Window Maker is fast and doesn't require tons of memory to run.
- .
- This package contains wxcopy and wxpaste, two utilities ordinarily shipped with
- Window Maker but not depending on it or any of its libraries.  These
- utilities allow users to interact with cut buffers on the command line.
-
 Package: libwraster-dev
 Architecture: any
 Multi-Arch: same
diff --git a/debian/wmaker-utils.install b/debian/wmaker-utils.install
deleted file mode 100644
index c3e0730..0000000
--- a/debian/wmaker-utils.install
+++ /dev/null
@@ -1,8 +0,0 @@
-usr/bin/wxcopy
-usr/bin/wxpaste
-usr/share/man/cs/man1/wxcopy.1
-usr/share/man/cs/man1/wxpaste.1
-usr/share/man/ru/man1/wxcopy.1
-usr/share/man/ru/man1/wxpaste.1
-usr/share/man/sk/man1/wxcopy.1
-usr/share/man/sk/man1/wxpaste.1
diff --git a/debian/wmaker-utils.manpages b/debian/wmaker-utils.manpages
deleted file mode 100644
index decf97d..0000000
--- a/debian/wmaker-utils.manpages
+++ /dev/null
@@ -1,2 +0,0 @@
-doc/wxcopy.1
-doc/wxpaste.1
diff --git a/debian/wmaker.install b/debian/wmaker.install
index ed65147..a393dbe 100644
--- a/debian/wmaker.install
+++ b/debian/wmaker.install
@@ -11,6 +11,8 @@ usr/bin/wmgenmenu
 usr/bin/wmiv
 usr/bin/wmmenugen
 usr/bin/wmsetbg
+usr/bin/wxcopy
+usr/bin/wxpaste
 usr/share/lib/GNUstep/System/Applications/WPrefs.app/WPrefs usr/lib/GNUstep/System/Applications/WPrefs.app
 usr/share/man/cs/man1/geticonset.1
 usr/share/man/cs/man1/getstyle.1
@@ -19,6 +21,8 @@ usr/share/man/cs/man1/setstyle.1
 usr/share/man/cs/man1/wdwrite.1
 usr/share/man/cs/man1/wmaker.1
 usr/share/man/cs/man1/wmsetbg.1
+usr/share/man/cs/man1/wxcopy.1
+usr/share/man/cs/man1/wxpaste.1
 usr/share/man/ru/man1/geticonset.1
 usr/share/man/ru/man1/getstyle.1
 usr/share/man/ru/man1/seticons.1
@@ -26,6 +30,8 @@ usr/share/man/ru/man1/setstyle.1
 usr/share/man/ru/man1/wdwrite.1
 usr/share/man/ru/man1/wmaker.1
 usr/share/man/ru/man1/wmsetbg.1
+usr/share/man/ru/man1/wxcopy.1
+usr/share/man/ru/man1/wxpaste.1
 usr/share/man/sk/man1/geticonset.1
 usr/share/man/sk/man1/getstyle.1
 usr/share/man/sk/man1/seticons.1
@@ -33,3 +39,5 @@ usr/share/man/sk/man1/setstyle.1
 usr/share/man/sk/man1/wdwrite.1
 usr/share/man/sk/man1/wmaker.1
 usr/share/man/sk/man1/wmsetbg.1
+usr/share/man/sk/man1/wxcopy.1
+usr/share/man/sk/man1/wxpaste.1
diff --git a/debian/wmaker.manpages b/debian/wmaker.manpages
index 68412b9..3a80e66 100644
--- a/debian/wmaker.manpages
+++ b/debian/wmaker.manpages
@@ -10,3 +10,5 @@ doc/wmgenmenu.1
 doc/wmiv.1
 doc/wmmenugen.1
 doc/wmsetbg.1
+doc/wxcopy.1
+doc/wxpaste.1

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