------------------------------------------------------------
revno: 1640
committer: Rene Engelhard <r...@debian.org>
branch nick: 3.2
timestamp: Fri 2009-08-28 09:51:13 +0200
message:
bump libnss3 build-dep and mediawikis OOo dep
modified:
changelog
control.mediawiki.in
rules
=== modified file 'changelog'
--- a/changelog 2009-08-25 22:21:47 +0000
+++ b/changelog 2009-08-28 07:51:13 +0000
@@ -1,4 +1,4 @@
-openoffice.org (1:3.2.0~dev300m56-1) UNRELEASED; urgency=low
+openoffice.org (1:3.2.0~dev300m57-1) UNRELEASED; urgency=low
* OpenOffice.org 3.2.0 development milestone 56 (DEV300_m56)
- paste into memo field doesn't replace existing content anymore
@@ -19,8 +19,10 @@
for the testtool
- enable graphite; it's now upstream; don't use system-graphite on i386
for now
+ - bump libnss3-dev build-deps to >= 3.12.3
* debian/control.mediawiki.in:
- - we don't need a strict depends on lucene anymore, remove it again
+ - we don't need a strict depends on lucene anymore, remove it again.
+ Bump dependencies to >= 1:3.0.0~ matching description.xml
-- Rene Engelhard <r...@debian.org> Sat, 08 Aug 2009 14:31:27 +0200
=== modified file 'control.mediawiki.in'
--- a/control.mediawiki.in 2009-08-16 23:29:00 +0000
+++ b/control.mediawiki.in 2009-08-28 07:51:13 +0000
@@ -2,8 +2,8 @@
Section: misc
Priority: optional
Architecture: all
-Pre-Depends: openoffice.orgVER-java-common (>= 1:2.4.0),
${java-runtime-depends}
-Depends: ${mediawiki-jar-depends}, openoffice.orgVER-core (>= 1:2.4.0-6),
+Pre-Depends: openoffice.orgVER-java-common (>= 1:3.0.0~),
${java-runtime-depends}
+Depends: ${mediawiki-jar-depends}, openoffice.orgVER-core (>= 1:3.0.0~),
${misc:Depends}
Enhances: openoffice.orgVER-writer
Suggests: mediawiki
=== modified file 'rules'
--- a/rules 2009-08-25 22:21:47 +0000
+++ b/rules 2009-08-28 07:51:13 +0000
@@ -719,14 +719,14 @@
ifneq "$(MOZILLA)" ""
ifneq "$(OOO_MOZILLA_ARCHS)" ""
ifeq "$(MOZILLA)" "xulrunner"
- BUILD_DEPS+= , libxul-dev [$(OOO_MOZILLA_ARCHS)], libnss3-dev
[$(OOO_MOZILLA_ARCHS)]
+ BUILD_DEPS+= , libxul-dev [$(OOO_MOZILLA_ARCHS)], libnss3-dev (>=
3.12.3) [$(OOO_MOZILLA_ARCHS)]
DBG_DBG_SUGGESTS+= , libnss3-1d-dbg, libnspr4-0d-dbg
else
ifeq "$(MOZILLA)" "libxul"
- BUILD_DEPS+= , xulrunner-dev [$(OOO_MOZILLA_ARCHS)], libnss3-dev
[$(OOO_MOZILLA_ARCHS)]
+ BUILD_DEPS+= , xulrunner-dev [$(OOO_MOZILLA_ARCHS)], libnss3-dev (>=
3.12.3) [$(OOO_MOZILLA_ARCHS)]
else
ifeq "$(MOZILLA)" "iceape"
- BUILD_DEPS += , $(MOZILLA)-dev (>= 1.1.9-5) [$(OOO_MOZILLA_ARCHS)],
libnss3-dev [$(OOO_MOZILLA_ARCHS)]
+ BUILD_DEPS += , $(MOZILLA)-dev (>= 1.1.9-5) [$(OOO_MOZILLA_ARCHS)],
libnss3-dev (>= 3.12.3) [$(OOO_MOZILLA_ARCHS)]
else
BUILD_DEPS += , $(MOZILLA)-dev [$(OOO_MOZILLA_ARCHS)]
endif
