------------------------------------------------------------
revno: 1675 [merge]
committer: Rene Engelhard <r...@debian.org>
branch nick: experimental
timestamp: Sun 2009-10-18 23:54:53 +0200
message:
apparently without discussion OOO320_m2 got "3.2 beta"...; merge
modified:
changelog
rules
shell-lib-components.sh
shell-lib-extensions.sh
=== modified file 'changelog'
--- a/changelog 2009-10-16 21:40:56 +0000
+++ b/changelog 2009-10-18 21:54:53 +0000
@@ -1,6 +1,6 @@
-openoffice.org (1:3.2.0~beta~ooo320m2-1) UNRELEASED; urgency=low
+openoffice.org (1:3.2.0~beta-1) UNRELEASED; urgency=low
- * OpenOffice.org 3.2.0 release branch milestone 2 (OOO320_m2)
+ * OpenOffice.org 3.2.0 beta (OOO320_m2)
- paste into memo field doesn't replace existing content anymore
(closes: #482473)
- has many performance improvements for Base (closes: #488202)
@@ -49,7 +49,7 @@
-- Rene Engelhard <r...@debian.org> Fri, 16 Oct 2009 19:34:38 +0200
-openoffice.org (1:3.1.1-5) UNRELEASED; urgency=low
+openoffice.org (1:3.1.1-5) unstable; urgency=low
* ooo-build:
- update (01bbcda85cb32be9eb5334430fb208ec5ca60041)
@@ -57,12 +57,13 @@
- kde4_fpicker_fixes2.diff
- fixes text for checkboxes (closes: #544691)
- makes filters work (closes: #550467)
+ - src:/: update GSIs from ftp.linux.cz: ga nb nn sl
* debian/control.in:
- move -style-* recommends at -common to suggests (closes: #550126)
- build-depend on po-debconf
- build-depend on binutils (>= 2.20) and g{cc,++}-4.4 (>= 4.4.1-6) for
- armel, see http://gcc.gnu.org/PR40521
+ armel when building with gcc 4.4, see http://gcc.gnu.org/PR40521
- make -core provide openoffice.org-headless
* debian/shell-lib.sh, debian/shell-lib*.sh, debian/*.lintian-overrides*,
debian/rules: only add the functions needed to the respective maintainer
@@ -72,8 +73,10 @@
* debian/rules:
- install extension shell lib for use by extensions not from here
- enable el help (thanks Fotis Tsamis for telling it is enough translated)
+ - move one missed place from bc to expr and fix expr statement, thanks
+ Chris Cheney again
- -- Rene Engelhard <r...@debian.org> Fri, 16 Oct 2009 21:29:41 +0200
+ -- Rene Engelhard <r...@debian.org> Sat, 17 Oct 2009 16:34:53 +0200
openoffice.org (1:3.1.1-4) unstable; urgency=low
=== modified file 'rules'
--- a/rules 2009-10-16 21:40:56 +0000
+++ b/rules 2009-10-18 21:54:53 +0000
@@ -63,8 +63,8 @@
unexport LS_COLORS
MWS=OOO320
-MILESTONE:=$(shell echo "$(UPSTREAM_VERSION)" | cut -d~ -f3 | sed -e s/$(shell
echo $(MWS) | tr A-Z a-z)//)
-#MILESTONE=m1
+#MILESTONE:=$(shell echo "$(UPSTREAM_VERSION)" | cut -d~ -f3 | sed -e
s/$(shell echo $(MWS) | tr A-Z a-z)//)
+MILESTONE=m2
TAG=$(shell echo $(MWS) | tr A-Z a-z)-$(MILESTONE)
#TAG=$(MWS)_$(MILESTONE)
#OOO_BUILD_BRANCH=ooo-build-3-2
@@ -948,17 +948,17 @@
CONFIGURE_FLAGS += --disable-kde4
KDE_ICONSET_DEP=openoffice.org$(VER)-style-crystal
endif
- BUILD_DEPS += , kdelibs$(shell echo "$(KDE_VER)+1" | bc)-dev
$(KDELIBS_MINVER)
+ BUILD_DEPS += , kdelibs$(shell expr $(KDE_VER) + 1)-dev
$(KDELIBS_MINVER)
ifeq "$(KDE_VER)" "4"
BUILD_DEPS += , libqt$(KDE_VER)-dev $(QT_MINVER)
- DBG_DBG_SUGGESTS+= , kdelibs$(shell expr "$(KDE_VER)+1")-dbg,
libqt$(KDE_VER)-dbg
+ DBG_DBG_SUGGESTS+= , kdelibs$(shell expr $(KDE_VER) + 1)-dbg,
libqt$(KDE_VER)-dbg
else
DBG_DBG_SUGGESTS+= , kdelibs-dbg, qt-x11-free-dbg
endif
ifeq "$(ENABLE_KDEAB)" "y"
ifeq "$(KDE_VER)" "4"
ADDITIONAL_SECTIONS += KDE4Experimental
- BUILD_DEPS += , kdepimlibs$(shell expr "$(KDE_VER)+1")-dev
+ BUILD_DEPS += , kdepimlibs$(shell expr $(KDE_VER) + 1)-dev
endif
else
CONFIGURE_FLAGS+= --disable-kdeab
=== modified file 'shell-lib-components.sh'
--- a/shell-lib-components.sh 2009-10-16 12:33:56 +0000
+++ b/shell-lib-components.sh 2009-10-17 11:14:59 +0000
@@ -25,6 +25,8 @@
fi
fi
done
+ # wait for proper shutdown/kill
+ sleep 1
}
revoke_from_services_rdb() {
=== modified file 'shell-lib-extensions.sh'
--- a/shell-lib-extensions.sh 2009-10-16 12:33:56 +0000
+++ b/shell-lib-extensions.sh 2009-10-17 11:14:59 +0000
@@ -25,6 +25,8 @@
fi
fi
done
+ # wait for proper shutdown/kill
+ sleep 1
}
flush_unopkg_cache() {
