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
discards 1445d70c1e63bb1baff40a1c6dd22a2dfd33e722 (commit)
via 0173fe896dd3d89904b6cc540b8e32e93b3693c1 (commit)
via 7d11577a820be2beda60ceba7793ed08704b0e41 (commit)
via 4f07f5e1dda700bb6737074ce8e95c1df258de5b (commit)
This update added new revisions after undoing existing revisions. That is
to say, the old revision is not a strict subset of the new revision. This
situation occurs when you --force push a change and generate a repository
containing something like this:
* -- * -- B -- O -- O -- O (1445d70c1e63bb1baff40a1c6dd22a2dfd33e722)
N -- N -- N (0173fe896dd3d89904b6cc540b8e32e93b3693c1)
When this happens we assume that you've already had alert emails for all
of the O revisions, and so we here report only the revisions in the N
branch from the common base, B.
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/0173fe896dd3d89904b6cc540b8e32e93b3693c1
commit 0173fe896dd3d89904b6cc540b8e32e93b3693c1
Author: Rodolfo GarcÃa Peñas (kix) <[email protected]>
Date: Fri Feb 17 11:11:52 2012 +0100
debian: Added the debian revision to changelog
Debian revision was forgotten in the last debian commit.
diff --git a/debian/changelog b/debian/changelog
index 3cd8a59..72dab3c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-wmaker (0.95.2) unstable; urgency=low
+wmaker (0.95.2-1) unstable; urgency=low
* New upstream version 0.95.2 [Closes: #69669, #486542, #270877]
[Closes: #283240, #48550, #297019, #108432, #72917]
http://repo.or.cz/w/wmaker-crm.git/commit/7d11577a820be2beda60ceba7793ed08704b0e41
commit 7d11577a820be2beda60ceba7793ed08704b0e41
Author: Kamil Rytarowski <[email protected]>
Date: Fri Feb 17 05:35:12 2012 +0100
Stop using old /usr/X11R6 directory
...it's replaced in xorg-x11 by standard /usr
Switch from /usr/X11R6 to /usr in all files except debian and FAQ.
diff --git a/WPrefs.app/Menu.c b/WPrefs.app/Menu.c
index 6784c47..342e7f0 100644
--- a/WPrefs.app/Menu.c
+++ b/WPrefs.app/Menu.c
@@ -615,7 +615,7 @@ static void createPanel(_Panel * p)
WMSetLabelText(label, _("Enter the path for a file containing a menun"
"or a list of directories with the programs
youn"
"want to have listed in the menu. Ex:n"
- "~/GNUstep/Library/WindowMaker/menun" "orn"
"/usr/X11R6/bin ~/xbin"));
+ "~/GNUstep/Library/WindowMaker/menun" "orn"
"/usr/bin ~/xbin"));
WMMapSubwidgets(panel->pathF);
diff --git a/WPrefs.app/po/bg.po b/WPrefs.app/po/bg.po
index 9e3f4d3..d73d346 100644
--- a/WPrefs.app/po/bg.po
+++ b/WPrefs.app/po/bg.po
@@ -1305,13 +1305,13 @@ msgid ""
"want to have listed in the menu. Ex:n"
"~/GNUstep/Library/WindowMaker/menun"
"orn"
-"/usr/X11R6/bin ~/xbin"
+"/usr/bin ~/xbin"
msgstr ""
"ÐÑведеÑе пÑÑÑ Ð½Ð° Ñайл, ÑÑдÑÑÐ¶Ð°Ñ Ð¼ÐµÐ½Ñ Ð¸Ð»Ð¸n"
"ÑпиÑÑк Ð¾Ñ Ð´Ð¸ÑекÑоÑии Ñ Ð¿ÑогÑамиÑе, коиÑоn"
"желаеÑе да бÑÐ´Ð°Ñ Ð²ÐºÐ»ÑÑени в менÑÑо. ÐапÑ.:n"
"~/GNUstep/Library/WindowMaker/menun"
-"или /usr/X11R6/bin ~/xbin"
+"или /usr/bin ~/xbin"
# ../../WPrefs.app/Menu.c:1186
#: ../../WPrefs.app/Menu.c:736
diff --git a/WPrefs.app/po/ca.po b/WPrefs.app/po/ca.po
index b6782d2..2c250ab 100644
--- a/WPrefs.app/po/ca.po
+++ b/WPrefs.app/po/ca.po
@@ -1147,13 +1147,13 @@ msgid ""
"want to have listed in the menu. Ex:n"
"~/GNUstep/Library/WindowMaker/menun"
"orn"
-"/usr/X11R6/bin ~/xbin"
+"/usr/bin ~/xbin"
msgstr ""
"Entreu l'ubicació d'un fitxer que contingui el menú, on"
"una llista de directoris amb els programes que voleun"
"que apareguin al menú. Per exemple:n"
"~/GNUstep/Library/WindowMaker/menu, on"
-"/usr/X11R6/bin ~/xbin"
+"/usr/bin ~/xbin"
#: ../../WPrefs.app/Menu.c:736
msgid "Command"
diff --git a/WPrefs.app/po/cs.po b/WPrefs.app/po/cs.po
index 2e5d75b..4e15214 100644
--- a/WPrefs.app/po/cs.po
+++ b/WPrefs.app/po/cs.po
@@ -1025,14 +1025,14 @@ msgid ""
"want to have listed in the menu. Ex:n"
"~/GNUstep/Library/WindowMaker/menun"
"orn"
-"/usr/X11R6/bin ~/xbin"
+"/usr/bin ~/xbin"
msgstr ""
"Vlož cestu pro soubor obsahujÃcà menun"
"nebo seznam adresáÅů s programy, kterén"
"chete zobrazit v menu. PÅ:n"
"~/GNUstep/Library/WindowMaker/menun"
"nebon"
-"/usr/X11R6/bin ~/xbin"
+"/usr/bin ~/xbin"
#: ../Menu.c:696
msgid "Command"
diff --git a/WPrefs.app/po/de.po b/WPrefs.app/po/de.po
index 73b66fa..b211bc1 100644
--- a/WPrefs.app/po/de.po
+++ b/WPrefs.app/po/de.po
@@ -1028,14 +1028,14 @@ msgid ""
"want to have listed in the menu. Ex:n"
"~/GNUstep/Library/WindowMaker/menun"
"orn"
-"/usr/X11R6/bin ~/xbin"
+"/usr/bin ~/xbin"
msgstr ""
"Geben Sie den Pfad einer Datei, die ein Menün"
"enthält, oder eine Liste von Verzeichnissenn"
"mit den gewüschten Anwendungen ein. Bespiel:n"
"~/GNUstep/Library/WindowMaker/menun"
"odern"
-"/usr/X11R6/bin ~/xbin"
+"/usr/bin ~/xbin"
#: ../../WPrefs.app/Menu.c:679
msgid "Command"
diff --git a/WPrefs.app/po/es.po b/WPrefs.app/po/es.po
index 3f80fc9..59a6991 100644
--- a/WPrefs.app/po/es.po
+++ b/WPrefs.app/po/es.po
@@ -1054,13 +1054,13 @@ msgid ""
"want to have listed in the menu. Ex:n"
"~/GNUstep/Library/WindowMaker/menun"
"orn"
-"/usr/X11R6/bin ~/xbin"
+"/usr/bin ~/xbin"
msgstr ""
"Introduzca el path de un archivo que contengan"
"un menú o una lista de directorios con losn"
"programas que quiere listados en el menú.n"
"Ej: ~/GNUstep/Library/WindowMaker/menu o n"
-"/usr/X11R6/bin ~/xbin"
+"/usr/bin ~/xbin"
#: ../../WPrefs.app/Menu.c:736
msgid "Command"
diff --git a/WPrefs.app/po/fi.po b/WPrefs.app/po/fi.po
index cf11194..de297ff 100644
--- a/WPrefs.app/po/fi.po
+++ b/WPrefs.app/po/fi.po
@@ -1228,14 +1228,14 @@ msgid ""
"want to have listed in the menu. Ex:n"
"~/GNUstep/Library/WindowMaker/menun"
"orn"
-"/usr/X11R6/bin ~/xbin"
+"/usr/bin ~/xbin"
msgstr ""
"Syötä valikon sisältävän tiedoston polkun"
"tai ne hakemistot, jotka sisältävät ohjelmat,n"
"jotka haluat mukaan valikkoon. Esim.n"
"~/GNUstep/Library/WindowMaker/menun"
"tain"
-"/usr/X11R6/bin ~/xbin"
+"/usr/bin ~/xbin"
#: ../../WPrefs.app/Menu.c:696
msgid "Command"
diff --git a/WPrefs.app/po/fr.po b/WPrefs.app/po/fr.po
index 5478166..0727382 100644
--- a/WPrefs.app/po/fr.po
+++ b/WPrefs.app/po/fr.po
@@ -1150,7 +1150,7 @@ msgid ""
"want to have listed in the menu. Ex:n"
"~/GNUstep/Library/WindowMaker/menun"
"orn"
-"/usr/X11R6/bin ~/xbin"
+"/usr/bin ~/xbin"
msgstr ""
"Indiquez l'emplacement d'un fichier décrivant unn"
"menu ou une liste de répertoires contenant lesn"
diff --git a/WPrefs.app/po/it.po b/WPrefs.app/po/it.po
index 8d2fcec..99217d9 100644
--- a/WPrefs.app/po/it.po
+++ b/WPrefs.app/po/it.po
@@ -1260,14 +1260,14 @@ msgid ""
"want to have listed in the menu. Ex:n"
"~/GNUstep/Library/WindowMaker/menun"
"orn"
-"/usr/X11R6/bin ~/xbin"
+"/usr/bin ~/xbin"
msgstr ""
"Scrivere il percorso di un file contenente unn"
"menù o una lista di directory con i programmin"
"che si vogliono nel menù. Ad esempio:n"
"~/GNUstep/Library/WindowMaker/menu.itn"
"oppuren"
-"/usr/X11R6/bin ~/xbin"
+"/usr/bin ~/xbin"
#: ../../WPrefs.app/Menu.c:696
msgid "Command"
diff --git a/WPrefs.app/po/ja.po b/WPrefs.app/po/ja.po
index c45258e..296b6f1 100644
--- a/WPrefs.app/po/ja.po
+++ b/WPrefs.app/po/ja.po
@@ -1037,14 +1037,14 @@ msgid ""
"want to have listed in the menu. Ex:n"
"~/GNUstep/Library/WindowMaker/menun"
"orn"
-"/usr/X11R6/bin ~/xbin"
+"/usr/bin ~/xbin"
msgstr ""
"ã¡ãã¥ã¼ãå«ããã¡ã¤ã«ã¸ã®ãã¹, ãªãã㯠n"
"ã¡ãã¥ã¼ã«è¡¨ç¤ºãã¦ã»ããããã°ã©ã ã®ãã n"
"ãã£ã¬ã¯ããª. ä¾:n"
"~/GNUstep/Library/WindowMaker/menun"
"ã¨ã, n"
-"/usr/X11R6/bin ~/xbin"
+"/usr/bin ~/xbin"
#: ../../WPrefs.app/Menu.c:736
msgid "Command"
diff --git a/WPrefs.app/po/ru.po b/WPrefs.app/po/ru.po
index 1cf1fba..44c6055 100644
--- a/WPrefs.app/po/ru.po
+++ b/WPrefs.app/po/ru.po
@@ -1115,14 +1115,14 @@ msgid ""
"want to have listed in the menu. Ex:n"
"~/GNUstep/Library/WindowMaker/menun"
"orn"
-"/usr/X11R6/bin ~/xbin"
+"/usr/bin ~/xbin"
msgstr ""
"ÐведиÑе пÑÑÑ Ðº ÑайлÑ, ÑодеÑжаÑÐµÐ¼Ñ Ð¼ÐµÐ½Ñ,n"
"или ÑпиÑок Ñ Ð¿ÑогÑаммами, коÑоÑÑе вÑ
Ñ
оÑиÑеn"
"видеÑÑ Ð¿ÐµÑеÑиÑленнÑми в менÑ, ÐапÑимеÑ:n"
" ~/GNUstep/Library/WindowMaker/menun"
"илиn"
-" /usr/X11R6/bin ~/xbin"
+" /usr/bin ~/xbin"
#: ../../WPrefs.app/Menu.c:736
msgid "Command"
diff --git a/WPrefs.app/po/sk.po b/WPrefs.app/po/sk.po
index 49a9e62..11fb31c 100644
--- a/WPrefs.app/po/sk.po
+++ b/WPrefs.app/po/sk.po
@@ -1046,14 +1046,14 @@ msgid ""
"want to have listed in the menu. Ex:n"
"~/GNUstep/Library/WindowMaker/menun"
"orn"
-"/usr/X11R6/bin ~/xbin"
+"/usr/bin ~/xbin"
msgstr ""
"Zadajte cestu k súboru, ktorý obsahuje menun"
"alebo zoznam adresárov s programami, ktoré chceten"
"mať zaradené do menu. Napr.n"
"~/GNUstep/Library/WindowMaker/menun"
"alebon"
-"/usr/X11R6/bin ~/xbin"
+"/usr/bin ~/xbin"
#: ../../WPrefs.app/Menu.c:696
msgid "Command"
diff --git a/WPrefs.app/po/zh_TW.po b/WPrefs.app/po/zh_TW.po
index e1b7fee..0ee23ab 100644
--- a/WPrefs.app/po/zh_TW.po
+++ b/WPrefs.app/po/zh_TW.po
@@ -999,13 +999,13 @@ msgid ""
"want to have listed in the menu. Ex:n"
"~/GNUstep/Library/WindowMaker/menun"
"orn"
-"/usr/X11R6/bin ~/xbin"
+"/usr/bin ~/xbin"
msgstr ""
"輸å
¥å«æé¸å®çæªæ¡æä½ è¦åå¨é¸å®çç¨å¼ç®éæ¸
å®n"
"çè·¯å¾ãä¾å¦:n"
"~/GNUstep/Library/WindowMaker/menun"
"æn"
-"/usr/X11R6/bin ~/xbin"
+"/usr/bin ~/xbin"
#: ../../WPrefs.app/Menu.c:736
msgid "Command"
diff --git a/WindowMaker/Defaults/WindowMaker.in
b/WindowMaker/Defaults/WindowMaker.in
index 1323b0d..6b2890d 100644
--- a/WindowMaker/Defaults/WindowMaker.in
+++ b/WindowMaker/Defaults/WindowMaker.in
@@ -12,7 +12,7 @@
"~/GNUstep/Library/Icons",
"#pkgdatadir#/Icons",
"#pkgdatadir#/Pixmaps",
- "/usr/X11R6/include/X11/pixmaps",
+ "/usr/include/X11/pixmaps",
"~/GNUstep/Library/WindowMaker/Pixmaps",
"/usr/share/icons",
"/usr/local/share/pixmaps",
@@ -23,7 +23,7 @@
"~/GNUstep/Library/WindowMaker/Backgrounds",
"#pkgdatadir#/Pixmaps",
"#pkgdatadir#/Backgrounds",
- "/usr/X11R6/include/X11/pixmaps",
+ "/usr/include/X11/pixmaps",
"/usr/local/share/pixmaps",
"/usr/share/pixmaps"
);
diff --git a/WindowMaker/menu.hu b/WindowMaker/menu.hu
index 741b397..37f4ce4 100644
--- a/WindowMaker/menu.hu
+++ b/WindowMaker/menu.hu
@@ -204,7 +204,7 @@
"Háttér" END
"Téma mentése" SHEXEC getstyle -t
$HOME/GNUstep/Library/WindowMaker/Themes/"%a(Téma neve,Add meg a téma fájl
nevét:)"
"IkonbeállÃtások mentése" SHEXEC geticonset
$HOME/GNUstep/Library/WindowMaker/IconSets/"%a(IkonbeállÃtások mentése,Add
meg a fájl nevét:)"
- "Konfiguráló program" EXEC /usr/X11R6/bin/WPrefs
+ "Konfiguráló program" EXEC /usr/bin/WPrefs
"Megjelenés" END
"Kilépés" MENU
diff --git a/WindowMaker/plmenu.it b/WindowMaker/plmenu.it
index c8ded29..151c6a6 100644
--- a/WindowMaker/plmenu.it
+++ b/WindowMaker/plmenu.it
@@ -66,9 +66,9 @@
("Cancella Sessione salvata", CLEAR_SESSION)
),
("Visualizzazione",
- ("Temi", OPEN_MENU, "-noext /usr/X11R6/share/WindowMaker/Themes
~/GNUstep/Library/WindowMaker/Themes WITH setstyle"),
- ("Stili", OPEN_MENU, "-noext /usr/X11R6/share/WindowMaker/Styles
~/GNUstep/Library/WindowMaker/Styles WITH setstyle"),
- ("Set di Icone", OPEN_MENU, "-noext /usr/X11R6/share/WindowMaker/IconSets
~/GNUstep/Library/WindowMaker/IconSets WITH seticons"),
+ ("Temi", OPEN_MENU, "-noext /usr/share/WindowMaker/Themes
~/GNUstep/Library/WindowMaker/Themes WITH setstyle"),
+ ("Stili", OPEN_MENU, "-noext /usr/share/WindowMaker/Styles
~/GNUstep/Library/WindowMaker/Styles WITH setstyle"),
+ ("Set di Icone", OPEN_MENU, "-noext /usr/share/WindowMaker/IconSets
~/GNUstep/Library/WindowMaker/IconSets WITH seticons"),
("Sfondo",
("Tinta unita",
("Nero", EXEC, "wdwrite WindowMaker WorkspaceBack '(solid, black)'"),
@@ -90,7 +90,7 @@
("Sfumature Grigie", EXEC, "wdwrite WindowMaker WorkspaceBack
'(vgradient, "#636380", "#131318")'"),
("Sfumature Vinaccia", EXEC, "wdwrite WindowMaker WorkspaceBack
'(vgradient, "#600040", "#180010")'")
),
- ("Immagini", OPEN_MENU, "-noext /usr/X11R6/share/WindowMaker/Backgrounds
~/GNUstep/Library/WindowMaker/Backgrounds WITH wmsetbg -u -t")
+ ("Immagini", OPEN_MENU, "-noext /usr/share/WindowMaker/Backgrounds
~/GNUstep/Library/WindowMaker/Backgrounds WITH wmsetbg -u -t")
),
("Salva il tema", EXEC, "getstyle -t
~/GNUstep/Library/WindowMaker/Themes/"%a(Nome Tema)""),
("Salva il set icone", EXEC, "geticonset
~/GNUstep/Library/WindowMaker/IconSets/"%a(Nome IconSet)"")
http://repo.or.cz/w/wmaker-crm.git/commit/4f07f5e1dda700bb6737074ce8e95c1df258de5b
commit 4f07f5e1dda700bb6737074ce8e95c1df258de5b
Author: Kamil Rytarowski <[email protected]>
Date: Fri Feb 17 03:56:06 2012 +0100
Cleanup German plmenu entries
Replace hardcoded "/home/mawa" with an universal $(HOME).
diff --git a/WindowMaker/plmenu.de b/WindowMaker/plmenu.de
index 7bee69d..825b97d 100644
--- a/WindowMaker/plmenu.de
+++ b/WindowMaker/plmenu.de
@@ -66,9 +66,9 @@
("Gespeicherte Sitzung löschen", CLEAR_SESSION)
),
("Erscheinungsbild",
- ("Themen", OPEN_MENU, "-noext /usr/local/share/WindowMaker/Themes
/home/mawa/GNUstep/Library/WindowMaker/Themes WITH setstyle"),
- ("Stile", OPEN_MENU, "-noext /usr/local/share/WindowMaker/Styles
/home/mawa/GNUstep/Library/WindowMaker/Styles WITH setstyle"),
- ("Iconsätze", OPEN_MENU, "-noext /usr/local/share/WindowMaker/IconSets
/home/mawa/GNUstep/Library/WindowMaker/IconSets WITH seticons"),
+ ("Themen", OPEN_MENU, "-noext /usr/local/share/WindowMaker/Themes
$(HOME)/GNUstep/Library/WindowMaker/Themes WITH setstyle"),
+ ("Stile", OPEN_MENU, "-noext /usr/local/share/WindowMaker/Styles
$(HOME)/GNUstep/Library/WindowMaker/Styles WITH setstyle"),
+ ("Iconsätze", OPEN_MENU, "-noext /usr/local/share/WindowMaker/IconSets
$(HOME)/GNUstep/Library/WindowMaker/IconSets WITH seticons"),
("Hintergrund",
("Einfarbig",
("Schwarz", EXEC, "wdwrite WindowMaker WorkspaceBack '(solid, black)'"),
@@ -90,10 +90,10 @@
("Grau schattiert", EXEC, "wdwrite WindowMaker WorkspaceBack
'(vgradient, "#636380", "#131318")'"),
("Weinfarben schattiert", EXEC, "wdwrite WindowMaker WorkspaceBack
'(vgradient, "#600040", "#180010")'")
),
- ("Bilder", OPEN_MENU, "-noext /usr/local/share/WindowMaker/Backgrounds
/home/mawa/GNUstep/Library/WindowMaker/Backgrounds WITH wmsetbg -u -t")
+ ("Bilder", OPEN_MENU, "-noext /usr/local/share/WindowMaker/Backgrounds
$(HOME)/GNUstep/Library/WindowMaker/Backgrounds WITH wmsetbg -u -t")
),
- ("Thema speichern", SHEXEC, "getstyle -t
/home/mawa/GNUstep/Library/WindowMaker/Themes/"%a(Themenname)""),
- ("Iconsatz speichern", SHEXEC, "geticonset
/home/mawa/GNUstep/Library/WindowMaker/IconSets/"%a(Iconsatz-Name)"")
+ ("Thema speichern", SHEXEC, "getstyle -t
$(HOME)/GNUstep/Library/WindowMaker/Themes/"%a(Themenname)""),
+ ("Iconsatz speichern", SHEXEC, "geticonset
$(HOME)/GNUstep/Library/WindowMaker/IconSets/"%a(Iconsatz-Name)"")
),
("Beenden",
("Neustart", RESTART),
-----------------------------------------------------------------------
Summary of changes:
WPrefs.app/Menu.c | 2 +-
WPrefs.app/po/bg.po | 4 ++--
WPrefs.app/po/ca.po | 4 ++--
WPrefs.app/po/cs.po | 4 ++--
WPrefs.app/po/de.po | 4 ++--
WPrefs.app/po/es.po | 4 ++--
WPrefs.app/po/fi.po | 4 ++--
WPrefs.app/po/fr.po | 2 +-
WPrefs.app/po/it.po | 4 ++--
WPrefs.app/po/ja.po | 4 ++--
WPrefs.app/po/ru.po | 4 ++--
WPrefs.app/po/sk.po | 4 ++--
WPrefs.app/po/zh_TW.po | 4 ++--
WindowMaker/Defaults/WindowMaker.in | 4 ++--
WindowMaker/menu.hu | 2 +-
WindowMaker/plmenu.de | 12 ++++++------
WindowMaker/plmenu.it | 8 ++++----
debian/changelog | 2 +-
src/defaults.c | 11 ++++++++++-
19 files changed, 48 insertions(+), 39 deletions(-)
repo.or.cz automatic notification. Contact project admin [email protected]
if you want to unsubscribe, or site admin [email protected] if you receive
no reply.
--
wmaker-crm.git ("The Window Maker window manager")
--
To unsubscribe, send mail to [email protected].
