[ooo-build-commit] .: 2 commits - bin/g patches/dev300
Jan Holesovsky
kendy at kemper.freedesktop.org
Fri Aug 27 05:34:32 PDT 2010
bin/g | 2 +-
patches/dev300/apply | 2 --
patches/dev300/debug-bits.diff | 23 -----------------------
3 files changed, 1 insertion(+), 26 deletions(-)
New commits:
commit 209ad3a3fc8b9646ba227a0821c324583d637dbc
Author: Jan Holesovsky <kendy at suse.cz>
Date: Fri Aug 27 14:32:40 2010 +0200
Moved debug-bits.diff to the repos.
diff --git a/patches/dev300/apply b/patches/dev300/apply
index 4a5a90d..3d23f62 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -333,8 +333,6 @@ buildfix-qadevOOo-java-encoding.diff, brosenk
# Fixes that were not accepted up-stream, but are still useful
[ FixesNotForUpstream ]
-# Make debugging nicer under unix
-debug-bits.diff, i#35336, jholesov
# Make the scroll-wheel / page popup more sane
gui-sw-scroll.diff, i#20826, michael
diff --git a/patches/dev300/debug-bits.diff b/patches/dev300/debug-bits.diff
deleted file mode 100644
index b2766ed..0000000
--- a/patches/dev300/debug-bits.diff
+++ /dev/null
@@ -1,23 +0,0 @@
----
- tools/source/debug/debug.cxx | 4 ++++
- 1 files changed, 4 insertions(+), 0 deletions(-)
-
-diff --git tools/source/debug/debug.cxx tools/source/debug/debug.cxx
-index cd8441b..7de3195 100644
---- tools/source/debug/debug.cxx
-+++ tools/source/debug/debug.cxx
-@@ -176,7 +176,11 @@ struct DebugData
- aDbgData.bOverwrite = TRUE;
- aDbgData.nTraceOut = DBG_OUT_NULL;
- aDbgData.nWarningOut = DBG_OUT_NULL;
-+#ifdef UNX
-+ aDbgData.nErrorOut = DBG_OUT_SHELL;
-+#else
- aDbgData.nErrorOut = DBG_OUT_MSGBOX;
-+#endif
- aDbgData.bMemInit = 0x77;
- aDbgData.bMemBound = 0x55;
- aDbgData.bMemFree = 0x33;
---
-1.7.0.1
-
commit 91581a3ceceaf456ba03b1f0ded19ea340a2b1bf
Author: Jan Holesovsky <kendy at suse.cz>
Date: Fri Aug 27 14:30:07 2010 +0200
Add parenthesis to the git command again.
We need that not to have problems with things that contain spaces (like
--author='Foo Barski <foo at barski.org>')
diff --git a/bin/g b/bin/g
index cf80058..4e8e862 100755
--- a/bin/g
+++ b/bin/g
@@ -149,7 +149,7 @@ for DIR in * ; do
# check for changes
HEADREF=`git show-ref --head HEAD`
- git $PAGER $COMMAND $EXTRA ${FILES[@]}
+ git $PAGER "$COMMAND" $EXTRA "${FILES[@]}"
RETURN=$?
# update stamp if the repo changed
More information about the ooo-build-commit
mailing list