debian: Update with version 0.95.9-1 packaging.

debian/README.Debian

@@ -6,8 +6,8 @@ another window manager, written mostly from scratch by Alfredo Kojima
 in an attempt to provide as much of the useful OpenStep functionality
 as possible under X11.  It is the natural step after AfterStep.
 
-There are some changes in the paths, added support for Debian menu
+There are some changes in the paths and improved user configuration
-system, improved user configuration (from the sysadmin point of view).
+(from the sysadmin point of view).
 
 To run Window Maker put this at the end of ~/.xsession:
 
@@ -132,24 +132,9 @@ theme.
 
 If you don't like the arrangement of the Appearance menu, you can put
 a file "appearance.menu" in ~/GNUstep/Library/WindowMaker, and it will
-override the default one. Look at /etc/GNUstep/Defaults/appearance.menu
+override the default one. Look at /usr/share/WindowMaker/appearance.menu
 for an example.
 
-Shortcuts
----------
-
-Thanks to a suggestion, there's support for Shortcuts.  If you want to
-have Shift F1 launch an XTerm, you can:
-
-$ cp /usr/lib/menu/xterm /etc/menu
-$ sensible-editor /etc/menu/xterm
-
-add:
-
-        shortcut=Shift+F1
-
-and run update-menus.
-
 Sound Support
 -------------
 
@@ -200,4 +185,28 @@ above into ~/GNUstep/Defaults/WMRootMenu, start WPrefs, click the Menu
 Guru (the 9th icon, left to right).  Now go read the docs.  That's the
 reason they are there.
 
+FreeDesktop menu
+----------------
+
+As of policy version 3.9.8, the Debian menu has been deprecated in favor
+of the FreeDesktop menu standard.
+
+There is currently not a menu for Window Maker which is 100% compatible
+with the standards.  But several options exist which offer a decent
+approximation.
+
+* The wmmenugen utility included with Window Maker, e.g.
+
+      wmmenugen -parser:xdg /usr/share/applications/
+
+  This is the option used by the default menu, which may be found in
+  /etc/GNUstep/Defaults/plmenu.Debian.  This is symlinked by
+  /usr/share/WindowMaker/menu.hook.
+
+* xdgmenumaker (https://github.com/gapan/xdgmenumaker)
+
+* xdg-menu (https://wiki.archlinux.org/index.php/xdg-menu)
+
 Marcelo E. Magallon <mmagallo@debian.org>, Thr, 1 Apr 1999 18:47:30 -0600
+
+ -- Doug Torrance <dtorrance@piedmont.edu>, Sun,  5 Apr 2020 20:09:38 -0400

debian/changelog

@@ -1,3 +1,90 @@
+wmaker (0.95.9-1) experimental; urgency=low
+
+  [ Doug Torrance ]
+  * New upstream release.
+    - No longer sets GNUSTEP_USER_ROOT environment variable
+      (Closes: #922284).
+    - Prefers TryExec to Exec when generating menu entries from XDG desktop
+      files (closes: #930674).
+    - Drop patches previously pulled from upstream GIT:
+      10_util-fix-parsing-of-XDG-menus-with-multiple-groups.patch
+      11_XDG-menu-categories.patch 12_reference-proplist-menus.patch
+      60_fix_pkg-config_variable_typo.patch
+    - Unfuzz 75_WPrefs_to_bindir_when_gnustedir_is_set.diff
+    - 54_Debian_wmmacros.diff dropped, main functionality included upstream.
+  * debian/compat
+    - Remove file; compatibility level now handled by debhelper-compat
+      package.
+  * debian/control
+    - Bump Standards-Version to 4.5.0.
+    - Switch Build-Depends on debhelper to debhelper-compat for
+      compatibility level 12.
+  * debian/lib*.symbols
+    - Add Build-Depends-Package fields.
+  * debian/libwings3.symbols
+    - Add new WINGs symbols.
+  * debian/patches/10_support_imagemagick6.diff
+    - New patch; restore support for ImageMagick v6, as v7 is not in
+      Debian yet.
+  * debian/patches/.keepme
+    - Remove unnecessary file; was causing
+      patch-file-present-but-not-mentioned-in-series Lintian warning.
+  * debian/README.Debian
+    - Fix typo.
+  * debian/rules
+    - Remove replacement of #wmdatadir# to $(WMSHAREDIR) in some menu
+      files; this is now done by upstream during build.
+    - Install README's from WindowMaker directory correctly. Avoids
+      package-contains-documentation-outside-usr-share-doc Lintian
+      warning.
+  * debian/wmaker-common.docs
+    - Use wildcard to catch all the README's that have been renamed
+      in d/rules.
+
+ -- Andreas Metzler <ametzler@debian.org>  Tue, 14 Apr 2020 18:06:26 +0200
+
+wmaker (0.95.8-3) unstable; urgency=low
+
+  [ Doug Torrance ]
+  * debian/compat
+    - Bump debhelper compatibility level to 11.
+  * debian/control
+    - Bump versioned dependency on debhelper to >= 11.
+    - Drop automake (>= 1:1.12) from Build-Depends; automake 1.14 is
+      now in oldstable.
+    - Add libmagickwand-6.q16-dev to Build-Depends.
+    - Add libpango1.0-dev to Build-Depends.  We have been passing
+      --enable-pango to configure during build since version 0.95.7-1,
+      but it has been failing.
+    - Bump Standards-Version to 4.2.1.
+    - Use https in Homepage.
+    - Update Vcs-* after migration to Salsa.
+  * debian/copyright
+    - Update Format to https.
+  * debian/patches/60_fix_pkg-config_variable_typo.patch
+    - New patch; correctly call pkg-config when building with
+      ImageMagick support.
+  * debian/README.Debian
+    - Add documentation for new FreeDesktop-style menu which replaced
+      the deprecated Debian menu (Closes: #872879).
+  * debian/rules
+    - Add --enable-magick configure option to enable ImageMagick
+      support (Closes: #905608).
+    - Remove --parallel option to dh; default after debhelper 10.
+  * debian/watch
+    - Use https for download link.
+
+  [ Andreas Metzler ]
+  * Delete trailing whitespace in Debian changelog. (Thanks, lintian)
+  * 75_WPrefs_to_bindir_when_gnustedir_is_set.diff: Install main WPrefs
+    executable to /usr/bin even if --with-gnustepdir is used.
+    Build with --with-gnustepdir=/usr/share/GNUstep (instead of
+    /usr/share/lib/...) and fix references in debian/* accordingly.
+    (LP: #1742842)
+  * Set Rules-Requires-Root: no.
+
+ -- Andreas Metzler <ametzler@debian.org>  Thu, 13 Sep 2018 19:16:14 +0200
+
 wmaker (0.95.8-2) unstable; urgency=low
 
   [ Doug Torrance ]
@@ -1421,7 +1508,6 @@ wmaker (0.61.1-3) frozen; urgency=low
   * Added calls to x-terminal-emulator instead of xterm in
     default settings.
   * Cleaned up the control file.
-  *
 
  -- Chris McKillop <cdm@debian.org>  Tue,  1 Feb 2000 00:42:12 -0500
 

debian/compat

@@ -1 +0,0 @@
-10

debian/control

@@ -4,13 +4,15 @@ Priority: optional
 Maintainer: Debian Window Maker Team <pkg-wmaker-devel@lists.alioth.debian.org>
 Uploaders: Andreas Metzler <ametzler@debian.org>,
            Doug Torrance <dtorrance@piedmont.edu>
-Standards-Version: 4.0.1
+Rules-Requires-Root: no
-Build-Depends: automake (>= 1:1.12),
+Standards-Version: 4.5.0
-               debhelper (>= 10),
+Build-Depends: debhelper-compat (= 12),
                gettext,
                libfontconfig1-dev,
                libgif-dev,
                libjpeg-dev,
+               libmagickwand-6.q16-dev,
+               libpango1.0-dev,
                libpng-dev,
                libsm-dev,
                libtiff-dev,
@@ -26,9 +28,9 @@ Build-Depends: automake (>= 1:1.12),
                libxrender-dev,
                libxt-dev,
                sharutils
-Homepage: http://windowmaker.org/
+Homepage: https://www.windowmaker.org/
-Vcs-Browser: https://anonscm.debian.org/git/pkg-wmaker/wmaker.git
+Vcs-Browser: https://salsa.debian.org/wmaker-team/wmaker
-Vcs-Git: https://anonscm.debian.org/git/pkg-wmaker/wmaker.git
+Vcs-Git: https://salsa.debian.org/wmaker-team/wmaker.git
 
 Package: wmaker
 Architecture: any

debian/copyright

@@ -1,4 +1,4 @@
-Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: wmaker
 Upstream-Contact: Window Maker developers mailing list <wmaker-dev@googlegroups.com>
 Source: http://repo.or.cz/w/wmaker-crm.git

debian/debianfiles/conf/WMWindowAttributes

@@ -2,7 +2,7 @@
   Logo.WMDock = {Icon = GNUstep.tiff;};
   Logo.WMPanel = {Icon = GNUstep.tiff;};
   Tile.WMClip = {Icon = clip.tiff;};
-  WPrefs = {Icon = "/usr/share/lib/GNUstep/System/Applications/WPrefs.app/WPrefs.tiff";};
+  WPrefs = {Icon = "/usr/share/GNUstep/System/Applications/WPrefs.app/WPrefs.tiff";};
   Dockit = {Icon = GNUstep.tiff;};
   WMSoundServer = {Icon = Sound.tiff;};
   "*" = {Icon = defaultAppIcon.tiff;};

debian/libwings3.symbols

@@ -1,4 +1,5 @@
 libWINGs.so.3 libwings3 #MINVER#
+* Build-Depends-Package: libwings-dev
  WINGsConfiguration@Base 0.95.0
  WMAddBoxSubview@Base 0.95.0
  WMAddBoxSubviewAtEnd@Base 0.95.0
@@ -58,7 +59,9 @@ libWINGs.so.3 libwings3 #MINVER#
  WMCreateRGBAColor@Base 0.95.0
  WMCreateRGBColor@Base 0.95.0
  WMCreateRuler@Base 0.95.0
+ WMCreateScaledAlertPanel@Base 0.95.9
  WMCreateScaledBlendedPixmapFromFile@Base 0.95.6
+ WMCreateScaledInputPanel@Base 0.95.9
  WMCreateScreen@Base 0.95.0
  WMCreateScreenWithRContext@Base 0.95.0
  WMCreateScrollView@Base 0.95.0
@@ -173,6 +176,7 @@ libWINGs.so.3 libwings3 #MINVER#
  WMGetRulerMargins@Base 0.95.0
  WMGetRulerOffset@Base 0.95.0
  WMGetSavePanel@Base 0.95.0
+ WMGetScaleBaseFromSystemFont@Base 0.95.9
  WMGetScrollViewHorizontalScroller@Base 0.95.0
  WMGetScrollViewVerticalScroller@Base 0.95.0
  WMGetScrollViewVisibleRect@Base 0.95.0

debian/libwmaker1.symbols

@@ -1,4 +1,5 @@
 libWMaker.so.1 libwmaker1 #MINVER#
+* Build-Depends-Package: libwmaker-dev
  WMAppAddWindow@Base 0.95.7
  WMAppCreateWithMain@Base 0.95.7
  WMAppSetMainMenu@Base 0.95.7

debian/libwraster6.symbols

@@ -1,4 +1,5 @@
 libwraster.so.6 libwraster6 #MINVER#
+* Build-Depends-Package: libwraster-dev
  LIBWRASTER6@LIBWRASTER6 0.95.8
  RBevelImage@LIBWRASTER6 0.95.8
  RBlurImage@LIBWRASTER6 0.95.8

debian/libwutil5.symbols

@@ -1,4 +1,5 @@
 libWUtil.so.5 libwutil5 #MINVER#
+* Build-Depends-Package: libwings-dev
  WHandleEvents@Base 0.95.5
  WMAddIdleHandler@Base 0.95.5
  WMAddInputHandler@Base 0.95.5

debian/patches/.keepme

@@ -1 +0,0 @@
-Don't remove this directory

debian/patches/10_support_imagemagick6.diff

@@ -0,0 +1,27 @@
+Description: Restore support for ImageMagick v6, as v7 not in Debian.
+Origin: https://repo.or.cz/wmaker-crm.git/commitdiff/1dace56 (reversed)
+Bug-Debian: https://bugs.debian.org/929825
+Last-Update: 2020-04-05
+
+--- a/m4/wm_imgfmt_check.m4
++++ b/m4/wm_imgfmt_check.m4
+@@ -312,7 +312,7 @@
+               dnl
+               dnl The library was found, check if header is available and compiles
+               wm_save_CFLAGS="$CFLAGS"
+-              AS_IF([wm_fn_lib_try_compile "MagickWand/MagickWand.h" "MagickWand *wand;" "wand = NewMagickWand()" "$wm_cv_libchk_magick_cflags"],
++              AS_IF([wm_fn_lib_try_compile "wand/magick_wand.h" "MagickWand *wand;" "wand = NewMagickWand()" "$wm_cv_libchk_magick_cflags"],
+                   [wm_cv_libchk_magick="$wm_cv_libchk_magick_cflags % $wm_cv_libchk_magick_libs"],
+                   [AC_MSG_ERROR([found MagickWand library but could not compile its header])])
+               CFLAGS="$wm_save_CFLAGS"])dnl
+--- a/wrlib/load_magick.c
++++ b/wrlib/load_magick.c
+@@ -22,7 +22,7 @@
+ 
+ #include "config.h"
+ 
+-#include <MagickWand/MagickWand.h>
++#include <wand/MagickWand.h>
+ 
+ #include "wraster.h"
+ #include "imgformat.h"

debian/patches/75_WPrefs_to_bindir_when_gnustedir_is_set.diff

@@ -0,0 +1,19 @@
+Description: Always install WPrefs binary to bindir
+ Even when setting --with-gnustepdir install the main WPrefs executable
+ to bindir (/usr/bin) for FHS compliancy.
+Author: Andreas Metzler <ametzler@debian.org>
+Origin: vendor
+Forwarded: no
+Last-Update: 2018-09-02
+
+--- a/configure.ac
++++ b/configure.ac
+@@ -853,7 +853,7 @@
+     [dnl User specified base path
+      wprefs_base_dir="$with_gnustepdir/Applications"
+      wprefs_datadir="$wprefs_base_dir/WPrefs.app"
+-     wprefs_bindir="$wprefs_base_dir/WPrefs.app"])
++     wprefs_bindir="${bindir}"])
+ AC_SUBST([wprefs_datadir])dnl
+ AC_SUBST([wprefs_bindir])dnl
+ 

debian/patches/series

@@ -1 +1,3 @@
+10_support_imagemagick6.diff
 53_Debian_WMState.diff
+75_WPrefs_to_bindir_when_gnustedir_is_set.diff

debian/rules

@@ -7,7 +7,8 @@ export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed
 
 LINGUAS           := $(patsubst po/%.po, %, $(wildcard po/*.po))
 
-WMAKER_OPTIONS := --disable-xlocale --enable-modelock --enable-pango --enable-xinerama
+WMAKER_OPTIONS := --disable-xlocale --enable-modelock --enable-pango \
+                  --enable-xinerama --enable-magick
 #not-enabled      --enable-usermenu --disable-shape --disable-shm --enable-randr
 #not-enabled      --disable-xpm --disable-png --disable-jpeg --disable-gif --disable-tiff
 
@@ -19,7 +20,7 @@ DEBIAN_TMP        := debian/tmp
 BASEDIR           := /usr
 INCLUDEDIR        := $(BASEDIR)/include
 SHAREDIR          := $(BASEDIR)/share
-GNUSTEPDIR        := $(SHAREDIR)/lib/GNUstep/System
+GNUSTEPDIR        := $(SHAREDIR)/GNUstep/System
 WMSHAREDIR        := $(SHAREDIR)/WindowMaker
 PIXMAPDIR         := $(INCLUDEDIR)/X11/pixmaps
 DEFSDATADIR       := /etc/GNUstep/Defaults
@@ -30,7 +31,7 @@ COMMON_OPTIONS    := --datadir=$(SHAREDIR)            \
                      --with-defsdatadir=$(DEFSDATADIR)
 
 %:
-	dh $@ --parallel
+	dh $@
 
 override_dh_auto_configure:
 	env LINGUAS="$(LINGUAS)" dh_auto_configure --verbose -- \
@@ -41,6 +42,9 @@ override_dh_installdocs:
 	# We use the root of the temporal directory debian/tmp
 	cp po/README $(DEBIAN_TMP)/README.po
 	cp README.definable-cursor $(DEBIAN_TMP)/README.definable-cursor
+	cp WindowMaker/Icons/README $(DEBIAN_TMP)/README.Icons
+	cp WindowMaker/README $(DEBIAN_TMP)/README.menu
+	cp WindowMaker/README.themes $(DEBIAN_TMP)/README.themes
 	cp WPrefs.app/README $(DEBIAN_TMP)/README.WPrefs
 	cp WPrefs.app/po/README $(DEBIAN_TMP)/README.WPrefs.po
 	dh_installdocs
@@ -50,14 +54,8 @@ override_dh_install:
 	chmod +x $(DEBIAN_TMP)$(WMSHAREDIR)/autostart.sh
 	chmod +x $(DEBIAN_TMP)$(WMSHAREDIR)/exitscript.sh
 
-
-	# Now, change the #wmdatadir# string to $(WMSHAREDIR)
-	perl -pi -e 's:#wmdatadir#:$(WMSHAREDIR):' `find $(DEBIAN_TMP)/$(WMSHAREDIR) -name plmenu.*`
-	perl -pi -e 's:#wmdatadir#:$(WMSHAREDIR):' $(DEBIAN_TMP)$(WMSHAREDIR)/wmmacros
-	perl -pi -e 's:#wmdatadir#:$(WMSHAREDIR):' $(DEBIAN_TMP)$(WMSHAREDIR)/plmenu
-
 	# Install files
-	dh_install
+	dh_install -XREADME
 
 override_dh_installwm:
 	dh_installwm --priority=50

debian/watch

@@ -1,2 +1,2 @@
 version=4
-http://windowmaker.org/ (?:|.*/)WindowMaker@ANY_VERSION@@ARCHIVE_EXT@
+https://www.windowmaker.org/ (?:|.*/)WindowMaker@ANY_VERSION@@ARCHIVE_EXT@

debian/wmaker-common.docs

@@ -6,8 +6,5 @@ NEWS
 README
 TODO
 debian/debianfiles/Themes/DebianLegacy.txt
-debian/tmp/README.WPrefs
+debian/tmp/README.*
-debian/tmp/README.WPrefs.po
-debian/tmp/README.definable-cursor
-debian/tmp/README.po
 util/wm-oldmenu2new

debian/wmaker-common.install

@@ -12,7 +12,7 @@ etc/GNUstep/Defaults/WMGLOBAL
 etc/GNUstep/Defaults/WMState
 usr/share/WINGs
 usr/share/WindowMaker
-usr/share/lib/GNUstep/System/Applications/WPrefs.app/WPrefs.tiff
+usr/share/GNUstep/System/Applications/WPrefs.app/WPrefs.tiff
-usr/share/lib/GNUstep/System/Applications/WPrefs.app/WPrefs.xpm
+usr/share/GNUstep/System/Applications/WPrefs.app/WPrefs.xpm
-usr/share/lib/GNUstep/System/Applications/WPrefs.app/tiff
+usr/share/GNUstep/System/Applications/WPrefs.app/tiff
 usr/share/locale/*/LC_MESSAGES/*.mo

debian/wmaker.install

@@ -11,7 +11,7 @@ usr/bin/wmgenmenu
 usr/bin/wmiv
 usr/bin/wmmenugen
 usr/bin/wmsetbg
-usr/share/lib/GNUstep/System/Applications/WPrefs.app/WPrefs usr/lib/GNUstep/System/Applications/WPrefs.app
+usr/bin/WPrefs
 usr/share/man/cs/man1/geticonset.1
 usr/share/man/cs/man1/getstyle.1
 usr/share/man/cs/man1/seticons.1

debian/wmaker.links

@@ -1,2 +1 @@
 usr/bin/wmaker usr/bin/WindowMaker
-usr/lib/GNUstep/System/Applications/WPrefs.app/WPrefs usr/bin/WPrefs