debian: Update with version 0.95.8-1~exp1 packaging.

debian/changelog

@@ -1,3 +1,42 @@
+wmaker (0.95.8-1~exp1) experimental; urgency=medium
+
+  * New upstream release.
+    - Menus may be shaded (Closes: #72038).
+    - Follow window placement rules when placing windows on non-active
+      workspaces (Closes: #181735).
+    - Windows list sorted by workspace (Closes: #280851).
+    - New keyboard shortcuts (Closes: #306808).
+    - Default menu uses correct path to WPrefs (Closes: #851737).
+    - Use PKG_PROG_PKG_CONFIG macro to allow cross building
+      (Closes: #853236).
+  * debian/control
+    - Add xterm to Suggests as it is referenced in the default Window
+      Maker menus (LP: #1429495).
+  * debian/libwraster*
+    - Rename libwraster5 -> libwraster6 for soname version bump.
+  * debian/patches
+     - Remove patches which were either applied or otherwise made
+       unnecessary with the new upstream release.  In particular,
+       + 51_wmaker_man.diff
+       + 55_ungif_problem.diff
+       + 56_ignore_runstatedir.diff
+       + 57_ignore_with-aix-soname.diff
+       + 60_fix_wraster_symbol_versioning.diff
+       + 61_fix_wmmenugen_segfault.diff
+  * debian/rules
+    - Use new --with-defsdatadir configure option to specify global
+      defaults directory instead of old GLOBAL_DEFAULTS_SUBDIR macro.
+    - Use renamed --with-xlocale configure option instead of old
+      --with-locale.
+    - Drop --with-localedir configure option, as it does not exist.
+      It should have been --localedir, but the default is what we
+      want anyway.
+    - Add -Wl,--as-needed to LDFLAGS to avoid useless dependencies.
+  * debian/wmaker-common.install
+    - Update path for system WMGLOBAL and WMState config files.
+
+ -- Doug Torrance <dtorrance@piedmont.edu>  Mon, 13 Mar 2017 14:26:52 -0400
+
 wmaker (0.95.7-8) unstable; urgency=medium
 
   * debian/control

debian/control

@@ -44,7 +44,8 @@ Suggests: desktop-base,
           wmaker-data,
           wmaker-utils,
           x-terminal-emulator,
-          x11-apps
+          x11-apps,
+          xterm
 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
@@ -95,7 +96,7 @@ Depends: libc6-dev,
          libjpeg-dev,
          libpng-dev,
          libtiff5-dev,
-         libwraster5 (= ${binary:Version}),
+         libwraster6 (= ${binary:Version}),
          libx11-dev,
          libxext-dev,
          libxpm-dev,
@@ -110,7 +111,7 @@ Description: Static libraries and headers of Window Maker rasterizer
  Contains libwraster and header files, for manipulating and
  rasterizing images.
 
-Package: libwraster5
+Package: libwraster6
 Architecture: any
 Multi-Arch: same
 Section: libs

debian/libwraster5.symbols

@@ -1,61 +0,0 @@
-libwraster.so.5 libwraster5 #MINVER#
- LIBWRASTER3@LIBWRASTER3 0.95.6
- RBevelImage@LIBWRASTER3 0.95.6
- RBlurImage@LIBWRASTER3 0.95.6
- RClearImage@LIBWRASTER3 0.95.6
- RCloneImage@LIBWRASTER3 0.95.6
- RCombineAlpha@LIBWRASTER3 0.95.6
- RCombineArea@LIBWRASTER3 0.95.6
- RCombineAreaWithOpaqueness@LIBWRASTER3 0.95.6
- RCombineImageWithColor@LIBWRASTER3 0.95.6
- RCombineImages@LIBWRASTER3 0.95.6
- RCombineImagesWithOpaqueness@LIBWRASTER3 0.95.6
- RConvertImage@LIBWRASTER3 0.95.6
- RConvertImageMask@LIBWRASTER3 0.95.6
- RCopyArea@LIBWRASTER3 0.95.6
- RCreateContext@LIBWRASTER3 0.95.6
- RCreateImage@LIBWRASTER3 0.95.6
- RCreateImageFromDrawable@LIBWRASTER3 0.95.6
- RCreateImageFromXImage@LIBWRASTER3 0.95.6
- RCreateXImage@LIBWRASTER3 0.95.6
- RDestroyContext@LIBWRASTER3 0.95.6
- RDestroyXImage@LIBWRASTER3 0.95.6
- RDrawLine@LIBWRASTER3 0.95.7-3~
- RDrawLines@LIBWRASTER3 0.95.6
- RDrawSegments@LIBWRASTER3 0.95.6
- RErrorCode@LIBWRASTER3 0.95.6
- RFillImage@LIBWRASTER3 0.95.6
- RFlipImage@LIBWRASTER3 0.95.6
- RGetClosestXColor@LIBWRASTER3 0.95.6
- RGetImageFileFormat@LIBWRASTER3 0.95.6
- RGetImageFromXPMData@LIBWRASTER3 0.95.6
- RGetPixel@LIBWRASTER3 0.95.6
- RGetSubImage@LIBWRASTER3 0.95.6
- RGetXImage@LIBWRASTER3 0.95.6
- RHSVtoRGB@LIBWRASTER3 0.95.6
- RLightImage@LIBWRASTER3 0.95.6
- RLoadImage@LIBWRASTER3 0.95.6
- RMakeCenteredImage@LIBWRASTER3 0.95.6
- RMakeTiledImage@LIBWRASTER3 0.95.6
- RMessageForError@LIBWRASTER3 0.95.6
- ROperateLine@LIBWRASTER3 0.95.6
- ROperateLines@LIBWRASTER3 0.95.6
- ROperatePixel@LIBWRASTER3 0.95.6
- ROperatePixels@LIBWRASTER3 0.95.6
- ROperateRectangle@LIBWRASTER3 0.95.6
- ROperateSegments@LIBWRASTER3 0.95.6
- RPutPixel@LIBWRASTER3 0.95.6
- RPutPixels@LIBWRASTER3 0.95.6
- RPutXImage@LIBWRASTER3 0.95.6
- RRGBtoHSV@LIBWRASTER3 0.95.6
- RReleaseImage@LIBWRASTER3 0.95.6
- RRenderGradient@LIBWRASTER3 0.95.6
- RRenderInterwovenGradient@LIBWRASTER3 0.95.6
- RRenderMultiGradient@LIBWRASTER3 0.95.6
- RRetainImage@LIBWRASTER3 0.95.6
- RRotateImage@LIBWRASTER3 0.95.6
- RSaveImage@LIBWRASTER3 0.95.6
- RScaleImage@LIBWRASTER3 0.95.6
- RShutdown@LIBWRASTER3 0.95.6
- RSmoothScaleImage@LIBWRASTER3 0.95.6
- RSupportedFileFormats@LIBWRASTER3 0.95.6

debian/libwraster6.symbols

@@ -0,0 +1,61 @@
+libwraster.so.6 libwraster6 #MINVER#
+ LIBWRASTER6@LIBWRASTER6 0.95.8
+ RBevelImage@LIBWRASTER6 0.95.8
+ RBlurImage@LIBWRASTER6 0.95.8
+ RClearImage@LIBWRASTER6 0.95.8
+ RCloneImage@LIBWRASTER6 0.95.8
+ RCombineAlpha@LIBWRASTER6 0.95.8
+ RCombineArea@LIBWRASTER6 0.95.8
+ RCombineAreaWithOpaqueness@LIBWRASTER6 0.95.8
+ RCombineImageWithColor@LIBWRASTER6 0.95.8
+ RCombineImages@LIBWRASTER6 0.95.8
+ RCombineImagesWithOpaqueness@LIBWRASTER6 0.95.8
+ RConvertImage@LIBWRASTER6 0.95.8
+ RConvertImageMask@LIBWRASTER6 0.95.8
+ RCopyArea@LIBWRASTER6 0.95.8
+ RCreateContext@LIBWRASTER6 0.95.8
+ RCreateImage@LIBWRASTER6 0.95.8
+ RCreateImageFromDrawable@LIBWRASTER6 0.95.8
+ RCreateImageFromXImage@LIBWRASTER6 0.95.8
+ RCreateXImage@LIBWRASTER6 0.95.8
+ RDestroyContext@LIBWRASTER6 0.95.8
+ RDestroyXImage@LIBWRASTER6 0.95.8
+ RDrawLine@LIBWRASTER6 0.95.8
+ RDrawLines@LIBWRASTER6 0.95.8
+ RDrawSegments@LIBWRASTER6 0.95.8
+ RErrorCode@LIBWRASTER6 0.95.8
+ RFillImage@LIBWRASTER6 0.95.8
+ RFlipImage@LIBWRASTER6 0.95.8
+ RGetClosestXColor@LIBWRASTER6 0.95.8
+ RGetImageFileFormat@LIBWRASTER6 0.95.8
+ RGetImageFromXPMData@LIBWRASTER6 0.95.8
+ RGetPixel@LIBWRASTER6 0.95.8
+ RGetSubImage@LIBWRASTER6 0.95.8
+ RGetXImage@LIBWRASTER6 0.95.8
+ RHSVtoRGB@LIBWRASTER6 0.95.8
+ RLightImage@LIBWRASTER6 0.95.8
+ RLoadImage@LIBWRASTER6 0.95.8
+ RMakeCenteredImage@LIBWRASTER6 0.95.8
+ RMakeTiledImage@LIBWRASTER6 0.95.8
+ RMessageForError@LIBWRASTER6 0.95.8
+ ROperateLine@LIBWRASTER6 0.95.8
+ ROperateLines@LIBWRASTER6 0.95.8
+ ROperatePixel@LIBWRASTER6 0.95.8
+ ROperatePixels@LIBWRASTER6 0.95.8
+ ROperateRectangle@LIBWRASTER6 0.95.8
+ ROperateSegments@LIBWRASTER6 0.95.8
+ RPutPixel@LIBWRASTER6 0.95.8
+ RPutPixels@LIBWRASTER6 0.95.8
+ RPutXImage@LIBWRASTER6 0.95.8
+ RRGBtoHSV@LIBWRASTER6 0.95.8
+ RReleaseImage@LIBWRASTER6 0.95.8
+ RRenderGradient@LIBWRASTER6 0.95.8
+ RRenderInterwovenGradient@LIBWRASTER6 0.95.8
+ RRenderMultiGradient@LIBWRASTER6 0.95.8
+ RRetainImage@LIBWRASTER6 0.95.8
+ RRotateImage@LIBWRASTER6 0.95.8
+ RSaveImage@LIBWRASTER6 0.95.8
+ RScaleImage@LIBWRASTER6 0.95.8
+ RShutdown@LIBWRASTER6 0.95.8
+ RSmoothScaleImage@LIBWRASTER6 0.95.8
+ RSupportedFileFormats@LIBWRASTER6 0.95.8

debian/patches/55_ungif_problem.diff

@@ -1,25 +0,0 @@
-Description: Remove include ungif library (will use gif library)
-Author: Rodolfo García Peñas (kix) <kix@debian.org>
-Last-Update: 2014-10-09
-Index: wmaker-crm/m4/wm_imgfmt_check.m4
-===================================================================
---- wmaker-crm.orig/m4/wm_imgfmt_check.m4
-+++ wmaker-crm/m4/wm_imgfmt_check.m4
-@@ -20,7 +20,7 @@
- # WM_IMGFMT_CHECK_GIF
- # -------------------
- #
--# Check for GIF file support through 'libgif', 'libungif' or 'giflib v5'
-+# Check for GIF file support through 'libgif' or 'giflib v5'
- # The check depends on variable 'enable_gif' being either:
- #   yes  - detect, fail if not found
- #   no   - do not detect, disable support
-@@ -38,7 +38,7 @@ AS_IF([test "x$enable_gif" = "xno"],
-          wm_save_LIBS="$LIBS"
-          dnl
-          dnl We check first if one of the known libraries is available
--         for wm_arg in "-lgif" "-lungif" ; do
-+         for wm_arg in "-lgif" ; do
-            AS_IF([wm_fn_lib_try_link "DGifOpenFileName" "$XLFLAGS $XLIBS $wm_arg"],
-              [wm_cv_imgfmt_gif="$wm_arg" ; break])
-          done

debian/patches/60_fix_wraster_symbol_versioning.diff

@@ -1,28 +0,0 @@
-Description: Patch back libwraster symbol version to LIBWRASTER3.
-Author: Andreas Metzler <ametzler@debian.org>
-Bug-Debian: https://bugs.debian.org/811304
-Origin: vendor
-
---- a/configure.ac
-+++ b/configure.ac
-@@ -76,6 +76,11 @@ WRASTER_REVISION=0
- WRASTER_AGE=0
- WRASTER_VERSION=$WRASTER_CURRENT:$WRASTER_REVISION:$WRASTER_AGE
- AC_SUBST(WRASTER_VERSION)
-+dnl After next soname bump drop this and use WRASTER_VERSION as argument
-+dnl for generate-mapfile-from-header.sh
-+dnl http://bugs.debian.org/811304
-+WRASTER_SYMBOL_VERSION=3
-+AC_SUBST([WRASTER_SYMBOL_VERSION])
- dnl
- dnl libWINGs
- WINGS_CURRENT=4
---- a/wrlib/Makefile.am
-+++ b/wrlib/Makefile.am
-@@ -99,5 +99,5 @@ wrlib.pc: Makefile
- if HAVE_LD_VERSION_SCRIPT
- libwraster.map: $(include_HEADERS) $(top_srcdir)/script/generate-mapfile-from-header.sh
- 	$(AM_V_GEN)$(top_srcdir)/script/generate-mapfile-from-header.sh \
--		-n LIBWRASTER -v $(WRASTER_VERSION) $(srcdir)/$(include_HEADERS) > libwraster.map
-+		-n LIBWRASTER -v $(WRASTER_SYMBOL_VERSION) $(srcdir)/$(include_HEADERS) > libwraster.map
- endif

debian/patches/series

@@ -1,5 +1,3 @@
 50_def_config_paths.diff
 53_Debian_WMState.diff
 54_Debian_wmmacros.diff
-55_ungif_problem.diff
-60_fix_wraster_symbol_versioning.diff

debian/rules

@@ -2,11 +2,12 @@
 # export DH_VERBOSE=1
 
 export DEB_BUILD_MAINT_OPTIONS = hardening=+all
-export DEB_CFLAGS_MAINT_APPEND += -Wall -DGLOBAL_DEFAULTS_SUBDIR=\"GNUstep/Defaults\"
+export DEB_CFLAGS_MAINT_APPEND += -Wall
+export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed
 
 LINGUAS           := $(patsubst po/%.po, %, $(wildcard po/*.po))
 
-WMAKER_OPTIONS := --disable-locale --enable-modelock --enable-pango --enable-xinerama
+WMAKER_OPTIONS := --disable-xlocale --enable-modelock --enable-pango --enable-xinerama
 #not-enabled      --enable-usermenu --disable-shape --disable-shm --enable-randr
 #not-enabled      --disable-xpm --disable-png --disable-jpeg --disable-gif --disable-tiff
 
@@ -18,15 +19,15 @@ DEBIAN_TMP        := debian/tmp
 BASEDIR           := /usr
 INCLUDEDIR        := $(BASEDIR)/include
 SHAREDIR          := $(BASEDIR)/share
-NLSDIR            := $(SHAREDIR)/locale
 GNUSTEPDIR        := $(SHAREDIR)/lib/GNUstep/System
 WMSHAREDIR        := $(SHAREDIR)/WindowMaker
 PIXMAPDIR         := $(INCLUDEDIR)/X11/pixmaps
+DEFSDATADIR       := /etc/GNUstep/Defaults
 
 COMMON_OPTIONS    := --datadir=$(SHAREDIR)            \
-                     --with-localedir=$(NLSDIR)       \
                      --with-pixmapdir=$(PIXMAPDIR)    \
-                     --with-gnustepdir=$(GNUSTEPDIR)
+                     --with-gnustepdir=$(GNUSTEPDIR)  \
+                     --with-defsdatadir=$(DEFSDATADIR)
 
 %:
 	dh $@ --parallel --with autoreconf

debian/wmaker-common.install

@@ -13,8 +13,8 @@ debian/debianfiles/menu/wmappearance		etc/menu-methods
 debian/debianfiles/upgrade-windowmaker-defaults usr/sbin
 debian/debianfiles/wmaker			usr/bin
 debian/debianfiles/wmaker-common.desktop	usr/share/xsessions
-etc/WindowMaker/WMGLOBAL			etc/GNUstep/Defaults
+etc/GNUstep/Defaults/WMGLOBAL
-etc/WindowMaker/WMState				etc/GNUstep/Defaults
+etc/GNUstep/Defaults/WMState
 usr/share/WINGs/Images.tiff
 usr/share/WINGs/Images.xpm
 usr/share/WINGs/defaultIcon.tiff