This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project wmaker-crm.git.
The branch, next has been updated
via a81c8f997f16c5a56bc3160767a80cb53d24a7fa (commit)
from a97699c513528f3e52d6af1c3b304f5b555041c2 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://repo.or.cz/w/wmaker-crm.git/commit/a81c8f997f16c5a56bc3160767a80cb53d24a7fa
commit a81c8f997f16c5a56bc3160767a80cb53d24a7fa
Author: Rodolfo GarcÃa Peñas (kix) <k...@kix.es>
Date: Wed Feb 22 13:11:46 2012 +0100
debian: Remove /etc/X11/WindowMaker folder
The path /etc/X11/WindowMaker is not needed now. The files were
deleted or moved to /usr/share/WindowMaker. Some files were the
same in /etc/X11/WindowMaker and /usr/share/WindowMaker.
The configuration file menu.hook is moved to /etc/GNUstep/Defaults
Duplicated:
- wmmacros
- appearence.menu (copied & generated).
- background.menu
Removed:
- menu.prehook
- menu.posthook
Moved:
- menu.hook (generated).
diff --git a/debian/changelog b/debian/changelog
index 72dab3c..56031d3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
+wmaker (0.95.2-1+git-1) unstable; urgency=low
+
+ * Patch 53_Debian_WMState.diff changed, because the WMState file
+ in upstream is now different. Now, the dock launch WPrefs.
+ * Removed /etc/X11/WindowMaker files.
+ * Removed from debian/wmaker-common.dirs
+ * Removed (duplicated) files in debian/wmaker-common.install
+ * New path for menu.hook: /usr/share/WindowMaker
+ * Changed in the menu-method files (wmaker and wmappearance.
+ * Removed menu.posthook and menu.prehook.
+
+ -- Rodolfo GarcÃa Peñas (kix) <k...@kix.es> Tue, 21 Feb 2012 21:32:31 +0100
+
wmaker (0.95.2-1) unstable; urgency=low
* New upstream version 0.95.2 [Closes: #69669, #486542, #270877]
diff --git a/debian/debianfiles/menu/menu.posthook
b/debian/debianfiles/menu/menu.posthook
deleted file mode 100644
index e69de29..0000000
diff --git a/debian/debianfiles/menu/menu.prehook
b/debian/debianfiles/menu/menu.prehook
deleted file mode 100644
index e69de29..0000000
diff --git a/debian/debianfiles/menu/wmappearance
b/debian/debianfiles/menu/wmappearance
index e12c6ff..230a656 100644
--- a/debian/debianfiles/menu/wmappearance
+++ b/debian/debianfiles/menu/wmappearance
@@ -6,7 +6,7 @@ compat="menu-1"
#!include menu.h
genmenu="appearance.menu"
-rootprefix="/etc/X11/WindowMaker"
+rootprefix="/etc/GNUstep/Defaults"
userprefix=shell("echo -n /${GNUSTEP_USER_ROOT-GNUstep}")
"/Library/WindowMaker"
treewalk=(M)
diff --git a/debian/patches/53_Debian_WMState.diff
b/debian/patches/53_Debian_WMState.diff
index 382e718..5679b39 100644
--- a/debian/patches/53_Debian_WMState.diff
+++ b/debian/patches/53_Debian_WMState.diff
@@ -3,8 +3,17 @@ Author: Rodolfo GarcÃa Peñas (kix) <k...@kix.es>
Last-Update: 2012-01-09
--- a/WindowMaker/Defaults/WMState.in
+++ b/WindowMaker/Defaults/WMState.in
-@@ -10,14 +10,14 @@
- DropCommand = "wmsetbg -u -t %d";
+@@ -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;
@@ -14,10 +23,3 @@ Last-Update: 2012-01-09
AutoLaunch = No;
Forced = No;
Position = "0,1";
- },
- {
-- Command = "#wprefs#";
-+ Command = "/usr/bin/WPrefs";
- Name = groupLeader.WPrefs;
- AutoLaunch = No;
- Forced = No;
diff --git a/debian/wmaker-common.dirs b/debian/wmaker-common.dirs
index c972bdc..35d9727 100644
--- a/debian/wmaker-common.dirs
+++ b/debian/wmaker-common.dirs
@@ -1,6 +1,5 @@
etc/menu-methods
etc/GNUstep/Defaults
-etc/X11/WindowMaker
usr/bin
usr/sbin
usr/share/doc/wmaker
diff --git a/debian/wmaker-common.install b/debian/wmaker-common.install
index 0970afe..0e71c16 100644
--- a/debian/wmaker-common.install
+++ b/debian/wmaker-common.install
@@ -129,8 +129,6 @@
usr/share/lib/GNUstep/System/Applications/WPrefs.app/tiff/*.tiff
debian/debianfiles/wmaker usr/bin
debian/debianfiles/upgrade-windowmaker-defaults usr/sbin
# Theme
-debian/debianfiles/menu/menu.prehook etc/X11/WindowMaker
-debian/debianfiles/menu/menu.posthook etc/X11/WindowMaker
debian/debianfiles/Theme/Debian
usr/share/WindowMaker/Themes
debian/debianfiles/Theme/debian.tiff
usr/share/WindowMaker/Backgrounds
# Configuration
@@ -140,11 +138,8 @@ debian/debianfiles/conf/WMWindowAttributes
etc/GNUstep/Defaults
debian/debianfiles/conf/WMRootMenu etc/GNUstep/Defaults
debian/debianfiles/conf/WindowMaker etc/GNUstep/Defaults
debian/debianfiles/wmaker-common.desktop usr/share/xsessions
-usr/share/WindowMaker/wmmacros etc/X11/WindowMaker
# Menu
debian/debianfiles/menu/wmappearance etc/menu-methods
-WindowMaker/appearance.menu etc/X11/WindowMaker
-WindowMaker/background.menu etc/X11/WindowMaker
# READMES, from the temporal path (see README section in debian/rules)
README.po usr/share/doc/wmaker
README.definable-cursor usr/share/doc/wmaker
diff --git a/debian/wmaker.menu-method b/debian/wmaker.menu-method
index 71158cd..5fc9195 100644
--- a/debian/wmaker.menu-method
+++ b/debian/wmaker.menu-method
@@ -7,7 +7,7 @@ compat="menu-1";
outputencoding="UTF-8"
genmenu="menu.hook"
-rootprefix="/etc/X11/WindowMaker/"
+rootprefix="/etc/GNUstep/Defaults"
userprefix=shell("echo -n /${GNUSTEP_USER_ROOT-GNUstep}")
"/Library/WindowMaker/"
treewalk="(M)"
rootsection="/Debian"
@@ -34,12 +34,12 @@ startmenu= "n" ifelse(
title(), """ mytitle() "" MENU", - "Debian
MENUnn#include <menu.prehook>" + "Debian MENUnn" )
"n"
endmenu= ifelse( title(), """ mytitle() ""
END", - "n#include <menu.posthook>nnDebian END" +
"nnDebian END" ) "n"
-----------------------------------------------------------------------
Summary of changes:
debian/changelog | 13 +++++++++++++
debian/debianfiles/menu/wmappearance | 2 +-
debian/patches/53_Debian_WMState.diff | 20 +++++++++++---------
debian/wmaker-common.dirs | 1 -
debian/wmaker-common.install | 5 -----
debian/wmaker.menu-method | 6 +++---
6 files changed, 28 insertions(+), 19 deletions(-)
delete mode 100644 debian/debianfiles/menu/menu.posthook
delete mode 100644 debian/debianfiles/menu/menu.prehook
repo.or.cz automatic notification. Contact project admin crma...@gmail.com
if you want to unsubscribe, or site admin ad...@repo.or.cz if you receive
no reply.
--
wmaker-crm.git ("The Window Maker window manager")
--
To unsubscribe, send mail to wmaker-dev-unsubscr...@lists.windowmaker.org.
