./packages/openofficeorg/3.0.1/experimental r1377: merge
------------------------------------------------------------
revno: 1377
committer: Rene Engelhard <rene@debian.org>
branch nick: debian
timestamp: Thu 2009-01-15 07:42:02 +0100
message:
merge
modified:
changelog
rules
------------------------------------------------------------
revno: 1022.3.5
committer: Rene Engelhard <rene@debian.org>
branch nick: unstable
timestamp: Wed 2009-01-14 12:58:50 +0100
message:
backport some tiny, hopefully uncontroversial stuff
modified:
changelog
presubj
rules
------------------------------------------------------------
revno: 1022.3.6
committer: Rene Engelhard <rene@debian.org>
branch nick: unstable
timestamp: Wed 2009-01-14 14:34:26 +0100
message:
disable -gcj for ppc
modified:
changelog
control
control.gcj.in
rules
------------------------------------------------------------
revno: 1022.3.7
committer: Rene Engelhard <rene@debian.org>
branch nick: unstable
timestamp: Wed 2009-01-14 15:14:44 +0100
message:
some lintian fixes
added:
source.lintian-overrides
modified:
changelog
shell-lib.sh
------------------------------------------------------------
revno: 1022.3.8
committer: Rene Engelhard <rene@debian.org>
branch nick: debian
timestamp: Thu 2009-01-15 00:01:30 +0100
message:
regenerate control
modified:
control
------------------------------------------------------------
revno: 1022.3.9
committer: Rene Engelhard <rene@debian.org>
branch nick: debian
timestamp: Thu 2009-01-15 07:38:13 +0100
message:
mention lintian bug nr as the RT wants that documentation; update xulrunner build-dep in MOZILLA=libxul case for current reality
modified:
changelog
rules
=== modified file 'changelog'
--- a/changelog 2009-01-14 16:23:59 +0000
+++ b/changelog 2009-01-15 06:42:02 +0000
@@ -2,6 +2,8 @@
* merge from Ubuntu:
- make ure only Suggest a JRE
+ * debian/rules:
+ - update xulrunner build-dep in MOZILLA=libxul case for current reality
-- Rene Engelhard <rene@debian.org> Wed, 14 Jan 2009 17:11:40 +0100
@@ -55,7 +57,7 @@
- fixes usage of flash v9 plugin (closes: #434510)
* ooo-build
- switch to ooo-build-3-0-1 branch (r14903)
- * debian/source.lintian-overrides: override bogus
+ * debian/source.lintian-overrides: override bogus (lintian bug #511859)
missing-build-dependency-for-dh_-command
* debian/rules:
- update .so -> -dev merging to the fact that 3.0s SDK does not have
=== modified file 'rules'
--- a/rules 2009-01-13 06:52:33 +0000
+++ b/rules 2009-01-15 06:42:02 +0000
@@ -640,7 +640,7 @@
DBG_DBG_SUGGESTS+= , libnss3-1d-dbg, libnspr4-0d-dbg
else
ifeq "$(MOZILLA)" "libxul"
- BUILD_DEPS+= , xulrunner-dev-static [$(OOO_MOZILLA_ARCHS)], libnss3-dev [$(OOO_MOZILLA_ARCHS)]
+ BUILD_DEPS+= , xulrunner-dev [$(OOO_MOZILLA_ARCHS)], libnss3-dev [$(OOO_MOZILLA_ARCHS)]
else
ifeq "$(MOZILLA)" "iceape"
BUILD_DEPS += , $(MOZILLA)-dev (>= 1.1.9-5) [$(OOO_MOZILLA_ARCHS)], libnss3-dev [$(OOO_MOZILLA_ARCHS)]
Reply to: