--- Begin Message ---
--
||// //\\// Rodolfo "kix" Garcia
||\\// //\\ http://www.kix.es/
>From 99e789e6eac87579fda84614e63e9715038e89ca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?"Rodolfo=20Garc=C3=ADa=20Pe=C3=B1as=20(kix)"?= <[email protected]>
Date: Tue, 13 Nov 2012 01:16:43 +0100
Subject: [PATCH] Debian: Files for new version 0.95.4
Changes in the debian folder for the new version 0.95.4.
---
debian/README.Debian | 15 ++++--
debian/changelog | 16 ++++--
debian/control | 20 +++----
debian/debianfiles/conf/WMWindowAttributes | 5 +-
debian/debianfiles/menu/wmappearance | 28 +++++-----
debian/libwutil2.symbols | 26 ++++-----
debian/patches/50_def_config_paths.diff | 8 ++-
debian/rules | 1 +
debian/wmaker-dbg.dirs | 1 -
debian/wmaker.menu-method | 79 ++++++++++++++--------------
10 files changed, 103 insertions(+), 96 deletions(-)
delete mode 100644 debian/wmaker-dbg.dirs
diff --git a/debian/README.Debian b/debian/README.Debian
index a20cb47..0f0b658 100644
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -134,20 +134,25 @@ IconPath. The compiled in defaults are:
PixmapPath = (
"~/GNUstep/Library/WindowMaker/Pixmaps",
"~/GNUstep/Library/WindowMaker/Backgrounds",
- "/usr/local/share/WindowMaker/Pixmaps",
- "/usr/local/share/WindowMaker/Backgrounds",
+ "~/GNUstep/Library/WindowMaker/CachedPixmaps",
"/usr/share/WindowMaker/Backgrounds",
"/usr/share/WindowMaker/Pixmaps",
- "/usr/local/share/pixmaps",
"/usr/share/pixmaps",
+ "/usr/local/share/WindowMaker/Pixmaps",
+ "/usr/local/share/WindowMaker/Backgrounds",
+ "/usr/local/share/pixmaps"
);
IconPath = (
"~/GNUstep/Library/Icons",
- "/usr/local/share/WindowMaker/Icons",
+ "~/GNUstep/Library/WindowMaker/Pixmaps",
+ "~/GNUstep/Library/WindowMaker/CachedPixmaps",
"/usr/share/WindowMaker/Icons",
- "/usr/local/share/icons",
+ "/usr/share/WindowMaker/Pixmaps",
"/usr/share/icons",
+ "/usr/local/share/WindowMaker/Icons",
+ "/usr/local/share/WindowMaker/Pixmaps",
+ "/usr/local/share/icons"
);
Please note that the internal default doesn't include the "Pixmaps"
diff --git a/debian/changelog b/debian/changelog
index 9833614..81c69ca 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,24 +1,30 @@
-wmaker (0.95.3+20120825-1) experimental; urgency=low
+wmaker (0.95.4-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)
+ * New upstream version
- 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
+ - Added user cache pixmap folder
- Removed ~/pixmap folder
+ - Default icon for Dock is now GNUstepGlow.tiff.
* 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
+ - Deleted debian/wmaker-dbg.dirs because the folder
+ /usr/lib/debug/usr/WindowMaker is no longer needed.
+ - Added the word "WindowMaker" to find it with apt* search.
+ [Closes: #685424]
* debian/rules:
- Removed the get-*-flags scripts fix. Not needed (and was wrong).
- Removed the HOSTSPEC stuff. Not needed with debconf 9.
+ * menu-methods (debianfiles/menu/wmappearance and debian/wmaker.menu-method)
+ are now menu version 2.
- -- Rodolfo García Peñas (kix) <[email protected]> Sun, 9 Sep 2012 11:07:21 +0200
+ -- Rodolfo García Peñas (kix) <[email protected]> Mon, 12 Nov 2012 23:43:42 +0100
wmaker (0.95.3-2) unstable; urgency=low
diff --git a/debian/control b/debian/control
index 6c67a7a..fb815b3 100644
--- a/debian/control
+++ b/debian/control
@@ -18,11 +18,11 @@ Provides: x-window-manager
Suggests: wmaker-data, menu, x11-apps, xosview, 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 (previously
+ 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 +32,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 (previously
+ 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.
diff --git a/debian/debianfiles/conf/WMWindowAttributes b/debian/debianfiles/conf/WMWindowAttributes
index f1388c1..a461f26 100644
--- a/debian/debianfiles/conf/WMWindowAttributes
+++ b/debian/debianfiles/conf/WMWindowAttributes
@@ -1,10 +1,10 @@
{
- Logo.WMDock = {Icon = GNUstep.tiff;};
+ Logo.WMDock = {Icon = GNUstepGlow.tiff;};
Logo.WMPanel = {Icon = GNUstep.tiff;};
Tile.WMClip = {Icon = clip.tiff;};
+ Logo.WMClip = {Icon = clip.tiff;};
WPrefs = {Icon = "/usr/share/lib/GNUstep/System/Applications/WPrefs.app/WPrefs.tiff";};
Dockit = {Icon = GNUstep.tiff;};
- WMSoundServer = {Icon = Sound.tiff;};
"*" = {Icon = defaultAppIcon.tiff;};
Rxvt = {Icon = GNUterm.tiff;};
KTerm = {Icon = GNUterm.tiff;};
@@ -52,5 +52,4 @@
preferences.Gimp = {Icon = "wmaker-gimp-prefs.tif";AlwaysUserIcon = Yes;};
panel = {NoAppIcon = Yes;};
gmc = {NoAppIcon = Yes;Omnipresent = Yes;SkipWindowList = Yes;};
- Logo.WMClip = {Icon = clip.tiff;};
}
diff --git a/debian/debianfiles/menu/wmappearance b/debian/debianfiles/menu/wmappearance
index 230a656..57c54a5 100644
--- a/debian/debianfiles/menu/wmappearance
+++ b/debian/debianfiles/menu/wmappearance
@@ -1,26 +1,26 @@
#!/usr/bin/install-menu
#
# Generates the Window Maker Appereance menu
-compat="menu-1"
+compat="menu-2"
#!include menu.h
-genmenu="appearance.menu"
-rootprefix="/etc/GNUstep/Defaults"
-userprefix=shell("echo -n /${GNUSTEP_USER_ROOT-GNUstep}") "/Library/WindowMaker"
-treewalk=(M)
+genmenu="appearance.menu";
+rootprefix="/etc/GNUstep/Defaults";
+userprefix=shell("echo -n /${GNUSTEP_USER_ROOT-GNUstep}") "/Library/WindowMaker";
+treewalk=(M);
-supported
-wmappearance = " \"" $title "\" " $command "\n"
-endsupported
+supported;
+wmappearance = " \"" $title "\" " $command "\n";
+endsupported;
# Please note that items should specify "section=Appearance"
-preoutput="/* Automatically generated file. Do not edit. */\n\n#include \"wmmacros\"\n\n"
+preoutput="/* Automatically generated file. Do not edit. */\n\n#include \"wmmacros\"\n\n";
-postoutput="\n"
+postoutput="\n";
-mainmenutitle=""
-submenutitle= ""
-startmenu= ifnempty ($title, $title " MENU \n")
-endmenu= ifnempty ($title, $title " END \n")
+mainmenutitle="";
+submenutitle= "";
+startmenu= ifnempty ($title, $title " MENU \n");
+endmenu= ifnempty ($title, $title " END \n");
diff --git a/debian/libwutil2.symbols b/debian/libwutil2.symbols
index 22b1305..744be2b 100644
--- a/debian/libwutil2.symbols
+++ b/debian/libwutil2.symbols
@@ -187,12 +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
+ 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
@@ -205,13 +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
+ 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
diff --git a/debian/patches/50_def_config_paths.diff b/debian/patches/50_def_config_paths.diff
index 230fe03..ccd58cc 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 @@
+@@ -127,7 +127,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/rules b/debian/rules
index 74dd692..00404a2 100644
--- a/debian/rules
+++ b/debian/rules
@@ -59,6 +59,7 @@ override_dh_install:
cp WPrefs.app/po/README $(DEBIAN_TMP)/README.WPrefs.po
# Now, change the #wmdatadir# string to $(WMSHAREDIR)
+ # Upstream change it in wmaker.inst script, we do it here, building the package
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
diff --git a/debian/wmaker-dbg.dirs b/debian/wmaker-dbg.dirs
deleted file mode 100644
index f4d025b..0000000
--- a/debian/wmaker-dbg.dirs
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/debug/usr/lib/WindowMaker
diff --git a/debian/wmaker.menu-method b/debian/wmaker.menu-method
index 4c1bd33..bcd0e64 100644
--- a/debian/wmaker.menu-method
+++ b/debian/wmaker.menu-method
@@ -3,43 +3,42 @@
# Generates Window Maker menus for all registered applications.
!include menu.h
-compat="menu-1";
-outputencoding="UTF-8"
-outputlanguage="C"
-
-genmenu="menu.hook"
-rootprefix="/etc/GNUstep/Defaults"
-userprefix=shell("echo -n /${GNUSTEP_USER_ROOT-GNUstep}") "/Library/WindowMaker/"
-treewalk="(M)"
-rootsection="/Debian"
-
-function mytitle()=replacewith(title(),"\"","'")
-
-function exec($action,$com)= \
- " \"" translate(,mytitle()) "\" " ifnempty($shortcut, "SHORTCUT " $shortcut " ") $action " " esc($com,"*") "\n"
-
-supported
-x11= exec("SHEXEC",$command)
-wm= exec("RESTART",$command)
-text= exec("SHEXEC",term())
-wmaker= exec("",$command ifnempty($arg," " $arg))
-endsupported
-
-preoutput= "/* Automatically generated file. Do not edit (see /usr/share/doc/menu/menu.txt.gz) */\n\n#include \"wmmacros\"\n"
-
-mainmenutitle=""
-submenutitle= ""
-
-startmenu= "\n" \
- ifelse( \
- title(), \
- ifneq(mytitle(), "Applications", "\"" translate(,mytitle()) "\" MENU"), \
- "Debian MENU\n\n" \
- ) \
- "\n"
-endmenu= ifelse( \
- title(), \
- ifneq(mytitle(), "Applications", "\"" translate(,mytitle()) "\" END"), \
- "\n\nDebian END" \
- ) \
- "\n"
+compat="menu-2"
+outputencoding="UTF-8";
+outputlanguage="C";
+
+genmenu="menu.hook";
+rootprefix="/etc/GNUstep/Defaults";
+userprefix=shell("echo -n /${GNUSTEP_USER_ROOT-GNUstep}") "/Library/WindowMaker/";
+treewalk="(M)";
+rootsection="/Debian";
+
+function mytitle()=replacewith(title(),"\"","'");
+
+function exec($action,$com)= " \"" translate(,mytitle()) "\" " ifnempty($shortcut, "SHORTCUT " $shortcut " ") $action " " esc($com,"*") "\n";
+
+supported;
+x11= exec("SHEXEC",$command);
+wm= exec("RESTART",$command);
+text= exec("SHEXEC",term());
+wmaker= exec("",$command ifnempty($arg," " $arg));
+endsupported;
+
+preoutput= "/* Automatically generated file. Do not edit (see /usr/share/doc/menu/menu.txt.gz) */\n\n#include \"wmmacros\"\n";
+
+mainmenutitle="";
+submenutitle= "";
+
+startmenu= "\n"
+ ifelse(
+ title(),
+ ifneq(mytitle(), "Applications", "\"" translate(,mytitle()) "\" MENU"),
+ "Debian MENU\n\n"
+ )
+ "\n";
+endmenu= ifelse(
+ title(),
+ ifneq(mytitle(), "Applications", "\"" translate(,mytitle()) "\" END"),
+ "\n\nDebian END"
+ )
+ "\n";
--
1.7.10.4
--- End Message ---
