This patch includes the changes for the new debian package 0.95.5-1:
Changes are:
- New libwutil library, new version 3:
- Updated debian/control file, replacing libwutil2 with libwutil3.
- Files moved in debian folder:
- libwutil2.changelog-upstream -> libwutil3.changelog-upstream
- libwutil2.install -> libwutil3.install
- Removed file libwutil2.symbols
- New file libwutil3.symbols
- libtiff migrated from version 4 to version 5:
* "Build-Depends: libtiff5-dev" in packages wmaker and libwraster3-dev,
since libtiff-dev introduces dependency to libtiff4 which is in oldlibs.
- Small changes:
* Included the word "WindowMaker" in the wmaker package description,
to found it easily.
---
WindowMaker/Defaults/WMState.in | 6 +-
WindowMaker/wmmacros | 6 +-
debian/changelog | 38 ++++-
debian/control | 40 +++--
debian/debianfiles/conf/WMWindowAttributes | 1 -
debian/libwings2.symbols | 33 ++--
debian/libwutil2.changelog-upstream | 1 -
debian/libwutil2.install | 1 -
debian/libwutil2.symbols | 244 -----------------------------
debian/libwutil3.changelog-upstream | 1 +
debian/libwutil3.install | 1 +
debian/libwutil3.symbols | 243 ++++++++++++++++++++++++++++
debian/patches/50_def_config_paths.diff | 8 +-
debian/patches/55_typo.diff | 15 ++
debian/patches/series | 1 +
debian/source/lintian-overrides | 3 -
debian/source/options | 2 +-
debian/wmaker-common.postinst | 2 +-
debian/wmaker.postinst | 8 +
doc/wmaker.1x | 8 +-
src/dock.c | 2 +-
src/wconfig.h.in | 2 +-
22 files changed, 361 insertions(+), 305 deletions(-)
delete mode 100644 debian/libwutil2.changelog-upstream
delete mode 100644 debian/libwutil2.install
delete mode 100644 debian/libwutil2.symbols
create mode 100644 debian/libwutil3.changelog-upstream
create mode 100644 debian/libwutil3.install
create mode 100644 debian/libwutil3.symbols
create mode 100644 debian/patches/55_typo.diff
delete mode 100644 debian/source/lintian-overrides
diff --git a/WindowMaker/Defaults/WMState.in b/WindowMaker/Defaults/WMState.in
index aefcfdf..2cbb550 100644
--- a/WindowMaker/Defaults/WMState.in
+++ b/WindowMaker/Defaults/WMState.in
@@ -2,7 +2,7 @@
Dock = {
Applications = (
{
- Command = "#wprefs#";
+ Command = "/usr/bin/WPrefs";
Name = Logo.WMDock;
AutoLaunch = No;
Forced = No;
@@ -10,8 +10,8 @@
Lock = Yes;
},
{
- Command = xterm;
- Name = xterm.XTerm;
+ Command = "x-terminal-emulator";
+ Name = "x-terminal-emulator.XTerm";
AutoLaunch = No;
Forced = No;
Position = "0,1";
diff --git a/WindowMaker/wmmacros b/WindowMaker/wmmacros
index 9261690..bb5c325 100644
--- a/WindowMaker/wmmacros
+++ b/WindowMaker/wmmacros
@@ -22,7 +22,7 @@
/*
* SETSTYLE FILE - loads a style file
*/
-#define SETSTYLE EXEC cd $HOME/GNUstep/Library/WindowMaker/Styles; setstyle
+#define SETSTYLE EXEC cd $GNUSTEP_USER_ROOT/Library/WindowMaker/Styles;
setstyle
/*
@@ -60,6 +60,10 @@
#define STYLES_DIR #wmdatadir#/Styles
#define ICON_SETS_DIR #wmdatadir#/IconSets
#define BACKGROUNDS_DIR #wmdatadir#/Backgrounds
+#define USER_THEMES_DIR $GNUSTEP_USER_ROOT/Library/WindowMaker/Themes
+#define USER_STYLES_DIR $GNUSTEP_USER_ROOT/Library/WindowMaker/Styles
+#define USER_ICON_SETS_DIR $GNUSTEP_USER_ROOT/Library/WindowMaker/IconSets
+#define USER_BACKGROUNDS_DIR
$GNUSTEP_USER_ROOT/Library/WindowMaker/Backgrounds
#define StaticGray 0
diff --git a/debian/changelog b/debian/changelog
index 30761d5..b0bea86 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,34 @@
+wmaker (0.95.5-1) unstable; urgency=low
+
+ * New upstream version 0.95.5. [Closes: #723840]
+ - New WUtil library version 3.
+ - Updated debian/control file, replacing libwutil2 with libwutil3.
+ - Files moved in debian folder:
+ - libwutil2.changelog-upstream -> libwutil3.changelog-upstream
+ - libwutil2.install -> libwutil3.install
+ - Removed file libwutil2.symbols
+ - New file libwutil3.symbols
+ * "Build-Depends: libtiff5-dev" in packages wmaker and libwraster3-dev,
+ since libtiff-dev introduces dependency to libtiff4 which is in oldlibs.
+ * Included the word "WindowMaker" in the wmaker package description,
+ to found it easily. [Closes: #685424]
+
+ -- Rodolfo García Peñas (kix) <[email protected]> Sun, 22 Sep 2013 10:08:02
+0200
+
+wmaker (0.95.4-2) unstable; urgency=low
+
+ * Package moved from experimental to unstable and updated.
+ * Changed permissions to menu-methods/wmaker to a+x. Updated the
+ debian/wmaker-common.postinst and debian/wmaker.postinst [Closes: #705160]
+ * debian/control
+ - Removed DM Upload flag (obsolete).
+ - Updated maintainer email address, from [email protected] to [email protected].
+ - Now using libtiff-dev to build packages (libtiff4-dev is in oldlibs).
+ - Removed xosview as suggested package (not in all archs).
+ * Bumped to standard version 3.9.4.
+
+ -- Rodolfo García Peñas (kix) <[email protected]> Tue, 06 Aug 2013 06:34:14
+0200
+
wmaker (0.95.4-1) experimental; urgency=low
* New upstream version 0.95.4.
@@ -9,16 +40,13 @@ wmaker (0.95.4-1) experimental; urgency=low
* 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
+ Removed debian/wmaker-dbg.dirs, because the path for debug
+ files is now using hashes (/usr/lib/debug/build-id).
* debian/rules:
- Removed the get-*-flags scripts fix. Not needed (and was wrong).
- Removed the HOSTSPEC stuff. Not needed with debconf 9.
* debian/README.Debian:
- Changed /etc path for appearance.menu.
- * Removed debian/wmaker-dbg.dirs, because the path for debug files
- is now using hashes (/usr/lib/debug/build-id).
-- Rodolfo García Peñas (kix) <[email protected]> Wed, 3 Jan 2013 00:17:31 +0100
diff --git a/debian/control b/debian/control
index 6c67a7a..ecdf31c 100644
--- a/debian/control
+++ b/debian/control
@@ -1,11 +1,10 @@
Source: wmaker
Section: x11
Priority: optional
-Maintainer: Rodolfo García Peñas (kix) <[email protected]>
-Standards-Version: 3.9.3
-DM-Upload-Allowed: yes
-Build-Depends: debhelper (>= 8.1.3~), automake (>= 1:1.11), gettext,
- libfontconfig1-dev, libjpeg-dev, libpng-dev, libsm-dev, libtiff4-dev,
+Maintainer: Rodolfo García Peñas (kix) <[email protected]>
+Standards-Version: 3.9.4
+Build-Depends: debhelper (>= 9), automake (>= 1:1.11), gettext,
+ libfontconfig1-dev, libjpeg-dev, libpng-dev, libsm-dev, libtiff5-dev,
libtool, libgif-dev, libx11-dev, libxext-dev, libxft-dev, libxinerama-dev,
libxkbfile-dev, libxpm-dev, libxt-dev, libxrender-dev, sharutils, libxmu-dev,
libxrandr-dev, dctrl-tools, autotools-dev
@@ -15,14 +14,14 @@ Package: wmaker
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, wmaker-common (>=
0.95.0+20111028-3)
Provides: x-window-manager
-Suggests: wmaker-data, menu, x11-apps, xosview, x-terminal-emulator,
desktop-base
+Suggests: wmaker-data, menu, x11-apps, x-terminal-emulator, desktop-base
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 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.
+ 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.
Package: wmaker-common
Architecture: all
@@ -32,11 +31,11 @@ Replaces: wmaker (<< 0.95.0+20111028-3)
Breaks: wmaker (<< 0.95.0+20111028-3)
Description: Window Maker - Architecture independent files
Written by Alfredo Kojima almost from scratch, resembles the NeXTStep look
- very closely, and it is now an official GNU project. Window Maker 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.
+ 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 the architecture independent files.
@@ -45,7 +44,7 @@ Architecture: any
Section: libdevel
Depends: libwraster3 (= ${binary:Version}), libc6-dev, libx11-dev,
libxext-dev, libxpm-dev, libjpeg-dev, libpng-dev, libgif-dev,
- libtiff4-dev, ${misc:Depends}
+ libtiff5-dev, ${misc:Depends}
Provides: libwraster-dev
Description: Static libraries and headers of Window Maker rasterizer
This library is used to manipulate images and convert them to
@@ -64,12 +63,11 @@ Description: Shared libraries of Window Maker rasterizer
a format that can be displayed through the X window system.
Read the wraster.h header for an idea of what is available
-
Package: libwings-dev
Architecture: any
Section: libdevel
Depends: libc6-dev, libx11-dev, libxext-dev, libwraster3-dev, libxft-dev,
- libfontconfig1-dev, libwutil2 (= ${binary:Version}),
+ libfontconfig1-dev, libwutil3 (= ${binary:Version}),
libwings2 (= ${binary:Version}), ${misc:Depends}
Description: Window Maker's own widget set
WINGs Is Not GNUstep (WINGs) is a small widget set with the NeXTSTEP
@@ -79,7 +77,7 @@ Description: Window Maker's own widget set
or hacking something like rxvt. It is used for basic widgets in
the WindowMaker window manager.
-Package: libwutil2
+Package: libwutil3
Architecture: any
Section: libs
Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -112,7 +110,7 @@ Architecture: any
Section: debug
Priority: extra
Depends: libwraster3 (= ${binary:Version}) | libwings2 (= ${binary:Version}) |
- libwutil2 (= ${binary:Version}) | wmaker (= ${binary:Version}),
+ libwutil3 (= ${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/debianfiles/conf/WMWindowAttributes
b/debian/debianfiles/conf/WMWindowAttributes
index 626f47a..f1388c1 100644
--- a/debian/debianfiles/conf/WMWindowAttributes
+++ b/debian/debianfiles/conf/WMWindowAttributes
@@ -3,7 +3,6 @@
Logo.WMPanel = {Icon = GNUstep.tiff;};
Tile.WMClip = {Icon = clip.tiff;};
WPrefs = {Icon =
"/usr/share/lib/GNUstep/System/Applications/WPrefs.app/WPrefs.tiff";};
- WMDrawer = { Icon = Drawer.png; };
Dockit = {Icon = GNUstep.tiff;};
WMSoundServer = {Icon = Sound.tiff;};
"*" = {Icon = defaultAppIcon.tiff;};
diff --git a/debian/libwings2.symbols b/debian/libwings2.symbols
index 6697bf7..91155ff 100644
--- a/debian/libwings2.symbols
+++ b/debian/libwings2.symbols
@@ -81,7 +81,7 @@ libWINGs.so.2 libwings2 #MINVER#
WMDefaultSystemFont@Base 0.95.0
WMDeleteDragHandler@Base 0.95.0
WMDeleteEventHandler@Base 0.95.0
- WMDeleteSelectionCallback@Base 0.95.0
+#MISSING: 0.95.5-1# WMDeleteSelectionCallback@Base 0.95.0
WMDeleteSelectionHandler@Base 0.95.0
WMDeleteTextFieldRange@Base 0.95.0
WMDestroyAlertPanel@Base 0.95.0
@@ -569,11 +569,14 @@ libWINGs.so.2 libwings2 #MINVER#
W_SetPreeditPositon@Base 0.95.0
W_SetViewBackgroundColor@Base 0.95.0
W_SetViewCursor@Base 0.95.0
- W_SetXdndAwareProperty@Base 0.95.0
+#MISSING: 0.95.5-1# W_SetXdndAwareProperty@Base 0.95.0
W_TopLevelOfView@Base 0.95.0
W_UnFocusIC@Base 0.95.0
W_UnmapSubviews@Base 0.95.0
W_UnmapView@Base 0.95.0
+ W_getconf_mouseWheelDown@Base 0.95.5
+ W_getconf_mouseWheelUp@Base 0.95.5
+ W_setconf_doubleClickDelay@Base 0.95.5
_BrowserViewDelegate@Base 0.95.0
_ColorWellViewDelegate@Base 0.95.0
_ListViewDelegate@Base 0.95.0
@@ -586,21 +589,21 @@ libWINGs.so.2 libwings2 #MINVER#
_TextViewDelegate@Base 0.95.0
_WindowViewDelegate@Base 0.95.0
colorListMenuItem@Base 0.95.0
- convertCPColor@Base 0.95.0
+#MISSING: 0.95.5-1# convertCPColor@Base 0.95.0
customPaletteMenuItem@Base 0.95.0
- generateNewFilename@Base 0.95.0
- getNextRequestedDataType@Base 0.95.0
- getShift@Base 0.95.0
- getStream@Base 0.95.0
- getStreamObjects@Base 0.95.0
- makeMenuPixmap@Base 0.95.0
- requestDropData@Base 0.95.0
- requestDropDataInSelection@Base 0.95.0
- requestHandler@Base 0.95.0
+#MISSING: 0.95.5-1# generateNewFilename@Base 0.95.0
+#MISSING: 0.95.5-1# getNextRequestedDataType@Base 0.95.0
+#MISSING: 0.95.5-1# getShift@Base 0.95.0
+#MISSING: 0.95.5-1# getStream@Base 0.95.0
+#MISSING: 0.95.5-1# getStreamObjects@Base 0.95.0
+#MISSING: 0.95.5-1# makeMenuPixmap@Base 0.95.0
+#MISSING: 0.95.5-1# requestDropData@Base 0.95.0
+#MISSING: 0.95.5-1# requestDropDataInSelection@Base 0.95.0
+#MISSING: 0.95.5-1# requestHandler@Base 0.95.0
rgbColors@Base 0.95.0
- sourceOperationList@Base 0.95.0
- storeRequiredTypeList@Base 0.95.0
- ulongToRColor@Base 0.95.0
+#MISSING: 0.95.5-1# sourceOperationList@Base 0.95.0
+#MISSING: 0.95.5-1# storeRequiredTypeList@Base 0.95.0
+#MISSING: 0.95.5-1# ulongToRColor@Base 0.95.0
wmkpoint@Base 0.95.0
wmkrect@Base 0.95.0
wmksize@Base 0.95.0
diff --git a/debian/libwutil2.changelog-upstream
b/debian/libwutil2.changelog-upstream
deleted file mode 100644
index 56631ab..0000000
--- a/debian/libwutil2.changelog-upstream
+++ /dev/null
@@ -1 +0,0 @@
-ChangeLog
diff --git a/debian/libwutil2.install b/debian/libwutil2.install
deleted file mode 100644
index 9c78a3f..0000000
--- a/debian/libwutil2.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/libWUtil.so.*
diff --git a/debian/libwutil2.symbols b/debian/libwutil2.symbols
deleted file mode 100644
index 744be2b..0000000
--- a/debian/libwutil2.symbols
+++ /dev/null
@@ -1,244 +0,0 @@
-libWUtil.so.2 libwutil2 #MINVER#
- WHandleEvents@Base 0.95.0
- WMAddIdleHandler@Base 0.95.0
- WMAddInputHandler@Base 0.95.0
- WMAddNotificationObserver@Base 0.95.0
- WMAddPersistentTimerHandler@Base 0.95.0
- WMAddTimerHandler@Base 0.95.0
- WMAddToArray@Base 0.95.0
- WMAddToPLArray@Base 0.95.0
- WMAppendArray@Base 0.95.0
- WMAppendBag@Base 0.95.0
- WMAppendData@Base 0.95.0
- WMAppendDataBytes@Base 0.95.0
- WMApplication@Base 0.95.0
- WMArrayFirst@Base 0.95.0
- WMArrayLast@Base 0.95.0
- WMArrayNext@Base 0.95.0
- WMArrayPrevious@Base 0.95.0
- WMBagFirst@Base 0.95.0
- WMBagIndexForIterator@Base 0.95.0
- WMBagIteratorAtIndex@Base 0.95.0
- WMBagLast@Base 0.95.0
- WMBagNext@Base 0.95.0
- WMBagPrevious@Base 0.95.0
- WMCountHashTable@Base 0.95.0
- WMCountInArray@Base 0.95.0
- WMCountInBag@Base 0.95.0
- WMCreateArray@Base 0.95.0
- WMCreateArrayWithArray@Base 0.95.0
- WMCreateArrayWithDestructor@Base 0.95.0
- WMCreateDataWithBytes@Base 0.95.0
- WMCreateDataWithBytesNoCopy@Base 0.95.0
- WMCreateDataWithCapacity@Base 0.95.0
- WMCreateDataWithData@Base 0.95.0
- WMCreateDataWithLength@Base 0.95.0
- WMCreateHashTable@Base 0.95.0
- WMCreateNotification@Base 0.95.0
- WMCreateNotificationQueue@Base 0.95.0
- WMCreatePLArray@Base 0.95.0
- WMCreatePLData@Base 0.95.0
- WMCreatePLDataWithBytes@Base 0.95.0
- WMCreatePLDataWithBytesNoCopy@Base 0.95.0
- WMCreatePLDictionary@Base 0.95.0
- WMCreatePLString@Base 0.95.0
- WMCreatePropListFromDescription@Base 0.95.0
- WMCreateTreeBag@Base 0.95.0
- WMCreateTreeBagWithDestructor@Base 0.95.0
- WMCreateTreeNode@Base 0.95.0
- WMCreateTreeNodeWithDestructor@Base 0.95.0
- WMDataBytes@Base 0.95.0
- WMDeepCopyPropList@Base 0.95.0
- WMDeleteFromArray@Base 0.95.0
- WMDeleteFromBag@Base 0.95.0
- WMDeleteFromPLArray@Base 0.95.0
- WMDeleteIdleHandler@Base 0.95.0
- WMDeleteInputHandler@Base 0.95.0
- WMDeleteLeafForTreeNode@Base 0.95.0
- WMDeleteTimerHandler@Base 0.95.0
- WMDeleteTimerWithClientData@Base 0.95.0
- WMDequeueNotificationMatching@Base 0.95.0
- WMDestroyTreeNode@Base 0.95.0
- WMEmptyArray@Base 0.95.0
- WMEmptyBag@Base 0.95.0
- WMEnableUDPeriodicSynchronization@Base 0.95.0
- WMEnqueueCoalesceNotification@Base 0.95.0
- WMEnqueueNotification@Base 0.95.0
- WMEnumerateHashTable@Base 0.95.0
- WMEraseFromBag@Base 0.95.0
- WMFindInArray@Base 0.95.0
- WMFindInBag@Base 0.95.0
- WMFindInTree@Base 0.95.0
- WMFindInTreeWithDepthLimit@Base 0.95.0
- WMFreeArray@Base 0.95.0
- WMFreeBag@Base 0.95.0
- WMFreeHashTable@Base 0.95.0
- WMGetApplicationName@Base 0.95.0
- WMGetArrayItemCount@Base 0.95.0
- WMGetBagItemCount@Base 0.95.0
- WMGetDataBytes@Base 0.95.0
- WMGetDataBytesWithLength@Base 0.95.0
- WMGetDataBytesWithRange@Base 0.95.0
- WMGetDataForTreeNode@Base 0.95.0
- WMGetDataFormat@Base 0.95.0
- WMGetDataLength@Base 0.95.0
- WMGetDefaultNotificationQueue@Base 0.95.0
- WMGetDefaultsFromPath@Base 0.95.0
- WMGetFirstInBag@Base 0.95.0
- WMGetFromArray@Base 0.95.0
- WMGetFromBag@Base 0.95.0
- WMGetFromPLArray@Base 0.95.0
- WMGetFromPLData@Base 0.95.0
- WMGetFromPLDictionary@Base 0.95.0
- WMGetFromPLString@Base 0.95.0
- WMGetNotificationClientData@Base 0.95.0
- WMGetNotificationName@Base 0.95.0
- WMGetNotificationObject@Base 0.95.0
- WMGetPLDataBytes@Base 0.95.0
- WMGetPLDataLength@Base 0.95.0
- WMGetPLDictionaryKeys@Base 0.95.0
- WMGetParentForTreeNode@Base 0.95.0
- WMGetPropListDescription@Base 0.95.0
- WMGetPropListItemCount@Base 0.95.0
- WMGetStandardUserDefaults@Base 0.95.0
- WMGetSubarrayWithRange@Base 0.95.0
- WMGetSubdataWithRange@Base 0.95.0
- WMGetTreeNodeDepth@Base 0.95.0
- WMGetUDBoolForKey@Base 0.95.0
- WMGetUDFloatForKey@Base 0.95.0
- WMGetUDIntegerForKey@Base 0.95.0
- WMGetUDKeys@Base 0.95.0
- WMGetUDObjectForKey@Base 0.95.0
- WMGetUDSearchList@Base 0.95.0
- WMGetUDStringForKey@Base 0.95.0
- WMHashGet@Base 0.95.0
- WMHashGetItemAndKey@Base 0.95.0
- WMHashInsert@Base 0.95.0
- WMHashRemove@Base 0.95.0
- WMIncreaseDataLengthBy@Base 0.95.0
- WMInitializeApplication@Base 0.95.0
- WMInsertInArray@Base 0.95.0
- WMInsertInBag@Base 0.95.0
- WMInsertInPLArray@Base 0.95.0
- WMInsertItemInTree@Base 0.95.0
- WMInsertNodeInTree@Base 0.95.0
- WMIntHashCallbacks@Base 0.95.0
- WMIsDataEqualToData@Base 0.95.0
- WMIsPLArray@Base 0.95.0
- WMIsPLData@Base 0.95.0
- WMIsPLDictionary@Base 0.95.0
- WMIsPLString@Base 0.95.0
- WMIsPropListEqualTo@Base 0.95.0
- WMMapArray@Base 0.95.0
- WMMapBag@Base 0.95.0
- WMMergePLDictionaries@Base 0.95.0
- WMNextHashEnumeratorItem@Base 0.95.0
- WMNextHashEnumeratorItemAndKey@Base 0.95.0
- WMNextHashEnumeratorKey@Base 0.95.0
- WMPLSetCaseSensitive@Base 0.95.0
- WMPathForResourceOfType@Base 0.95.0
- WMPopFromArray@Base 0.95.0
- WMPostNotification@Base 0.95.0
- WMPostNotificationName@Base 0.95.0
- WMPutInBag@Base 0.95.0
- WMPutInPLDictionary@Base 0.95.0
- WMReadPropListFromFile@Base 0.95.0
- WMReleaseData@Base 0.95.0
- WMReleaseNotification@Base 0.95.0
- WMReleasePropList@Base 0.95.0
- WMRemoveFromArrayMatching@Base 0.95.0
- WMRemoveFromBag@Base 0.95.0
- WMRemoveFromPLArray@Base 0.95.0
- WMRemoveFromPLDictionary@Base 0.95.0
- WMRemoveLeafForTreeNode@Base 0.95.0
- WMRemoveNotificationObserver@Base 0.95.0
- WMRemoveNotificationObserverWithName@Base 0.95.0
- WMRemoveUDObjectForKey@Base 0.95.0
- WMReplaceDataBytesInRange@Base 0.95.0
- WMReplaceDataForTreeNode@Base 0.95.0
- WMReplaceInArray@Base 0.95.0
- WMReplaceInBag@Base 0.95.0
- WMResetDataBytesInRange@Base 0.95.0
- WMResetHashTable@Base 0.95.0
- WMRetainData@Base 0.95.0
- WMRetainNotification@Base 0.95.0
- WMRetainPropList@Base 0.95.0
- WMSaveUserDefaults@Base 0.95.0
- WMSetData@Base 0.95.0
- WMSetDataCapacity@Base 0.95.0
- WMSetDataFormat@Base 0.95.0
- WMSetDataLength@Base 0.95.0
- WMSetResourcePath@Base 0.95.0
- WMSetUDBoolForKey@Base 0.95.0
- WMSetUDFloatForKey@Base 0.95.0
- WMSetUDIntegerForKey@Base 0.95.0
- WMSetUDObjectForKey@Base 0.95.0
- WMSetUDSearchList@Base 0.95.0
- WMSetUDStringForKey@Base 0.95.0
- WMShallowCopyPropList@Base 0.95.0
- WMSortArray@Base 0.95.0
- WMSortBag@Base 0.95.0
- WMSortLeavesForTreeNode@Base 0.95.0
- WMSortTree@Base 0.95.0
- WMStringHashCallbacks@Base 0.95.0
- WMStringPointerHashCallbacks@Base 0.95.0
- WMSubtractPLDictionaries@Base 0.95.0
- WMSynchronizeUserDefaults@Base 0.95.0
- WMTreeWalk@Base 0.95.0
- WMUserDefaultsDidChangeNotification@Base 0.95.0
- WMWritePropListToFile@Base 0.95.0
- WMenuParserCreate@Base 0.95.4
- WMenuParserDelete@Base 0.95.4
- WMenuParserError@Base 0.95.4
- WMenuParserGetFilename@Base 0.95.4
- WMenuParserGetLine@Base 0.95.4
- WMenuParserRegisterSimpleMacro@Base 0.95.4
- W_ApplicationInitialized@Base 0.95.0
- W_CheckIdleHandlers@Base 0.95.0
- W_CheckTimerHandlers@Base 0.95.0
-#MISSING: 0.95.3-1# W_DraggingInfo@Base 0.95.0
- W_FlushASAPNotificationQueue@Base 0.95.0
- W_FlushIdleNotificationQueue@Base 0.95.0
- W_HandleInputEvents@Base 0.95.0
- W_InitNotificationCenter@Base 0.95.0
- _WINGS_progname@Base 0.95.0
- __wmessage@Base 0.95.0
- wcopy_file@Base 0.95.1
- destroyNode@Base 0.95.0
- isnamechr@Base 0.95.4
- menu_parser_define_macro@Base 0.95.4
- menu_parser_expand_macro@Base 0.95.4
- menu_parser_find_macro@Base 0.95.4
- menu_parser_free_macros@Base 0.95.4
- menu_parser_register_preset_macros@Base 0.95.4
- menu_parser_skip_spaces_and_comments@Base 0.95.4
- wdefaultspathfordomain@Base 0.95.0
- wexpandpath@Base 0.95.0
- wfindfile@Base 0.95.0
- wfindfileinarray@Base 0.95.0
- wfindfileinlist@Base 0.95.0
- wfree@Base 0.95.0
- wgethomedir@Base 0.95.0
- wglobaldefaultspathfordomain@Base 0.95.0
- wmalloc@Base 0.95.0
- wmkdirhier@Base 0.95.0
- wmkrange@Base 0.95.0
- wrealloc@Base 0.95.0
- wrelease@Base 0.95.0
- wretain@Base 0.95.0
- wrmdirhier@Base 0.95.0
- wsetabort@Base 0.95.0
- wshellquote@Base 0.95.0
- wstrappend@Base 0.95.0
- wstrconcat@Base 0.95.0
- wstrdup@Base 0.95.0
- wstrlcat@Base 0.95.0
- wstrlcpy@Base 0.95.0
- wstrndup@Base 0.95.0
- wtokenfree@Base 0.95.0
- wtokenjoin@Base 0.95.0
- wtokennext@Base 0.95.0
- wtokensplit@Base 0.95.0
- wtrimspace@Base 0.95.0
- wusergnusteppath@Base 0.95.0
- wusleep@Base 0.95.0
diff --git a/debian/libwutil3.changelog-upstream
b/debian/libwutil3.changelog-upstream
new file mode 100644
index 0000000..56631ab
--- /dev/null
+++ b/debian/libwutil3.changelog-upstream
@@ -0,0 +1 @@
+ChangeLog
diff --git a/debian/libwutil3.install b/debian/libwutil3.install
new file mode 100644
index 0000000..9c78a3f
--- /dev/null
+++ b/debian/libwutil3.install
@@ -0,0 +1 @@
+usr/lib/libWUtil.so.*
diff --git a/debian/libwutil3.symbols b/debian/libwutil3.symbols
new file mode 100644
index 0000000..0023f1b
--- /dev/null
+++ b/debian/libwutil3.symbols
@@ -0,0 +1,243 @@
+libWUtil.so.3 libwutil3 #MINVER#
+ WHandleEvents@Base 0.95.5
+ WMAddIdleHandler@Base 0.95.5
+ WMAddInputHandler@Base 0.95.5
+ WMAddNotificationObserver@Base 0.95.5
+ WMAddPersistentTimerHandler@Base 0.95.5
+ WMAddTimerHandler@Base 0.95.5
+ WMAddToArray@Base 0.95.5
+ WMAddToPLArray@Base 0.95.5
+ WMAppendArray@Base 0.95.5
+ WMAppendBag@Base 0.95.5
+ WMAppendData@Base 0.95.5
+ WMAppendDataBytes@Base 0.95.5
+ WMApplication@Base 0.95.5
+ WMArrayFirst@Base 0.95.5
+ WMArrayLast@Base 0.95.5
+ WMArrayNext@Base 0.95.5
+ WMArrayPrevious@Base 0.95.5
+ WMBagFirst@Base 0.95.5
+ WMBagIndexForIterator@Base 0.95.5
+ WMBagIteratorAtIndex@Base 0.95.5
+ WMBagLast@Base 0.95.5
+ WMBagNext@Base 0.95.5
+ WMBagPrevious@Base 0.95.5
+ WMCountHashTable@Base 0.95.5
+ WMCountInArray@Base 0.95.5
+ WMCountInBag@Base 0.95.5
+ WMCreateArray@Base 0.95.5
+ WMCreateArrayWithArray@Base 0.95.5
+ WMCreateArrayWithDestructor@Base 0.95.5
+ WMCreateDataWithBytes@Base 0.95.5
+ WMCreateDataWithBytesNoCopy@Base 0.95.5
+ WMCreateDataWithCapacity@Base 0.95.5
+ WMCreateDataWithData@Base 0.95.5
+ WMCreateDataWithLength@Base 0.95.5
+ WMCreateHashTable@Base 0.95.5
+ WMCreateNotification@Base 0.95.5
+ WMCreateNotificationQueue@Base 0.95.5
+ WMCreatePLArray@Base 0.95.5
+ WMCreatePLData@Base 0.95.5
+ WMCreatePLDataWithBytes@Base 0.95.5
+ WMCreatePLDataWithBytesNoCopy@Base 0.95.5
+ WMCreatePLDictionary@Base 0.95.5
+ WMCreatePLString@Base 0.95.5
+ WMCreatePropListFromDescription@Base 0.95.5
+ WMCreateTreeBag@Base 0.95.5
+ WMCreateTreeBagWithDestructor@Base 0.95.5
+ WMCreateTreeNode@Base 0.95.5
+ WMCreateTreeNodeWithDestructor@Base 0.95.5
+ WMDataBytes@Base 0.95.5
+ WMDeepCopyPropList@Base 0.95.5
+ WMDeleteFromArray@Base 0.95.5
+ WMDeleteFromBag@Base 0.95.5
+ WMDeleteFromPLArray@Base 0.95.5
+ WMDeleteIdleHandler@Base 0.95.5
+ WMDeleteInputHandler@Base 0.95.5
+ WMDeleteLeafForTreeNode@Base 0.95.5
+ WMDeleteTimerHandler@Base 0.95.5
+ WMDeleteTimerWithClientData@Base 0.95.5
+ WMDequeueNotificationMatching@Base 0.95.5
+ WMDestroyTreeNode@Base 0.95.5
+ WMEmptyArray@Base 0.95.5
+ WMEmptyBag@Base 0.95.5
+ WMEnableUDPeriodicSynchronization@Base 0.95.5
+ WMEnqueueCoalesceNotification@Base 0.95.5
+ WMEnqueueNotification@Base 0.95.5
+ WMEnumerateHashTable@Base 0.95.5
+ WMEraseFromBag@Base 0.95.5
+ WMFindInArray@Base 0.95.5
+ WMFindInBag@Base 0.95.5
+ WMFindInTree@Base 0.95.5
+ WMFindInTreeWithDepthLimit@Base 0.95.5
+ WMFreeArray@Base 0.95.5
+ WMFreeBag@Base 0.95.5
+ WMFreeHashTable@Base 0.95.5
+ WMGetApplicationName@Base 0.95.5
+ WMGetArrayItemCount@Base 0.95.5
+ WMGetBagItemCount@Base 0.95.5
+ WMGetDataBytes@Base 0.95.5
+ WMGetDataBytesWithLength@Base 0.95.5
+ WMGetDataBytesWithRange@Base 0.95.5
+ WMGetDataForTreeNode@Base 0.95.5
+ WMGetDataFormat@Base 0.95.5
+ WMGetDataLength@Base 0.95.5
+ WMGetDefaultNotificationQueue@Base 0.95.5
+ WMGetDefaultsFromPath@Base 0.95.5
+ WMGetFirstInBag@Base 0.95.5
+ WMGetFromArray@Base 0.95.5
+ WMGetFromBag@Base 0.95.5
+ WMGetFromPLArray@Base 0.95.5
+ WMGetFromPLData@Base 0.95.5
+ WMGetFromPLDictionary@Base 0.95.5
+ WMGetFromPLString@Base 0.95.5
+ WMGetNotificationClientData@Base 0.95.5
+ WMGetNotificationName@Base 0.95.5
+ WMGetNotificationObject@Base 0.95.5
+ WMGetPLDataBytes@Base 0.95.5
+ WMGetPLDataLength@Base 0.95.5
+ WMGetPLDictionaryKeys@Base 0.95.5
+ WMGetParentForTreeNode@Base 0.95.5
+ WMGetPropListDescription@Base 0.95.5
+ WMGetPropListItemCount@Base 0.95.5
+ WMGetStandardUserDefaults@Base 0.95.5
+ WMGetSubarrayWithRange@Base 0.95.5
+ WMGetSubdataWithRange@Base 0.95.5
+ WMGetTreeNodeDepth@Base 0.95.5
+ WMGetUDBoolForKey@Base 0.95.5
+ WMGetUDFloatForKey@Base 0.95.5
+ WMGetUDIntegerForKey@Base 0.95.5
+ WMGetUDKeys@Base 0.95.5
+ WMGetUDObjectForKey@Base 0.95.5
+ WMGetUDSearchList@Base 0.95.5
+ WMGetUDStringForKey@Base 0.95.5
+ WMHashGet@Base 0.95.5
+ WMHashGetItemAndKey@Base 0.95.5
+ WMHashInsert@Base 0.95.5
+ WMHashRemove@Base 0.95.5
+ WMIncreaseDataLengthBy@Base 0.95.5
+ WMInitializeApplication@Base 0.95.5
+ WMInsertInArray@Base 0.95.5
+ WMInsertInBag@Base 0.95.5
+ WMInsertInPLArray@Base 0.95.5
+ WMInsertItemInTree@Base 0.95.5
+ WMInsertNodeInTree@Base 0.95.5
+ WMIntHashCallbacks@Base 0.95.5
+ WMIsDataEqualToData@Base 0.95.5
+ WMIsPLArray@Base 0.95.5
+ WMIsPLData@Base 0.95.5
+ WMIsPLDictionary@Base 0.95.5
+ WMIsPLString@Base 0.95.5
+ WMIsPropListEqualTo@Base 0.95.5
+ WMMapArray@Base 0.95.5
+ WMMapBag@Base 0.95.5
+ WMMergePLDictionaries@Base 0.95.5
+ WMNextHashEnumeratorItem@Base 0.95.5
+ WMNextHashEnumeratorItemAndKey@Base 0.95.5
+ WMNextHashEnumeratorKey@Base 0.95.5
+ WMPLSetCaseSensitive@Base 0.95.5
+ WMPathForResourceOfType@Base 0.95.5
+ WMPopFromArray@Base 0.95.5
+ WMPostNotification@Base 0.95.5
+ WMPostNotificationName@Base 0.95.5
+ WMPutInBag@Base 0.95.5
+ WMPutInPLDictionary@Base 0.95.5
+ WMReadPropListFromFile@Base 0.95.5
+ WMReadPropListFromPipe@Base 0.95.5
+ WMReleaseData@Base 0.95.5
+ WMReleaseNotification@Base 0.95.5
+ WMReleasePropList@Base 0.95.5
+ WMRemoveFromArrayMatching@Base 0.95.5
+ WMRemoveFromBag@Base 0.95.5
+ WMRemoveFromPLArray@Base 0.95.5
+ WMRemoveFromPLDictionary@Base 0.95.5
+ WMRemoveLeafForTreeNode@Base 0.95.5
+ WMRemoveNotificationObserver@Base 0.95.5
+ WMRemoveNotificationObserverWithName@Base 0.95.5
+ WMRemoveUDObjectForKey@Base 0.95.5
+ WMReplaceDataBytesInRange@Base 0.95.5
+ WMReplaceDataForTreeNode@Base 0.95.5
+ WMReplaceInArray@Base 0.95.5
+ WMReplaceInBag@Base 0.95.5
+ WMResetDataBytesInRange@Base 0.95.5
+ WMResetHashTable@Base 0.95.5
+ WMRetainData@Base 0.95.5
+ WMRetainNotification@Base 0.95.5
+ WMRetainPropList@Base 0.95.5
+ WMSaveUserDefaults@Base 0.95.5
+ WMSetData@Base 0.95.5
+ WMSetDataCapacity@Base 0.95.5
+ WMSetDataFormat@Base 0.95.5
+ WMSetDataLength@Base 0.95.5
+ WMSetResourcePath@Base 0.95.5
+ WMSetUDBoolForKey@Base 0.95.5
+ WMSetUDFloatForKey@Base 0.95.5
+ WMSetUDIntegerForKey@Base 0.95.5
+ WMSetUDObjectForKey@Base 0.95.5
+ WMSetUDSearchList@Base 0.95.5
+ WMSetUDStringForKey@Base 0.95.5
+ WMShallowCopyPropList@Base 0.95.5
+ WMSortArray@Base 0.95.5
+ WMSortBag@Base 0.95.5
+ WMSortLeavesForTreeNode@Base 0.95.5
+ WMSortTree@Base 0.95.5
+ WMStringHashCallbacks@Base 0.95.5
+ WMStringPointerHashCallbacks@Base 0.95.5
+ WMSubtractPLDictionaries@Base 0.95.5
+ WMSynchronizeUserDefaults@Base 0.95.5
+ WMTreeWalk@Base 0.95.5
+ WMUserDefaultsDidChangeNotification@Base 0.95.5
+ WMWritePropListToFile@Base 0.95.5
+ WMenuParserCreate@Base 0.95.5
+ WMenuParserDelete@Base 0.95.5
+ WMenuParserError@Base 0.95.5
+ WMenuParserGetFilename@Base 0.95.5
+ WMenuParserGetLine@Base 0.95.5
+ WMenuParserRegisterSimpleMacro@Base 0.95.5
+ W_ApplicationInitialized@Base 0.95.5
+ W_CheckIdleHandlers@Base 0.95.5
+ W_CheckTimerHandlers@Base 0.95.5
+ W_FlushASAPNotificationQueue@Base 0.95.5
+ W_FlushIdleNotificationQueue@Base 0.95.5
+ W_HandleInputEvents@Base 0.95.5
+ W_InitNotificationCenter@Base 0.95.5
+ _WINGS_progname@Base 0.95.5
+ __wmessage@Base 0.95.5
+ isnamechr@Base 0.95.5
+ menu_parser_define_macro@Base 0.95.5
+ menu_parser_expand_macro@Base 0.95.5
+ menu_parser_find_macro@Base 0.95.5
+ menu_parser_free_macros@Base 0.95.5
+ menu_parser_register_preset_macros@Base 0.95.5
+ menu_parser_skip_spaces_and_comments@Base 0.95.5
+ wcopy_file@Base 0.95.5
+ wdefaultspathfordomain@Base 0.95.5
+ wexpandpath@Base 0.95.5
+ wfindfile@Base 0.95.5
+ wfindfileinarray@Base 0.95.5
+ wfindfileinlist@Base 0.95.5
+ wfree@Base 0.95.5
+ wgethomedir@Base 0.95.5
+ wglobaldefaultspathfordomain@Base 0.95.5
+ wmalloc@Base 0.95.5
+ wmkdirhier@Base 0.95.5
+ wmkrange@Base 0.95.5
+ wrealloc@Base 0.95.5
+ wrelease@Base 0.95.5
+ wretain@Base 0.95.5
+ wrmdirhier@Base 0.95.5
+ wsetabort@Base 0.95.5
+ wshellquote@Base 0.95.5
+ wstrappend@Base 0.95.5
+ wstrconcat@Base 0.95.5
+ wstrdup@Base 0.95.5
+ wstrlcat@Base 0.95.5
+ wstrlcpy@Base 0.95.5
+ wstrndup@Base 0.95.5
+ wtokenfree@Base 0.95.5
+ wtokenjoin@Base 0.95.5
+ wtokennext@Base 0.95.5
+ wtokensplit@Base 0.95.5
+ wtrimspace@Base 0.95.5
+ wusergnusteppath@Base 0.95.5
+ wusleep@Base 0.95.5
diff --git a/debian/patches/50_def_config_paths.diff
b/debian/patches/50_def_config_paths.diff
index 230fe03..10fa140 100644
--- a/debian/patches/50_def_config_paths.diff
+++ b/debian/patches/50_def_config_paths.diff
@@ -1,16 +1,14 @@
Description: This patch changes the default config paths
Author: Andreas Metzler <[email protected]>
Last-Update: 2010-08-07
-diff --git a/src/wconfig.h.in b/src/wconfig.h.in
-index c8bb947..cf06113 100644
--- a/src/wconfig.h.in
+++ b/src/wconfig.h.in
-@@ -132,7 +132,7 @@
+@@ -125,7 +125,7 @@
*/
-
+
/* list of paths to look for the config files, searched in order of
appearance */
-#define DEF_CONFIG_PATHS "~/GNUstep/Library/WindowMaker:"PKGDATADIR
+#define DEF_CONFIG_PATHS
"~/GNUstep/Library/WindowMaker:/etc/GNUstep/Defaults:"PKGDATADIR
#define DEF_MENU_FILE "menu"
-
+
/* name of the script to execute at startup */
diff --git a/debian/patches/55_typo.diff b/debian/patches/55_typo.diff
new file mode 100644
index 0000000..2c93e97
--- /dev/null
+++ b/debian/patches/55_typo.diff
@@ -0,0 +1,15 @@
+Description: Small typo for the word attempts in src/dock.h.
+Author: Rodolfo García Peñas (kix) <[email protected]>
+Forwarded: http://lists.windowmaker.org/dev/msg05381.html
+Last-Update: 2013-09-09
+--- a/src/dock.c
++++ b/src/dock.c
+@@ -4284,7 +4284,7 @@
+ }
+
+ if (i == UNIQUE_NAME_WATCHDOG)
+- wwarning("Couldn't find a unique name for drawer in %d
attemps.", i);
++ wwarning("Couldn't find a unique name for drawer in %d
attempts.", i);
+ #undef UNIQUE_NAME_WATCHDOG
+
+ return buffer;
diff --git a/debian/patches/series b/debian/patches/series
index 4312216..093bbcc 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@
51_wmaker_man.diff
53_Debian_WMState.diff
54_Debian_wmmacros.diff
+55_typo.diff
diff --git a/debian/source/lintian-overrides b/debian/source/lintian-overrides
deleted file mode 100644
index 355afa2..0000000
--- a/debian/source/lintian-overrides
+++ /dev/null
@@ -1,3 +0,0 @@
-# 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
diff --git a/debian/source/options b/debian/source/options
index 83f51bb..e9adc41 100644
--- a/debian/source/options
+++ b/debian/source/options
@@ -1,2 +1,2 @@
# Don't store changes on autogenerated files
-extend-diff-ignore =
"(^|/)(config\.sub|config\.guess|Makefile|configure|Makefile\.in|aclocal.m4|config.h.in|depcomp|INSTALL|install-sh|ltmain.sh|missing||libtool.m4|lt~obsolete.m4|ltoptions.m4|ltsugar.m4|ltversion.m4|.Po|WMRootMenu)$"
+extend-diff-ignore =
"(^|/)(compile|config\.sub|config\.guess|Makefile|configure|Makefile\.in|aclocal.m4|config.h.in|depcomp|INSTALL|install-sh|ltmain.sh|missing||libtool.m4|lt~obsolete.m4|ltoptions.m4|ltsugar.m4|ltversion.m4|.Po|WMRootMenu)$"
diff --git a/debian/wmaker-common.postinst b/debian/wmaker-common.postinst
index 8e02320..63ca577 100644
--- a/debian/wmaker-common.postinst
+++ b/debian/wmaker-common.postinst
@@ -6,7 +6,7 @@ set -e
# Marcelo Magallon <[email protected]>
# Rodolfo "kix" García <[email protected]>
-inst="/etc/menu-methods/wmaker /etc/menu-methods/wmappearance"
+inst="/etc/menu-methods/wmappearance"
case "$1" in
configure)
diff --git a/debian/wmaker.postinst b/debian/wmaker.postinst
index d215fc0..d3f1d39 100644
--- a/debian/wmaker.postinst
+++ b/debian/wmaker.postinst
@@ -9,8 +9,16 @@ set -e
x_wm_link=/etc/alternatives/x-window-manager
x_wm_man_link=/usr/share/man/man1/x-window-manager.1.gz
+inst="/etc/menu-methods/wmaker"
+
case "$1" in
configure)
+ for file in $inst ; do
+ if [ -f $file ] ; then
+ chmod a+x $file
+ fi
+ done
+
update-alternatives --install /usr/bin/x-window-manager \
x-window-manager /usr/bin/wmaker 50 \
--slave /usr/share/man/man1/x-window-manager.1.gz \
diff --git a/doc/wmaker.1x b/doc/wmaker.1x
index cfa8405..d7d4ee1 100644
--- a/doc/wmaker.1x
+++ b/doc/wmaker.1x
@@ -9,6 +9,9 @@ wmaker \- X11 window manager with a NEXTSTEP look
Window Maker is a X11 window manager with a NEXTSTEP look. It tries to
emulate NeXT's look as much as possible, but it deviates from it as
necessary.
+.PP
+\fIPlease note this manpage has been modified to reflect changes in the
+Debian installation of Window Maker.\fP
.SH "OPTIONS"
.TP
.B \-display host:display.screen
@@ -78,7 +81,7 @@ Attribute Editor (right drag the application's title bar,
select
Attributes) instead of modifying this file directly. There are just a
few options not available using the Attributes Editor.
.TP
-.B /usr/share/WindowMaker/Defaults/
+.B /etc/GNUstep/Defaults/
All the above-mentioned files are READ from here if not found except
for WMState, which is COPIED from here. No matter where they are read
from, if it's necessary to write configuration changes back into this
@@ -106,6 +109,9 @@ and here, in that order. Unless, the indicated path is an
absolute path.
.B ~/GNUstep/Library/WindowMaker/Pixmaps/
Window Maker looks for \fBpixmaps\fP here
.TP
+.B ~/GNUstep/Library/Icons/
+Window Maker looks for \fBicons\fP here
+.TP
.B ~/GNUstep/Library/WindowMaker/Backgrounds/
Window Maker looks for backgrounds here
.TP
diff --git a/src/dock.c b/src/dock.c
index 69bebde..fd45c1e 100644
--- a/src/dock.c
+++ b/src/dock.c
@@ -4284,7 +4284,7 @@ static char * findUniqueName(WScreen *scr, const char
*instance_basename)
}
if (i == UNIQUE_NAME_WATCHDOG)
- wwarning("Couldn't find a unique name for drawer in %d
attemps.", i);
+ wwarning("Couldn't find a unique name for drawer in %d
attempts.", i);
#undef UNIQUE_NAME_WATCHDOG
return buffer;
diff --git a/src/wconfig.h.in b/src/wconfig.h.in
index c2a79a3..81e65fc 100644
--- a/src/wconfig.h.in
+++ b/src/wconfig.h.in
@@ -125,7 +125,7 @@
*/
/* list of paths to look for the config files, searched in order of appearance
*/
-#define DEF_CONFIG_PATHS "~/GNUstep/Library/WindowMaker:"PKGDATADIR
+#define DEF_CONFIG_PATHS
"~/GNUstep/Library/WindowMaker:/etc/GNUstep/Defaults:"PKGDATADIR
#define DEF_MENU_FILE "menu"
/* name of the script to execute at startup */
--
1.8.4.rc3
--
To unsubscribe, send mail to [email protected].
