[Xfce4-commits] xfwm4:master Theme stuff
Updating branch refs/heads/master to 5952a20629508217ac83269b761a172fc1958819 (commit) from 2622b81065db009ce29ab68f283c7b69820a06ed (commit) commit 5952a20629508217ac83269b761a172fc1958819 Author: Olivier Fourdan four...@xfce.org Date: Mon Sep 14 09:56:37 2009 +0200 Theme stuff themes/default/close-pressed.xpm |1 + themes/default/top-right-active.png | Bin 256 - 245 bytes themes/default/top-right-active.svg |2 +- themes/default/top-right-inactive.png | Bin 271 - 267 bytes themes/default/top-right-inactive.svg |2 +- 5 files changed, 3 insertions(+), 2 deletions(-) diff --git a/themes/default/close-pressed.xpm b/themes/default/close-pressed.xpm index 9570d0d..40d1171 100644 --- a/themes/default/close-pressed.xpm +++ b/themes/default/close-pressed.xpm @@ -22,6 +22,7 @@ static char * close_active_xpm[] = { .., .., .., +.., , , }; diff --git a/themes/default/top-right-active.png b/themes/default/top-right-active.png index d399677..87e1b46 100644 Binary files a/themes/default/top-right-active.png and b/themes/default/top-right-active.png differ diff --git a/themes/default/top-right-active.svg b/themes/default/top-right-active.svg index 4394fe6..12d10ca 100644 --- a/themes/default/top-right-active.svg +++ b/themes/default/top-right-active.svg @@ -162,7 +162,7 @@ style=display:inline path style=fill:url(#linearGradient3148);fill-opacity:0.50;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1 - d=M 0,2 L 2,2 C 3,2 6,2 6,5 C 6,8.5 6,12 6,20 L 0,20 L 0,20 L 0,2 z + d=M 0,2 L 4,2 C 5,2 6,2 6,5 C 6,8.5 6,12 6,20 L 0,20 L 0,20 L 0,2 z id=path6057 / /g g diff --git a/themes/default/top-right-inactive.png b/themes/default/top-right-inactive.png index 9733faf..a1d0fd9 100644 Binary files a/themes/default/top-right-inactive.png and b/themes/default/top-right-inactive.png differ diff --git a/themes/default/top-right-inactive.svg b/themes/default/top-right-inactive.svg index ff30f52..70ce7c1 100644 --- a/themes/default/top-right-inactive.svg +++ b/themes/default/top-right-inactive.svg @@ -162,7 +162,7 @@ style=display:inline path style=fill:url(#linearGradient3148);fill-opacity:0.50;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1 - d=M 0,2 L 2,2 C 3,2 6,2 6,5 C 6,8.5 6,12 6,20 L 0,20 L 0,20 L 0,2 z + d=M 0,2 L 4,2 C 5,2 6,2 6,5 C 6,8.5 6,12 6,20 L 0,20 L 0,20 L 0,2 z id=path6057 / /g g ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfwm4:master Cast signed/unsigned
Updating branch refs/heads/master to 78a2e3ba92aeb66432226889dccff9b6c60a2003 (commit) from 5952a20629508217ac83269b761a172fc1958819 (commit) commit 78a2e3ba92aeb66432226889dccff9b6c60a2003 Author: Olivier Fourdan four...@xfce.org Date: Wed Sep 16 09:29:04 2009 +0200 Cast signed/unsigned src/events.c |8 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/events.c b/src/events.c index a7cf162..67b1529 100644 --- a/src/events.c +++ b/src/events.c @@ -2049,9 +2049,9 @@ handleClientMessage (DisplayInfo *display_info, XClientMessageEvent * ev) else if ((ev-message_type == display_info-atoms[WIN_WORKSPACE]) (ev-format == 32)) { TRACE (client \%s\ (0x%lx) has received a WIN_WORKSPACE event, c-name, c-window); -if (ev-data.l[0] != c-win_workspace) +if (ev-data.l[0] != (guint) c-win_workspace) { -clientSetWorkspace (c, ev-data.l[0], TRUE); +clientSetWorkspace (c, (guint) ev-data.l[0], TRUE); } } else if ((ev-message_type == display_info-atoms[NET_WM_DESKTOP]) (ev-format == 32)) @@ -2072,9 +2072,9 @@ handleClientMessage (DisplayInfo *display_info, XClientMessageEvent * ev) clientUnstick (c, TRUE); frameQueueDraw (c, FALSE); } -if (ev-data.l[0] != c-win_workspace) +if (ev-data.l[0] != (guint) c-win_workspace) { -clientSetWorkspace (c, ev-data.l[0], TRUE); +clientSetWorkspace (c, (guint) ev-data.l[0], TRUE); } } } ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfconf:master Fix typo in xfconf/Makefile.am
Updating branch refs/heads/master to 34ef15719ce6cf16d0e94ca36feb35cd81cda195 (commit) from 2232d8577105799c758c63394a8d5a2fa8766d6c (commit) commit 34ef15719ce6cf16d0e94ca36feb35cd81cda195 Author: Jean-François Wauthy pol...@xfce.org Date: Wed Sep 16 13:08:37 2009 +0200 Fix typo in xfconf/Makefile.am xfconf/Makefile.am |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/xfconf/Makefile.am b/xfconf/Makefile.am index b7382eb..2e57097 100644 --- a/xfconf/Makefile.am +++ b/xfconf/Makefile.am @@ -13,7 +13,7 @@ libxfconf_0_la_SOURCES = \ $(libxfconfinclude_HEADERS) \ xfconf-binding.c \ xfconf-cache.c \ - xfconc-cache.h \ + xfconf-cache.h \ xfconf-channel.c \ xfconf-dbus-bindings.h \ xfconf-private.h \ ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce-server-scripts:master Add git_buildbot.py.
Updating branch refs/heads/master to 13ce80b005981d4ce0df1cc97443e11eb781501b (commit) from 72b8afea4bbdda43ac187e26e84590bdff01e382 (commit) commit 13ce80b005981d4ce0df1cc97443e11eb781501b Author: Jannis Pohlmann jan...@xfce.org Date: Wed Sep 16 16:03:16 2009 +0200 Add git_buildbot.py. bin/git_buildbot.py | 311 +++ xfce-server-scripts.gemspec |5 +- 2 files changed, 314 insertions(+), 2 deletions(-) diff --git a/bin/git_buildbot.py b/bin/git_buildbot.py new file mode 100755 index 000..1f70a70 --- /dev/null +++ b/bin/git_buildbot.py @@ -0,0 +1,311 @@ +#! /usr/bin/env python + +# This script expects one line for each new revision on the form +# oldrev newrev refname +# +# For example: +# aa453216d1b3e49e7f6f98441fa56946ddcd6a20 +# 68f7abf4e6f922807889f52bc043ecd31b79f814 refs/heads/master +# +# Each of these changes will be passed to the buildbot server along +# with any other change information we manage to extract from the +# repository. +# +# This script is meant to be run from hooks/post-receive in the git +# repository. It can also be run at client side with hooks/post-merge +# after using this wrapper: + +#!/bin/sh +# PRE=$(git rev-parse 'h...@{1}') +# POST=$(git rev-parse HEAD) +# SYMNAME=$(git rev-parse --symbolic-full-name HEAD) +# echo $PRE $POST $SYMNAME | git_buildbot.py +# +# Largely based on contrib/hooks/post-receive-email from git. + +import commands +import logging +import os +import re +import sys + +from twisted.spread import pb +from twisted.cred import credentials +from twisted.internet import reactor + +from buildbot.scripts import runner +from optparse import OptionParser + +# Modify this to fit your setup, or pass in --master server:host on the +# command line + +master = localhost:9989 + +# When sending the notification, send this category iff +# it's set (via --category) + +category = None + + +# The GIT_DIR environment variable must have been set up so that any +# git commands that are executed will operate on the repository we're +# installed in. + +changes = [] + + +def connectFailed(error): +logging.error(Could not connect to %s: %s +% (master, error.getErrorMessage())) +return error + + +def addChange(dummy, remote, changei): +logging.debug(addChange %s, %s % (repr(remote), repr(changei))) +try: +c = changei.next() +except StopIteration: +remote.broker.transport.loseConnection() +return None + +logging.info(New revision: %s % c['revision'][:8]) +for key, value in c.iteritems(): +logging.debug( %s: %s % (key, value)) + +d = remote.callRemote('addChange', c) +d.addCallback(addChange, remote, changei) +return d + + +def connected(remote): +return addChange(None, remote, changes.__iter__()) + + +def grab_commit_info(c, rev): +# Extract information about committer and files using git show +f = os.popen(git show --raw --pretty=full %s % rev, 'r') + +files = [] + +while True: +line = f.readline() +if not line: +break + +m = re.match(r^:.*[MAD]\s+(.+)$, line) +if m: +logging.debug(Got file: %s % m.group(1)) +files.append(m.group(1)) +continue + +m = re.match(r^Author:\s+(.+)$, line) +if m: +logging.debug(Got author: %s % m.group(1)) +c['who'] = m.group(1) + +if re.match(r^Merge: .*$, line): +files.append('merge') + +c['files'] = files +status = f.close() +if status: +logging.warning(git show exited with status %d % status) + + +def gen_changes(input, branch): +while True: +line = input.readline() +if not line: +break + +logging.debug(Change: %s % line) + +m = re.match(r^([0-9a-f]+) (.*)$, line.strip()) +c = {'revision': m.group(1), + 'comments': m.group(2), + 'branch': branch, +} +if category: +c['category'] = category +grab_commit_info(c, m.group(1)) +changes.append(c) + + +def gen_create_branch_changes(newrev, refname, branch): +# A new branch has been created. Generate changes for everything +# up to `newrev' which does not exist in any branch but `refname'. +# +# Note that this may be inaccurate if two new branches are created +# at the same time, pointing to the same commit, or if there are +# commits that only exists in a common subset of the new branches. + +logging.info(Branch `%s' created % branch) + +f = os.popen(git rev-parse --not --branches ++ | grep -v $(git rev-parse %s) % refname ++ | git rev-list --reverse --pretty=oneline --stdin %s % newrev, +'r') + +gen_changes(f, branch) + +status = f.close() +if status: +logging.warning(git rev-list exited with status %d % status) + + +def
[Xfce4-commits] xfce-git-hooks:master Add post-receive hook to trigger buildbot to build after updates.
Updating branch refs/heads/master to 9c553b5ebb4b06d844abac17b1c06f58347afd94 (commit) from 80d89ec746f35a186df061cd53d523532d24bb87 (commit) commit 9c553b5ebb4b06d844abac17b1c06f58347afd94 Author: Jannis Pohlmann jan...@xfce.org Date: Wed Sep 16 16:14:51 2009 +0200 Add post-receive hook to trigger buildbot to build after updates. This doesn't do anything at the moment because we first need to test this properly. hooks/post-receive-01-buildbot |4 post-update = post-receive|2 +- 2 files changed, 5 insertions(+), 1 deletions(-) diff --git a/hooks/post-receive-01-buildbot b/hooks/post-receive-01-buildbot new file mode 100755 index 000..a7aca1b --- /dev/null +++ b/hooks/post-receive-01-buildbot @@ -0,0 +1,4 @@ +#!/bin/sh + +# Do nothing for now until this is tested. +# git_buildbot.py --master=buildbot.xfce.org:9990 $1 $2 $3 diff --git a/post-update b/post-receive similarity index 55% copy from post-update copy to post-receive index daaf191..34b3851 100755 --- a/post-update +++ b/post-receive @@ -2,4 +2,4 @@ XFCE_GIT_HOOK_DIR=/usr/local/share/xfce-git-hooks -$XFCE_GIT_HOOK_DIR/hooks/post-update-01-server-info +$XFCE_GIT_HOOK_DIR/hooks/post-receive-01-buildbot ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce-server-scripts:master Revert Add git_buildbot.py.
Updating branch refs/heads/master to 3957bf5e71baa39ee9ee5cdb57825cb487d56263 (commit) from 13ce80b005981d4ce0df1cc97443e11eb781501b (commit) commit 3957bf5e71baa39ee9ee5cdb57825cb487d56263 Author: Jannis Pohlmann jan...@xfce.org Date: Wed Sep 16 18:11:54 2009 +0200 Revert Add git_buildbot.py. This reverts commit 13ce80b005981d4ce0df1cc97443e11eb781501b. rubygems doesn't like non-ruby scripts in bin/, so I've decided to move the git buildbot script directly into our hooks repository. bin/git_buildbot.py | 311 --- xfce-server-scripts.gemspec |5 +- 2 files changed, 2 insertions(+), 314 deletions(-) diff --git a/bin/git_buildbot.py b/bin/git_buildbot.py deleted file mode 100755 index 1f70a70..000 --- a/bin/git_buildbot.py +++ /dev/null @@ -1,311 +0,0 @@ -#! /usr/bin/env python - -# This script expects one line for each new revision on the form -# oldrev newrev refname -# -# For example: -# aa453216d1b3e49e7f6f98441fa56946ddcd6a20 -# 68f7abf4e6f922807889f52bc043ecd31b79f814 refs/heads/master -# -# Each of these changes will be passed to the buildbot server along -# with any other change information we manage to extract from the -# repository. -# -# This script is meant to be run from hooks/post-receive in the git -# repository. It can also be run at client side with hooks/post-merge -# after using this wrapper: - -#!/bin/sh -# PRE=$(git rev-parse 'h...@{1}') -# POST=$(git rev-parse HEAD) -# SYMNAME=$(git rev-parse --symbolic-full-name HEAD) -# echo $PRE $POST $SYMNAME | git_buildbot.py -# -# Largely based on contrib/hooks/post-receive-email from git. - -import commands -import logging -import os -import re -import sys - -from twisted.spread import pb -from twisted.cred import credentials -from twisted.internet import reactor - -from buildbot.scripts import runner -from optparse import OptionParser - -# Modify this to fit your setup, or pass in --master server:host on the -# command line - -master = localhost:9989 - -# When sending the notification, send this category iff -# it's set (via --category) - -category = None - - -# The GIT_DIR environment variable must have been set up so that any -# git commands that are executed will operate on the repository we're -# installed in. - -changes = [] - - -def connectFailed(error): -logging.error(Could not connect to %s: %s -% (master, error.getErrorMessage())) -return error - - -def addChange(dummy, remote, changei): -logging.debug(addChange %s, %s % (repr(remote), repr(changei))) -try: -c = changei.next() -except StopIteration: -remote.broker.transport.loseConnection() -return None - -logging.info(New revision: %s % c['revision'][:8]) -for key, value in c.iteritems(): -logging.debug( %s: %s % (key, value)) - -d = remote.callRemote('addChange', c) -d.addCallback(addChange, remote, changei) -return d - - -def connected(remote): -return addChange(None, remote, changes.__iter__()) - - -def grab_commit_info(c, rev): -# Extract information about committer and files using git show -f = os.popen(git show --raw --pretty=full %s % rev, 'r') - -files = [] - -while True: -line = f.readline() -if not line: -break - -m = re.match(r^:.*[MAD]\s+(.+)$, line) -if m: -logging.debug(Got file: %s % m.group(1)) -files.append(m.group(1)) -continue - -m = re.match(r^Author:\s+(.+)$, line) -if m: -logging.debug(Got author: %s % m.group(1)) -c['who'] = m.group(1) - -if re.match(r^Merge: .*$, line): -files.append('merge') - -c['files'] = files -status = f.close() -if status: -logging.warning(git show exited with status %d % status) - - -def gen_changes(input, branch): -while True: -line = input.readline() -if not line: -break - -logging.debug(Change: %s % line) - -m = re.match(r^([0-9a-f]+) (.*)$, line.strip()) -c = {'revision': m.group(1), - 'comments': m.group(2), - 'branch': branch, -} -if category: -c['category'] = category -grab_commit_info(c, m.group(1)) -changes.append(c) - - -def gen_create_branch_changes(newrev, refname, branch): -# A new branch has been created. Generate changes for everything -# up to `newrev' which does not exist in any branch but `refname'. -# -# Note that this may be inaccurate if two new branches are created -# at the same time, pointing to the same commit, or if there are -# commits that only exists in a common subset of the new branches. - -logging.info(Branch `%s' created % branch) - -f = os.popen(git rev-parse --not --branches -+ | grep -v $(git rev-parse %s) % refname -+ | git rev-list --reverse
[Xfce4-commits] thunar:progress-dialog-experiments Remove ThunarVFS item from the TODO list.
Updating branch refs/heads/progress-dialog-experiments to 2028e116ebf36bf0461f1d2f5b186c84259cb89c (commit) from ab7743c42452805a7a7e7bfe842d31c899babafb (commit) commit 2028e116ebf36bf0461f1d2f5b186c84259cb89c Author: Jannis Pohlmann jan...@xfce.org Date: Wed Sep 16 18:30:10 2009 +0200 Remove ThunarVFS item from the TODO list. TODO |5 + 1 files changed, 1 insertions(+), 4 deletions(-) diff --git a/TODO b/TODO index b5a478b..7547d2a 100644 --- a/TODO +++ b/TODO @@ -1,9 +1,6 @@ -Important for Thunar 1.0 +Important for Thunar 1.2 - - Check getmntinfo() or getfsstat() for ThunarVfsVolumeManagerBSD, which - might be faster than several statfs() calls. - - The layouting code for ThunarLocationButtons is still buggy. Problem shows with paths that include a very long directory; you cannot scroll to the last path component then. ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce-git-hooks:master The buildbot hook is not working yet. Try something else.
Updating branch refs/heads/master to 8a2f6aa76a07367a858b66a5816215508320010d (commit) from 38acc65483bed9aa9159993a46e7ac64bc616442 (commit) commit 8a2f6aa76a07367a858b66a5816215508320010d Author: Jannis Pohlmann jan...@xfce.org Date: Wed Sep 16 18:32:40 2009 +0200 The buildbot hook is not working yet. Try something else. hooks/post-receive-01-buildbot |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/hooks/post-receive-01-buildbot b/hooks/post-receive-01-buildbot index 44709ee..5b343b1 100755 --- a/hooks/post-receive-01-buildbot +++ b/hooks/post-receive-01-buildbot @@ -7,4 +7,4 @@ else fi # Do nothing for now until this is tested. -echo $1 $2 $3 | python $mydir/git_buildbot.py +echo $1 $2 $3 | $mydir/git_buildbot.py ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] thunar:master Remove ThunarVFS item from the TODO list.
Updating branch refs/heads/master to e808cf6ceebc6e52f288e856a8149f09fd62957b (commit) from 8cc2344ddecd219c75cb6056f9aa5ae8950a0b90 (commit) commit e808cf6ceebc6e52f288e856a8149f09fd62957b Author: Jannis Pohlmann jan...@xfce.org Date: Wed Sep 16 18:30:10 2009 +0200 Remove ThunarVFS item from the TODO list. TODO |5 + 1 files changed, 1 insertions(+), 4 deletions(-) diff --git a/TODO b/TODO index b5a478b..7547d2a 100644 --- a/TODO +++ b/TODO @@ -1,9 +1,6 @@ -Important for Thunar 1.0 +Important for Thunar 1.2 - - Check getmntinfo() or getfsstat() for ThunarVfsVolumeManagerBSD, which - might be faster than several statfs() calls. - - The layouting code for ThunarLocationButtons is still buggy. Problem shows with paths that include a very long directory; you cannot scroll to the last path component then. ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce-git-hooks:master Add some debugging output as it is still not working.
Updating branch refs/heads/master to ade395ed8e11b58eeb4c9b79664b87dd3cc5b00e (commit) from 1c94ff6879adad3cec2f2359c081aacdf468292a (commit) commit ade395ed8e11b58eeb4c9b79664b87dd3cc5b00e Author: Jannis Pohlmann jan...@xfce.org Date: Wed Sep 16 18:39:07 2009 +0200 Add some debugging output as it is still not working. hooks/post-receive-01-buildbot |5 + 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/hooks/post-receive-01-buildbot b/hooks/post-receive-01-buildbot index 5b343b1..79d2942 100755 --- a/hooks/post-receive-01-buildbot +++ b/hooks/post-receive-01-buildbot @@ -1,5 +1,10 @@ #!/bin/sh +echo 0 = $0 +echo 1 = $1 +echo 2 = $2 +echo 3 = $3 + if echo $0 | grep -q '^/'; then mydir=`dirname $0` else ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] thunar:master Add Nick to the authors of Thunar.
Updating branch refs/heads/master to e379d5b20deb1a0296a1952c866a8914f3da59d2 (commit) from e808cf6ceebc6e52f288e856a8149f09fd62957b (commit) commit e379d5b20deb1a0296a1952c866a8914f3da59d2 Author: Jannis Pohlmann jan...@xfce.org Date: Wed Sep 16 18:41:22 2009 +0200 Add Nick to the authors of Thunar. AUTHORS |1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/AUTHORS b/AUTHORS index 2431749..d44a8fa 100644 --- a/AUTHORS +++ b/AUTHORS @@ -1,6 +1,7 @@ Benedikt Meurer be...@xfce.org Jannis Pohlmann jan...@xfce.org Jeffs Franks jcfra...@xfce.org +Nick Schermer n...@xfce.org The tdb library, which is included with the Thunar distribution, was originally written as part of the Samba suite. My understanding is that the majority of ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] thunar:master Fix repository information in HACKING.
Updating branch refs/heads/master to 3921a049b4f7511e8d833fe3465b76ace9e1abab (commit) from e379d5b20deb1a0296a1952c866a8914f3da59d2 (commit) commit 3921a049b4f7511e8d833fe3465b76ace9e1abab Author: Jannis Pohlmann jan...@xfce.org Date: Wed Sep 16 18:44:20 2009 +0200 Fix repository information in HACKING. HACKING | 10 +++--- 1 files changed, 3 insertions(+), 7 deletions(-) diff --git a/HACKING b/HACKING index 2c8366b..b945d20 100644 --- a/HACKING +++ b/HACKING @@ -13,14 +13,10 @@ mailinglist. Your patch should be in unified diff format (the -u option to GNU diff) and it must comply with the coding style described below. Please send a patch against a recent version of this package. Patches -against the Subversion trunk branch are most preferable. You can always -access the trunk branch from +against the Git master branch are most preferable. You can always +clone the Thunar repository from - http://svn.xfce.org/svn/xfce/thunar/trunk - -or using an installed Subversion client - - svn co http://svn.xfce.org/svn/xfce/thunar/trunk thunar + http://git.xfce.org/git/xfce/thunar Feature requests ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce-git-hooks:master I'm stupid. post-receive needs to read its arguments from stdin.
Updating branch refs/heads/master to 989de310aa466211135e7b145f0a9ca6c5b08a68 (commit) from ade395ed8e11b58eeb4c9b79664b87dd3cc5b00e (commit) commit 989de310aa466211135e7b145f0a9ca6c5b08a68 Author: Jannis Pohlmann jan...@xfce.org Date: Wed Sep 16 18:49:45 2009 +0200 I'm stupid. post-receive needs to read its arguments from stdin. post-receive |5 - 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/post-receive b/post-receive index 2fea319..97104b1 100755 --- a/post-receive +++ b/post-receive @@ -2,4 +2,7 @@ XFCE_GIT_HOOK_DIR=/usr/local/share/xfce-git-hooks -$XFCE_GIT_HOOK_DIR/hooks/post-receive-01-buildbot $@ +while read oldrev newrev refname; do + $XFCE_GIT_HOOK_DIR/hooks/post-receive-01-buildbot \ +$oldrev $newrev $refname +done ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] thunar:master Add missing parameter to the thunar-file-manager.py example script.
Updating branch refs/heads/master to 3addd7e3c4c19287bd45019728c735259eef3267 (commit) from 3921a049b4f7511e8d833fe3465b76ace9e1abab (commit) commit 3addd7e3c4c19287bd45019728c735259eef3267 Author: Jannis Pohlmann jan...@xfce.org Date: Wed Sep 16 18:52:26 2009 +0200 Add missing parameter to the thunar-file-manager.py example script. We now have startup notification support in the Thunar D-Bus interface which adds a startup ID parameter to some of the D-Bus methods. examples/thunar-file-manager.py |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/examples/thunar-file-manager.py b/examples/thunar-file-manager.py index 23991c2..995d228 100755 --- a/examples/thunar-file-manager.py +++ b/examples/thunar-file-manager.py @@ -55,4 +55,4 @@ thunar = dbus.Interface(thunar_object, 'org.xfce.Thunar') # We just popup the bulk rename dialog to # demonstrate that it works. ;-) -thunar.BulkRename('/tmp', [], True, '') +thunar.BulkRename('/tmp', [], True, '', '') ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce-git-hooks:master Remove debugging output. Rebuilding after each push works!
Updating branch refs/heads/master to 3165cfb9fde546f1db930f3ac702d2bdec173185 (commit) from 989de310aa466211135e7b145f0a9ca6c5b08a68 (commit) commit 3165cfb9fde546f1db930f3ac702d2bdec173185 Author: Jannis Pohlmann jan...@xfce.org Date: Wed Sep 16 18:55:53 2009 +0200 Remove debugging output. Rebuilding after each push works! hooks/post-receive-01-buildbot |7 +-- 1 files changed, 1 insertions(+), 6 deletions(-) diff --git a/hooks/post-receive-01-buildbot b/hooks/post-receive-01-buildbot index 79d2942..a63e550 100755 --- a/hooks/post-receive-01-buildbot +++ b/hooks/post-receive-01-buildbot @@ -1,10 +1,5 @@ #!/bin/sh -echo 0 = $0 -echo 1 = $1 -echo 2 = $2 -echo 3 = $3 - if echo $0 | grep -q '^/'; then mydir=`dirname $0` else @@ -12,4 +7,4 @@ else fi # Do nothing for now until this is tested. -echo $1 $2 $3 | $mydir/git_buildbot.py +echo $1 $2 $3 | $mydir/git_buildbot.py /dev/null ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce-git-hooks:master Prepend REPO environment variable to all files passed to buildbot.
Updating branch refs/heads/master to 6cbc03b90d4e65823aaef9bbb03ab48ae9fe7f8f (commit) from 3165cfb9fde546f1db930f3ac702d2bdec173185 (commit) commit 6cbc03b90d4e65823aaef9bbb03ab48ae9fe7f8f Author: Jannis Pohlmann jan...@xfce.org Date: Wed Sep 16 19:34:05 2009 +0200 Prepend REPO environment variable to all files passed to buildbot. hooks/git_buildbot.py |5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/hooks/git_buildbot.py b/hooks/git_buildbot.py index 5da979c..b7eee42 100755 --- a/hooks/git_buildbot.py +++ b/hooks/git_buildbot.py @@ -86,6 +86,7 @@ def grab_commit_info(c, rev): f = os.popen(git show --raw --pretty=full %s % rev, 'r') files = [] +repository = os.environ['REPO'] while True: line = f.readline() @@ -94,8 +95,8 @@ def grab_commit_info(c, rev): m = re.match(r^:.*[MAD]\s+(.+)$, line) if m: -logging.debug(Got file: %s % m.group(1)) -files.append(m.group(1)) +logging.debug(Got file: %s % repository + / + m.group(1)) +files.append(repository + / + m.group(1)) continue m = re.match(r^Author:\s+(.+)$, line) ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] thunar:master Add the startup ID parameter to the code in comments as well.
Updating branch refs/heads/master to cac7741f2b041d4a21d1604be4875eef2a4c4976 (commit) from 3addd7e3c4c19287bd45019728c735259eef3267 (commit) commit cac7741f2b041d4a21d1604be4875eef2a4c4976 Author: Jannis Pohlmann jan...@xfce.org Date: Wed Sep 16 19:37:40 2009 +0200 Add the startup ID parameter to the code in comments as well. examples/thunar-file-manager.py |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/examples/thunar-file-manager.py b/examples/thunar-file-manager.py index 995d228..ee2e6a3 100755 --- a/examples/thunar-file-manager.py +++ b/examples/thunar-file-manager.py @@ -47,7 +47,7 @@ thunar = dbus.Interface(thunar_object, 'org.xfce.Thunar') # standalone version with an empty file list and /tmp # as default folder for the Add Files dialog, use: # -# thunar.BulkRename('/tmp', [], True, '') +# thunar.BulkRename('/tmp', [], True, '', '') # # See the thunar-dbus-service-infos.xml file for the exact # interface definition. ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce-git-hooks:master Set REPO for post-receive hooks.
Updating branch refs/heads/master to 8cc0d1cd2058db5af32a8d3a2318177a508df71b (commit) from 6cbc03b90d4e65823aaef9bbb03ab48ae9fe7f8f (commit) commit 8cc0d1cd2058db5af32a8d3a2318177a508df71b Author: Jannis Pohlmann jan...@xfce.org Date: Wed Sep 16 19:47:22 2009 +0200 Set REPO for post-receive hooks. post-receive | 12 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/post-receive b/post-receive index 97104b1..cb15993 100755 --- a/post-receive +++ b/post-receive @@ -2,6 +2,18 @@ XFCE_GIT_HOOK_DIR=/usr/local/share/xfce-git-hooks +XFCE_GIT_HOOK_DIR=/usr/local/share/xfce-git-hooks + +if [ -z $GIT_DIR ]; then + echo GIT_DIR is unset! 2 + exit 1 +fi + +[[ $GIT_DIR = . ]] path=`pwd` || path=$GIT_DIR +parent=`dirname $path` +export REPO=`basename $parent`/`basename $path` +unset parent path + while read oldrev newrev refname; do $XFCE_GIT_HOOK_DIR/hooks/post-receive-01-buildbot \ $oldrev $newrev $refname ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] thunar:master Test commit for the buildbot hook script.
Updating branch refs/heads/master to 40684e734a809f5bbbc82e4851b298948a694bef (commit) from e90f7cebe3d3234d010acba15df309009cd34661 (commit) commit 40684e734a809f5bbbc82e4851b298948a694bef Author: Jannis Pohlmann jan...@xfce.org Date: Wed Sep 16 19:47:57 2009 +0200 Test commit for the buildbot hook script. 0 files changed, 0 insertions(+), 0 deletions(-) diff --git a/FOO b/FOO new file mode 100644 index 000..e69de29 ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] thunar:master Revert Test commit for the buildbot hook script.
Updating branch refs/heads/master to d8ee9b4e6e0677bafd81f459ca49cb3b718eafbb (commit) from 40684e734a809f5bbbc82e4851b298948a694bef (commit) commit d8ee9b4e6e0677bafd81f459ca49cb3b718eafbb Author: Jannis Pohlmann jan...@xfce.org Date: Wed Sep 16 19:49:21 2009 +0200 Revert Test commit for the buildbot hook script. This reverts commit 40684e734a809f5bbbc82e4851b298948a694bef. 0 files changed, 0 insertions(+), 0 deletions(-) diff --git a/FOO b/FOO deleted file mode 100644 index e69de29..000 ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-session:master l10n: Updates to Turkish (tr) translation
Updating branch refs/heads/master to f6bffc104bf11fdfa8e91e09daa565f19ff09cb3 (commit) from 7876c7e362853764379d95c77e27d4d27adeab39 (commit) commit f6bffc104bf11fdfa8e91e09daa565f19ff09cb3 Author: Utku Aydın utkuay...@archlinux.org.tr Date: Wed Sep 16 23:41:51 2009 + l10n: Updates to Turkish (tr) translation Transmitted-via: Transifex (translations.xfce.org) po/tr.po | 167 - 1 files changed, 55 insertions(+), 112 deletions(-) diff --git a/po/tr.po b/po/tr.po index 81413a8..935b012 100644 --- a/po/tr.po +++ b/po/tr.po @@ -11,8 +11,8 @@ msgstr Project-Id-Version: xfce4-session 4.5.91\n Report-Msgid-Bugs-To: \n POT-Creation-Date: 2009-07-26 19:15-0700\n -PO-Revision-Date: 2009-02-11 04:49+0200\n -Last-Translator: Gökmen Görgen gkmng...@gmail.com\n +PO-Revision-Date: 2009-09-17 02:41+0200\n +Last-Translator: Utku Aydın utkuay...@archlinux.org.tr\n Language-Team: Turkish tur...@pardus.org.tr\n MIME-Version: 1.0\n Content-Type: text/plain; charset=UTF-8\n @@ -139,7 +139,7 @@ msgstr _Oturum #: ../panel-plugin/xfsm-logout-plugin.c:57 msgid Loc_k screen -msgstr +msgstr Ekranı _Kilitle #: ../panel-plugin/xfsm-logout-plugin.c:58 #: ../panel-plugin/xfsm-logout-plugin.c:98 @@ -156,7 +156,7 @@ msgstr Beklemeye al #: ../panel-plugin/xfsm-logout-plugin.c:60 #: ../panel-plugin/xfsm-logout-plugin.c:91 msgid _Reboot -msgstr +msgstr _Yeniden BaÅlat #: ../panel-plugin/xfsm-logout-plugin.c:61 #: ../panel-plugin/xfsm-logout-plugin.c:84 @@ -180,11 +180,12 @@ msgstr \%s\ 'si sonlandırmayı istediÄinizden emin misiniz? #: ../panel-plugin/xfsm-logout-plugin.c:76 #, c-format msgid You will be logged out in %u seconds. -msgstr +msgstr %u saniye içinde çıkıŠyapacaksınız. #: ../panel-plugin/xfsm-logout-plugin.c:79 +#, fuzzy msgid Failed to log out. -msgstr +msgstr ÃıkıŠbaÅarısızlıkla sonuçlandı. #. XFSM_SHUTDOWN_HALT #: ../panel-plugin/xfsm-logout-plugin.c:82 @@ -195,7 +196,7 @@ msgstr \%s\ 'si sonlandırmayı istediÄinizden emin misiniz? #: ../panel-plugin/xfsm-logout-plugin.c:83 #, c-format msgid Your system will shut down in %u seconds. -msgstr +msgstr Sisteminiz %u saniye içinde kapatılacaktır. #: ../panel-plugin/xfsm-logout-plugin.c:86 #, fuzzy @@ -211,7 +212,7 @@ msgstr \%s\ 'si sonlandırmayı istediÄinizden emin misiniz? #: ../panel-plugin/xfsm-logout-plugin.c:90 #, c-format msgid Your system will reboot in %u seconds. -msgstr +msgstr Sisteminiz %u saniye içinde yeniden baÅlatılacaktır. #: ../panel-plugin/xfsm-logout-plugin.c:93 #, fuzzy @@ -268,7 +269,8 @@ msgstr Hataları lütfen %s'a bildirin. msgid Session Settings msgstr Oturum Ayarları -#: ../settings/main.c:86 ../xfce4-session/main.c:281 +#: ../settings/main.c:86 +#: ../xfce4-session/main.c:281 msgid Unable to contact settings server msgstr Sunucu ayarları ile iletiÅim kurulamıyor @@ -322,17 +324,14 @@ msgstr \%s\ 'si sonlandırmayı istediÄinizden emin misiniz? msgid Terminate \%s\ msgstr Sonlandır: \%s\ -#: ../settings/session-editor.c:186 ../settings/session-editor.c:214 +#: ../settings/session-editor.c:186 +#: ../settings/session-editor.c:214 msgid Terminate Program msgstr Uygulamayı sonlandır #: ../settings/session-editor.c:188 -msgid -The application will lose any unsaved state and will not be restarted in -your next session. -msgstr -Uygulama kaydedilmemiÅ tüm bilgileri kaybedecek ve bir sonraki oturumda -yeniden baÅlatmayacaktır. +msgid The application will lose any unsaved state and will not be restarted in your next session. +msgstr Uygulama kaydedilmemiÅ tüm bilgileri kaybedecek ve bir sonraki oturumda yeniden baÅlatmayacaktır. #: ../settings/session-editor.c:215 msgid Unable to terminate program. @@ -358,8 +357,10 @@ msgstr Uygulama msgid Restart Style msgstr Stili Sıfırla -#: ../settings/splash-settings.c:288 ../settings/splash-settings.c:291 -#: ../settings/splash-settings.c:294 ../settings/splash-settings.c:297 +#: ../settings/splash-settings.c:288 +#: ../settings/splash-settings.c:291 +#: ../settings/splash-settings.c:294 +#: ../settings/splash-settings.c:297 #: ../settings/splash-settings.c:354 msgid None msgstr Hiçbiri @@ -405,14 +406,8 @@ msgid Failed to open %s for writing msgstr %s dosyasında yazmaya uygun açılamıyor #: ../settings/xfae-window.c:100 -msgid -Below is the list of applications that will be started automatically when -you login to your Xfce desktop, in addition to the applications that were -saved when you logged out last time: -msgstr -Son çıkıŠyaptıÄınızda kayıt ettiÄiniz uygulamalara ek olarak aÅaÄıdaki -listede bulunan uygulamalar Xfce masaüstüne giriÅ yaptıÄınızda otomatik -olarak çalıÅacaktır: +msgid Below is the list of applications that will be started automatically when you login to your Xfce desktop, in addition to the applications that
[Xfce4-commits] xfce-git-migration:master Add post-receive to the hooks linked into all repositories.
Updating branch refs/heads/master to 46537f71a27061ad5a9ab472be12dfd37964ca95 (commit) from d8749a22198a6605c034997dd5770f56e6133019 (commit) commit 46537f71a27061ad5a9ab472be12dfd37964ca95 Author: Jannis Pohlmann jan...@xfce.org Date: Thu Sep 17 02:28:50 2009 +0200 Add post-receive to the hooks linked into all repositories. repos-final-prep.sh |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/repos-final-prep.sh b/repos-final-prep.sh index b24e2ad..48d6d75 100755 --- a/repos-final-prep.sh +++ b/repos-final-prep.sh @@ -2,7 +2,7 @@ GIT_REPOS_ROOT=/var/git HOOKS_DIR=/usr/local/share/xfce-git-hooks -HOOKS=update post-update +HOOKS=update post-update post-receive setup_repo() { export GIT_DIR=$1 ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] libxfce4util:master Update to xfce4-dev-tools 4.7.0.
Updating branch refs/heads/master to 98a73ae5b52ce26010bb30f574b5e4eeba601309 (commit) from fc24aa2972d14d815f743c6a93270252239599ed (commit) commit 98a73ae5b52ce26010bb30f574b5e4eeba601309 Author: Jannis Pohlmann jan...@xfce.org Date: Thu Sep 17 02:38:14 2009 +0200 Update to xfce4-dev-tools 4.7.0. autogen.sh | 25 + configure.in.in |6 +++--- 2 files changed, 4 insertions(+), 27 deletions(-) diff --git a/autogen.sh b/autogen.sh index 6be74d7..6dd7849 100755 --- a/autogen.sh +++ b/autogen.sh @@ -18,29 +18,6 @@ EOF exit 1 } -# verify that po/LINGUAS is present -(test -f po/LINGUAS) /dev/null 21 || { - cat 2 EOF -autogen.sh: The file po/LINGUAS could not be found. Please check your snapshot -or try to checkout again. -EOF - exit 1 -} - -# substitute revision and linguas -linguas=`sed -e '/^#/d' po/LINGUAS` -if test -d .git/svn; then - revision=`git svn find-rev trunk 2/dev/null || -git svn find-rev origin/trunk 2/dev/null || -git svn find-rev HEAD 2/dev/null || -git svn find-rev master 2/dev/null` -else - revision=`LC_ALL=C svn info $0 | awk '/^Revision: / {printf %05d\n, $2}'` -fi -sed -e s/@LINGUAS@/${linguas}/g \ --e s/@REVISION@/${revision}/g \ - configure.in.in configure.in - -exec xdt-autogen $@ +XDT_AUTOGEN_REQUIRED_VERSION=4.7.0 exec xdt-autogen $@ # vi:set ts=2 sw=2 et ai: diff --git a/configure.in.in b/configure.in.in index 36ea09d..7b3d553 100644 --- a/configure.in.in +++ b/configure.in.in @@ -14,10 +14,10 @@ m4_define([libxfce4util_verinfo], [5:1:1]) m4_define([libxfce4util_version_major], [4]) m4_define([libxfce4util_version_minor], [7]) m4_define([libxfce4util_version_micro], [0]) -m4_define([libxfce4util_version_nano], []) dnl leave this empty to have no nano version +m4_define([libxfce4util_version_nano], [git]) dnl leave this empty to have no nano version m4_define([libxfce4util_version_build], [...@revision@]) m4_define([libxfce4util_version_tag], []) -m4_define([libxfce4util_version], [libxfce4util_version_major().libxfce4util_version_minor().libxfce4util_version_micro()ifelse(libxfce4util_version_nano(), [], [], [.libxfce4util_version_nano()])ifelse(libxfce4util_version_tag(), [svn], [libxfce4util_version_tag()-libxfce4util_version_build()], [])]) +m4_define([libxfce4util_version], [libxfce4util_version_major().libxfce4util_version_minor().libxfce4util_version_micro()ifelse(libxfce4util_version_nano(), [], [], [.libxfce4util_version_nano()])ifelse(libxfce4util_version_tag(), [git], [libxfce4util_version_tag()-libxfce4util_version_build()], [])]) dnl ** dnl *** Overall Xfce version, modify this when making releases *** @@ -32,7 +32,7 @@ dnl # YOU ARE DOING. dnl dnl *** Full debug support for SVN snapshots *** dnl -m4_define([libxfce4util_debug_default], [ifelse(libxfce4util_version_tag(), [svn], [full], [minimum])]) +m4_define([libxfce4util_debug_default], [ifelse(libxfce4util_version_tag(), [git], [full], [minimum])]) dnl *** dnl *** Initialize autoconf *** ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] libxfce4util:master Fix the docs for make distcheck.
Updating branch refs/heads/master to af3d4ffbe900028649aa85feaaf5d8e1053f9587 (commit) from 98a73ae5b52ce26010bb30f574b5e4eeba601309 (commit) commit af3d4ffbe900028649aa85feaaf5d8e1053f9587 Author: Jannis Pohlmann jan...@xfce.org Date: Thu Sep 17 02:39:00 2009 +0200 Fix the docs for make distcheck. docs/Makefile.am | 11 ++- 1 files changed, 10 insertions(+), 1 deletions(-) diff --git a/docs/Makefile.am b/docs/Makefile.am index 4d381cd..9627057 100644 --- a/docs/Makefile.am +++ b/docs/Makefile.am @@ -1,4 +1,6 @@ -## Process this file with automake to produce Makefile.in +# Process this file with automake to produce Makefile.in +# +# vi:set ts=8 sw=8 noet ai nocindent syntax=automake: AUTOMAKE_OPTIONS = 1.8 @@ -54,3 +56,10 @@ include $(top_srcdir)/gtk-doc.make EXTRA_DIST += \ version.xml.in +if MAINTAINER_MODE +%.1: %.xml + xsltproc -nonet http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $ +endif + +# required for gtk-doc +dist-hook: all ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce-git-hooks:master Disable debug output in the buildbot hook.
Updating branch refs/heads/master to 358e138eda1e82a4c9741c9e2d1c98f84e189619 (commit) from 8cc0d1cd2058db5af32a8d3a2318177a508df71b (commit) commit 358e138eda1e82a4c9741c9e2d1c98f84e189619 Author: Jannis Pohlmann jan...@xfce.org Date: Thu Sep 17 02:41:55 2009 +0200 Disable debug output in the buildbot hook. hooks/git_buildbot.py |4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/hooks/git_buildbot.py b/hooks/git_buildbot.py index b7eee42..37de5f9 100755 --- a/hooks/git_buildbot.py +++ b/hooks/git_buildbot.py @@ -278,10 +278,10 @@ def parse_options(): # information to a file as well (we'll set that up later.) stderr = logging.StreamHandler(sys.stderr) fmt = logging.Formatter(git_buildbot: %(levelname)s: %(message)s) -stderr.setLevel(logging.DEBUG) +stderr.setLevel(logging.ERROR) stderr.setFormatter(fmt) logging.getLogger().addHandler(stderr) -logging.getLogger().setLevel(logging.DEBUG) +logging.getLogger().setLevel(logging.INFO) try: options = parse_options() ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] libxfce4util:master Oops. Move 'git' to version_tag instead of version_nano.
Updating branch refs/heads/master to 03aec0ed8e9bf68cd3159ac96dd569f1ca420e1f (commit) from af3d4ffbe900028649aa85feaaf5d8e1053f9587 (commit) commit 03aec0ed8e9bf68cd3159ac96dd569f1ca420e1f Author: Jannis Pohlmann jan...@xfce.org Date: Thu Sep 17 02:45:29 2009 +0200 Oops. Move 'git' to version_tag instead of version_nano. configure.in.in |4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/configure.in.in b/configure.in.in index 7b3d553..f00b493 100644 --- a/configure.in.in +++ b/configure.in.in @@ -14,9 +14,9 @@ m4_define([libxfce4util_verinfo], [5:1:1]) m4_define([libxfce4util_version_major], [4]) m4_define([libxfce4util_version_minor], [7]) m4_define([libxfce4util_version_micro], [0]) -m4_define([libxfce4util_version_nano], [git]) dnl leave this empty to have no nano version +m4_define([libxfce4util_version_nano], []) dnl leave this empty to have no nano version m4_define([libxfce4util_version_build], [...@revision@]) -m4_define([libxfce4util_version_tag], []) +m4_define([libxfce4util_version_tag], [git]) m4_define([libxfce4util_version], [libxfce4util_version_major().libxfce4util_version_minor().libxfce4util_version_micro()ifelse(libxfce4util_version_nano(), [], [], [.libxfce4util_version_nano()])ifelse(libxfce4util_version_tag(), [git], [libxfce4util_version_tag()-libxfce4util_version_build()], [])]) dnl ** ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] libxfcegui4:master Fix docs for make distcheck. Update to xfce4-dev-tools 4.7.0.
Updating branch refs/heads/master to cd1159f3d117a1191a8426e7ed3a8f3493cad972 (commit) from 09b74380f69f430da11f48355e06378bffe8b628 (commit) commit cd1159f3d117a1191a8426e7ed3a8f3493cad972 Author: Jannis Pohlmann jan...@xfce.org Date: Thu Sep 17 02:58:27 2009 +0200 Fix docs for make distcheck. Update to xfce4-dev-tools 4.7.0. autogen.sh | 28 ++-- configure.in.in |2 +- docs/Makefile.am | 11 ++- 3 files changed, 13 insertions(+), 28 deletions(-) diff --git a/autogen.sh b/autogen.sh index a2febe3..c4e0651 100755 --- a/autogen.sh +++ b/autogen.sh @@ -1,6 +1,6 @@ #!/bin/sh # -# $Id$ +# vi:set et ai sw=2 sts=2 ts=2: */ # # Copyright (c) 2002-2006 # The Xfce development team. All rights reserved. @@ -18,28 +18,4 @@ EOF exit 1 } -# verify that po/LINGUAS is present -(test -f po/LINGUAS) /dev/null 21 || { - cat 2 EOF -autogen.sh: The file po/LINGUAS could not be found. Please check your snapshot -or try to checkout again. -EOF - exit 1 -} - -# substitute revision and linguas -linguas=`sed -e '/^#/d' po/LINGUAS` -if [ -d .git ]; then - revision=$(git rev-parse --short HEAD) -fi -if [ -z $revision ]; then - revision=UNKNOWN -fi - -sed -e s/@LINGUAS@/${linguas}/g \ --e s/@REVISION@/${revision}/g \ - configure.in.in configure.in - -exec xdt-autogen $@ - -# vi:set ts=2 sw=2 et ai: +XDT_AUTOGEN_REQUIRED_VERSION=4.7.0 exec xdt-autogen $@ diff --git a/configure.in.in b/configure.in.in index 0c4816b..983ff87 100644 --- a/configure.in.in +++ b/configure.in.in @@ -25,7 +25,7 @@ dnl # YOU ARE DOING. dnl *** dnl *** Debugging support for SVN snapshots *** dnl *** -m4_define([libxfcegui4_debug_default], [ifelse(libxfcegui4_version_tag(), [svn], [yes], [minimum])]) +m4_define([libxfcegui4_debug_default], [ifelse(libxfcegui4_version_tag(), [git], [yes], [minimum])]) dnl *** dnl *** Initialize autoconf *** diff --git a/docs/Makefile.am b/docs/Makefile.am index d1e1e19..4046464 100644 --- a/docs/Makefile.am +++ b/docs/Makefile.am @@ -1,4 +1,6 @@ -## Process this file with automake to produce Makefile.in +# Process this file with automake to produce Makefile.in +# +# vi:set ts=8 sw=8 noet ai nocindent syntax=automake: AUTOMAKE_OPTIONS = 1.6 @@ -57,3 +59,10 @@ include $(top_srcdir)/gtk-doc.make EXTRA_DIST += \ version.xml.in +if MAINTAINER_MODE +%.1: %.xml + xsltproc -nonet http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $ +endif + +# required for gtk-doc +dist-hook: all ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] libxfce4menu:master Fix docs for make distcheck. Update to xfce4-dev-tools 4.7.0.
Updating branch refs/heads/master to fd5e491d10fa94f5803f12279f23729c663b43ab (commit) from 69e11e92f5c7083bdf63a3a3cfe479505021d4d3 (commit) commit fd5e491d10fa94f5803f12279f23729c663b43ab Author: Jannis Pohlmann jan...@xfce.org Date: Thu Sep 17 03:13:01 2009 +0200 Fix docs for make distcheck. Update to xfce4-dev-tools 4.7.0. autogen.sh | 28 ++-- configure.in.in|6 +++--- docs/reference/Makefile.am |3 +++ 3 files changed, 8 insertions(+), 29 deletions(-) diff --git a/autogen.sh b/autogen.sh index e7ad211..c3305b7 100755 --- a/autogen.sh +++ b/autogen.sh @@ -2,7 +2,7 @@ # # $Id$ # -# vi:set ts=2 sw=2 et ai: +# vi:set et ai sw=2 sts=2 ts=2: # # Copyright (c) 2007 # The Xfce development team. All rights reserved. @@ -20,28 +20,4 @@ EOF exit 1 } -# Verify that po/LINGUAS is present -(test -f po/LINGUAS) /dev/null 21 || { - cat 2 EOF -autogen.sh: The file po/LINGUAS could not be found. Please check your snapshot -or try to checkout again. -EOF - exit 1 -} - -# Substitute revision and linguas -linguas=`sed -e '/^#/d' po/LINGUAS` -if test -d .git/svn; then - revision=$(git svn find-rev trunk 2/dev/null || - git svn find-rev origin/trunk 2/dev/null || - git svn find-rev HEAD 2/dev/null || - git svn find-rev master 2/dev/null) -else - revision=`LC_ALL=C svn info $0 | awk '/^Revision: / {printf %05d\n,$2}'` -fi -sed -e s/@LINGUAS@/${linguas}/g \ --e s/@REVISION@/${revision}/g \ - configure.in.in configure.in - -exec xdt-autogen $@ - +XDT_AUTOGEN_REQUIRED_VERSION=4.7.0 exec xdt-autogen $@ diff --git a/configure.in.in b/configure.in.in index 0a411c3..d245d43 100644 --- a/configure.in.in +++ b/configure.in.in @@ -17,13 +17,13 @@ m4_define([libxfce4menu_version_minor], [6]) m4_define([libxfce4menu_version_micro], [1]) m4_define([libxfce4menu_version_nano], []) m4_define([libxfce4menu_version_build], [...@revision@]) -m4_define([libxfce4menu_version_tag], []) -m4_define([libxfce4menu_version], [libxfce4menu_version_major().libxfce4menu_version_minor().libxfce4menu_version_micro()ifelse(libxfce4menu_version_nano(), [], [], [.libxfce4menu_version_nano()])ifelse(libxfce4menu_version_tag(), [svn], [libxfce4menu_version_tag()-libxfce4menu_version_build()], [libxfce4menu_version_tag()])]) +m4_define([libxfce4menu_version_tag], [git]) +m4_define([libxfce4menu_version], [libxfce4menu_version_major().libxfce4menu_version_minor().libxfce4menu_version_micro()ifelse(libxfce4menu_version_nano(), [], [], [.libxfce4menu_version_nano()])ifelse(libxfce4menu_version_tag(), [git], [libxfce4menu_version_tag()-libxfce4menu_version_build()], [libxfce4menu_version_tag()])]) dnl dnl *** Full debug support for SVN snapshots *** dnl -m4_define([libxfce4menu_debug_default], [ifelse(libxfce4menu_version_tag(), [svn], [full], [minimum])]) +m4_define([libxfce4menu_debug_default], [ifelse(libxfce4menu_version_tag(), [git], [full], [minimum])]) dnl *** dnl *** Initialize autoconf *** diff --git a/docs/reference/Makefile.am b/docs/reference/Makefile.am index 2ebe79f..62bfe9b 100644 --- a/docs/reference/Makefile.am +++ b/docs/reference/Makefile.am @@ -58,3 +58,6 @@ include $(top_srcdir)/gtk-doc.make # Other files to distribute EXTRA_DIST += \ version.xml.in + +# required for gtk-doc +dist-hook: all ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-iicapn-plugin:staging Creating branch staging
Updating branch refs/heads/staging as new branch to 1e604ed0b53b4a3f1d017836d6f7d645f9b21ace (commit) Branches are created implicitly by pushing. This mail only exists to let you know that there was code pushed to refs/heads/staging for the first time. Mails for the commits that lead to the creation of the branch will follow after this mail. ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-iicapn-plugin:staging Deleting branch staging
Deleting branch refs/heads/staging ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits