Debian 0.95.3-20120909-1 version

This is not a final version, is only a version for developers.

This version includes compatibility with debconf 9.
This version will be modified to change the libwutil2 symbols
to a new upstream version, probably 0.95.4.

debian/README.Debian

@@ -24,13 +24,13 @@ Other sources for documentation
 -------------------------------
 
 * The Window Maker web site
-  http://www.windowmaker.info/
+  http://www.windowmaker.org/
 
   You can find all sorts of information here. It's kept very up to
   date.
 
 * The Window Maker manual written by Alfredo Kojima
-  ftp://ftp.windowmaker.info/pub/wmaker/docs/
+  ftp://ftp.windowmaker.org/pub/wmaker/docs/
 
   Please note the manual documents version 0.10.x of Window Maker, and
   many features/changes have occured since then.  To find out what has
@@ -40,7 +40,7 @@ Other sources for documentation
   contact wm-user@windowmaker.info
 
 * The Window Maker mailing list
-  http://www.windowmaker.info/lists.html
+  http://www.windowmaker.org/lists.php
 
   There's a Window Maker mailing list.  There you can ask questions about
   Window Maker and *related* applications (s/n is _way_ low nowadays
@@ -119,11 +119,12 @@ Debian specific notes
 ---------------------
 
 Debian prepackaged version of Window Maker will search
-~/GNUstep/Library/WindowMaker and etc/X11/WindowMaker (in that order)
+~/GNUstep/Library/WindowMaker and /usr/share/WindowMaker (in that order)
 for its configuration files. It will read defaults from files in
 ~/GNUstep/Defaults and /etc/GNUstep/Defaults. The files in the
-WindowMaker directories are preprocessed using cpp. It will read both
+WindowMaker directories have cpp-like format and are preprocessed by
-WindowMaker directories searching for #included files.
+WindowMaker. It will read both WindowMaker directories searching for
+#included files.
 
 WindowMaker makes a (little) difference between Pixmaps and Icons, and
 there are two configurable options for setting the paths Window Maker
@@ -131,29 +132,27 @@ would search Pixmaps and Icons in, namely, PixmapPath and
 IconPath. The compiled in defaults are:
 
   PixmapPath = (
-      "~/pixmaps",
     "~/GNUstep/Library/WindowMaker/Pixmaps",
+    "~/GNUstep/Library/WindowMaker/Backgrounds",
     "/usr/local/share/WindowMaker/Pixmaps",
+    "/usr/local/share/WindowMaker/Backgrounds",
+    "/usr/share/WindowMaker/Backgrounds",
     "/usr/share/WindowMaker/Pixmaps",
     "/usr/local/share/pixmaps",
     "/usr/share/pixmaps",
-      "/usr/X11R6/include/X11/pixmaps"
   );
 
   IconPath = (
-      "~/pixmaps",
     "~/GNUstep/Library/Icons",
     "/usr/local/share/WindowMaker/Icons",
     "/usr/share/WindowMaker/Icons",
     "/usr/local/share/icons",
     "/usr/share/icons",
-      "/usr/X11R6/include/X11/pixmaps"
   );
 
 Please note that the internal default doesn't include the "Pixmaps"
 paths anymore, but you are free to modify your Window Maker file in any
-way you see fit.  Please note that the /usr/X11R6/include/X11/pixmaps
+way you see fit.
-is not going to be supported in future releases.
 
 Other Window Maker packages should put pixmaps in
 /usr/share/WindowMaker/Pixmaps and icons in

debian/changelog

@@ -1,3 +1,25 @@
+wmaker (0.95.3+20120825-1) experimental; urgency=low
+
+  * THIS PACKAGE VERSION MUST NOT BE UPLOADED TO DEBIAN
+    - The debian/libwutil2.symbols must include a real version.
+  * New upstream version (git 20120825)
+    - Better icon management. [Closes: #35587, #404729]
+    - Now cpp is not needed. Updated the debian/README.Debian file
+    - New symbols in debian/libwutil2.symbols
+  * Updated some icon paths in debianfiles/conf/WindowMaker
+    - Removed ~/pixmap folder
+  * debian/control:
+    - Debconf version 9 (see debian/compat too).
+    - New debug scheme for multi-platform.
+      debian/wmaker-dbg.dirs not needed, deleted.
+    - Lintian override, because is experimental.
+      New file source/lintian-overrides
+  * debian/rules:
+    - Removed the get-*-flags scripts fix. Not needed (and was wrong).
+    - Removed the HOSTSPEC stuff. Not needed with debconf 9.
+
+ -- Rodolfo García Peñas (kix) <kix@kix.es>  Sun, 9 Sep 2012 11:07:21 +0200
+
 wmaker (0.95.3-2) unstable; urgency=low
 
   * Hardened. debian/rules changed.

debian/compat

@@ -1 +1 @@
-7
+9

debian/control

@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Rodolfo García Peñas (kix) <kix@kix.es>
 Standards-Version: 3.9.3
 DM-Upload-Allowed: yes
-Build-Depends: debhelper (>= 7.0.50~), automake (>= 1:1.11), gettext,
+Build-Depends: debhelper (>= 8.1.3~), automake (>= 1:1.11), gettext,
  libfontconfig1-dev, libjpeg-dev, libpng-dev, libsm-dev, libtiff4-dev,
  libtool, libgif-dev, libx11-dev, libxext-dev, libxft-dev, libxinerama-dev,
  libxkbfile-dev, libxpm-dev, libxt-dev, libxrender-dev, sharutils, libxmu-dev,

debian/debianfiles/conf/WindowMaker

@@ -10,25 +10,21 @@
   EdgeResistance = 30;
   IconificationStyle = Zoom;
   IconPath = (
-    "~/pixmaps",
     "~/GNUstep/Library/Icons",
     "/usr/local/share/WindowMaker/Icons",
     "/usr/share/WindowMaker/Icons",
     "/usr/local/share/icons",
     "/usr/share/icons",
-    "/usr/X11R6/include/X11/pixmaps"
   );
   PixmapPath = (
-    "~/pixmaps",
-    "~/GNUstep/Library/WindowMaker/Backgrounds",
     "~/GNUstep/Library/WindowMaker/Pixmaps",
-    "/usr/local/share/WindowMaker/Backgrounds",
+    "~/GNUstep/Library/WindowMaker/Backgrounds",
     "/usr/local/share/WindowMaker/Pixmaps",
+    "/usr/local/share/WindowMaker/Backgrounds",
     "/usr/share/WindowMaker/Backgrounds",
     "/usr/share/WindowMaker/Pixmaps",
     "/usr/local/share/pixmaps",
     "/usr/share/pixmaps",
-    "/usr/X11R6/include/X11/pixmaps"
   );
   WindowTitleBalloons = YES;
   IconSize = 64;
@@ -41,7 +37,7 @@
   ColormapSize = 4;
   DisableDithering = NO;
   ModifierKey = Mod1;
-  NewStyle = new;
+  NewStyle = "new";
   DisableDock = NO;
   DisableClip = NO;
   Superfluous = NO;
@@ -62,7 +58,7 @@
   ResizeDisplay = line;
   MoveDisplay = floating;
   OpaqueMove = YES;
-  IconPosition = blh;
+  IconPosition = "blh";
   WrapMenus = NO;
   ScrollableMenus = YES;
   MenuScrollSpeed = fast;
@@ -139,5 +135,3 @@
   ResizebarBack = (solid, "rgb:aa/aa/aa");
   MenuStyle = normal;
 }
-
-

debian/libwutil2.symbols

@@ -187,6 +187,12 @@ libWUtil.so.2 libwutil2 #MINVER#
  WMTreeWalk@Base 0.95.0
  WMUserDefaultsDidChangeNotification@Base 0.95.0
  WMWritePropListToFile@Base 0.95.0
+ WMenuParserCreate@Base 0.95.3+20120825
+ WMenuParserDelete@Base 0.95.3+20120825
+ WMenuParserError@Base 0.95.3+20120825
+ WMenuParserGetFilename@Base 0.95.3+20120825
+ WMenuParserGetLine@Base 0.95.3+20120825
+ WMenuParserRegisterSimpleMacro@Base 0.95.3+20120825
  W_ApplicationInitialized@Base 0.95.0
  W_CheckIdleHandlers@Base 0.95.0
  W_CheckTimerHandlers@Base 0.95.0
@@ -199,6 +205,13 @@ libWUtil.so.2 libwutil2 #MINVER#
  __wmessage@Base 0.95.0
  wcopy_file@Base 0.95.1
  destroyNode@Base 0.95.0
+ isnamechr@Base 0.95.3+20120825-1
+ menu_parser_define_macro@Base 0.95.3+20120825
+ menu_parser_expand_macro@Base 0.95.3+20120825
+ menu_parser_find_macro@Base 0.95.3+20120825
+ menu_parser_free_macros@Base 0.95.3+20120825
+ menu_parser_register_preset_macros@Base 0.95.3+20120825
+ menu_parser_skip_spaces_and_comments@Base 0.95.3+20120825
  wdefaultspathfordomain@Base 0.95.0
  wexpandpath@Base 0.95.0
  wfindfile@Base 0.95.0

debian/rules

@@ -5,28 +5,14 @@ export DEB_CFLAGS_MAINT_APPEND += -Wall -DGLOBAL_DEFAULTS_SUBDIR="\\\"GNUstep/De
 export LDFLAGS = `dpkg-buildflags --get LDFLAGS`
 export CPPFLAGS = `dpkg-buildflags --get CPPFLAGS`
 
-# These are used for cross-compiling and for saving the configure script
-# from having to guess our platform (since we know it already)
-export DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-export DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-
-ifeq ($(DEB_BUILD_GNU_TYPE),$(DEB_HOST_GNU_TYPE))
-	HOSTSPEC := --build $(DEB_HOST_GNU_TYPE)
-else
-	HOSTSPEC := --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE)
-endif
-
 LINGUAS           := $(patsubst po/%.po, %, $(wildcard po/*.po))
 
-WMAKER_OPTIONS := --disable-locale --enable-modelock --enable-xinerama $(HOSTSPEC)
+WMAKER_OPTIONS := --disable-locale --enable-modelock --enable-xinerama 
 #not-enabled      --enable-usermenu --disable-shape --disable-shm --enable-xrandr
 #not-enabled      --disable-xpm --disable-png --disable-jpeg --disable-gif --disable-tiff
 
-# Debian packages destination folders
+# Debian packages destination folder
 DEBIAN_TMP        := debian/tmp
-DEBDIR_FILES      := debian/debianfiles
-LIBWRASTERDEV_TMP := debian/libwraster3-dev
-LIBWINGSDEV_TMP   := debian/libwings-dev
 
 # Be careful with the leading / because some of these values are going
 # to be hardcoded into the executables
@@ -34,13 +20,11 @@ BASEDIR           := /usr
 CONFDIR           := /etc
 INCLUDEDIR        := $(BASEDIR)/include
 SHAREDIR          := $(BASEDIR)/share
-BINDIR            := $(BASEDIR)/bin
 MANDIR            := $(SHAREDIR)/man
 NLSDIR            := $(SHAREDIR)/locale
 GNUSTEPDIR        := $(SHAREDIR)/lib/GNUstep/System
 WMSHAREDIR        := $(SHAREDIR)/WindowMaker
 PIXMAPDIR         := $(INCLUDEDIR)/X11/pixmaps
-WPREFSAPPDIR      := $(GNUSTEPDIR)/Applications/WPrefs.app/WPrefs
 
 COMMON_OPTIONS    := --prefix=$(BASEDIR)              \
                      --mandir=$(MANDIR)               \
@@ -82,12 +66,5 @@ override_dh_install:
 	# Install files
 	dh_install
 
-	# Fix the get-*-flags scripts
-	perl -pi -e '/^WCFLAGS/ && s:=.*:="-I/usr/X11R6/include":; /^WLFLAGS/ && s:=.*:="-L/usr/X11R6/lib":;' `find $(LIBWRASTERDEV_TMP) -name get-*-flags`
-	perl -pi -e '/^WCFLAGS/ && s:=.*:="-I/usr/X11R6/include":; /^WLFLAGS/ && s:=.*:="-L/usr/X11R6/lib":;' `find $(LIBWINGSDEV_TMP) -name get-*-flags`
-	perl -pi -e '/^WLIBS/ && s:=.*:="-lwraster":' `find $(LIBWRASTERDEV_TMP) -name get-wraster-flags`
-	perl -pi -e '/^WLIBS/ && s:=.*:="-lWINGs -lwraster -lXft":' `find $(LIBWINGSDEV_TMP) -name get-wings-flags`
-	perl -pi -e '/^WLIBS/ && s:=.*:="-lWUtil -lX11":' `find $(LIBWINGSDEV_TMP) -name get-wutil-flags`
-
 override_dh_strip:
 	dh_strip --dbg-package=wmaker-dbg

debian/source/lintian-overrides

@@ -0,0 +1,3 @@
+# Note if you are using a compat level, which is marked as experimental,
+# such as compat 9 in debhelper 8.1.3, then please override this tag.
+wmaker source: package-needs-versioned-debhelper-build-depends 9