[Pkg-wmaker-commits] [wmaker] 01/01: Revert back to 0.95.7-2 to prepare for Andreas's fix to #811304.

[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 192f7a7c9ca8dc3188e79074a61caae1d26b203f
Author: Doug Torrance <dtorrance at piedmont.edu>
Date:   Tue Jan 19 22:37:50 2016 -0500

    Revert back to 0.95.7-2 to prepare for Andreas's fix to #811304.
---
 debian/changelog             |  8 --------
 debian/control               | 31 ++++---------------------------
 debian/wmaker-utils.install  |  8 --------
 debian/wmaker-utils.manpages |  2 --
 debian/wmaker.install        |  8 ++++++++
 debian/wmaker.manpages       |  2 ++
 6 files changed, 14 insertions(+), 45 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index fa6c049..e85a3ab 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,3 @@
-wmaker (0.95.7-3) UNRELEASED; urgency=medium
-
-  * Split wxcopy and wxpaste into new wmaker-utils package (Closes: #78119).
-  * Rename libwraster5 package to libwraster5v2 due to incompatibilities
-    introduced between versions 0.95.6 and 0.95.7 (Closes: #811304).
-
- -- Doug Torrance <dtorrance at piedmont.edu>  Sat, 16 Jan 2016 12:55:19 -0500
-
 wmaker (0.95.7-2) unstable; urgency=medium
 
   [ Andreas Metzler ]
diff --git a/debian/control b/debian/control
index b07c831..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-3)
-Replaces: wmaker (<< 0.95.7-3)
-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
@@ -95,7 +72,7 @@ Depends: libc6-dev,
          libjpeg-dev,
          libpng-dev,
          libtiff5-dev,
-         libwraster5v2 (= ${binary:Version}),
+         libwraster5 (= ${binary:Version}),
          libx11-dev,
          libxext-dev,
          libxpm-dev,
@@ -110,7 +87,7 @@ Description: Static libraries and headers of Window Maker rasterizer
  Contains libwraster and header files, for manipulating and
  rasterizing images.
 
-Package: libwraster5v2
+Package: libwraster5
 Architecture: any
 Multi-Arch: same
 Section: libs
@@ -176,7 +153,7 @@ Architecture: any
 Multi-Arch: same
 Section: debug
 Priority: extra
-Depends: libwraster5v2 (= ${binary:Version}) | libwings3 (= ${binary:Version}) | libwutil5 (= ${binary:Version}) | wmaker (= ${binary:Version}),
+Depends: libwraster5 (= ${binary:Version}) | libwings3 (= ${binary:Version}) | libwutil5 (= ${binary:Version}) | wmaker (= ${binary:Version}),
          ${misc:Depends}
 Description: Debugging symbols for WindowMaker packages
  Written by Alfredo Kojima almost from scratch, resembles the NeXTStep look
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