------------------------------------------------------------
revno: 1417
committer: Rene Engelhard <r...@debian.org>
branch nick: debian
timestamp: Thu 2009-02-26 08:22:26 +0100
message:
merge~
modified:
README.Debian-source
changelog
control
control.in
rules
------------------------------------------------------------
revno: 1332.1.82
committer: Rene Engelhard <r...@debian.org>
branch nick: debian
timestamp: Wed 2009-02-25 20:58:54 +0100
message:
make -core conflict against < OOo3 -java-common
modified:
changelog
control
control.in
------------------------------------------------------------
revno: 1332.1.83
committer: Rene Engelhard <r...@debian.org>
branch nick: debian
timestamp: Thu 2009-02-26 08:20:31 +0100
message:
oops
modified:
rules
------------------------------------------------------------
revno: 1022.3.17
committer: Rene Engelhard <r...@debian.org>
branch nick: debian
timestamp: Wed 2009-02-25 22:49:42 +0100
message:
update README.Debian-source
modified:
README.Debian-source
=== modified file 'README.Debian-source'
--- a/README.Debian-source 2009-01-19 15:54:17 +0000
+++ b/README.Debian-source 2009-02-26 07:22:26 +0000
@@ -7,4 +7,6 @@
* system:
- dictionaries/{da_DK,en_GB,en_US,nl_NL,ru_RU}/hyph_*.dic:
hyphenation patterns violating licenses/having questionable license
+ * extensions:
+ - jfreereport/download/liblayout.zip: liblayout/resource/rfc1345.txt
=== modified file 'changelog'
--- a/changelog 2009-02-25 21:16:05 +0000
+++ b/changelog 2009-02-26 07:22:26 +0000
@@ -52,8 +52,10 @@
* debian/rules
- MONO2=y
+ * debian/control.in:
+ - make -core conflict against < OOo3 -java-common (closes: #517001)
- -- Rene Engelhard <r...@debian.org> Tue, 24 Feb 2009 11:51:06 +0100
+ -- Rene Engelhard <r...@debian.org> Wed, 25 Feb 2009 20:55:46 +0100
openoffice.org (1:3.0.1-3) unstable; urgency=low
=== modified file 'control'
--- a/control 2009-02-25 14:25:11 +0000
+++ b/control 2009-02-26 07:22:26 +0000
@@ -16,7 +16,7 @@
Depends: openoffice.org-core (= ${Source-Version}), openoffice.org-writer,
openoffice.org-calc, openoffice.org-impress, openoffice.org-draw,
openoffice.org-math, openoffice.org-base, openoffice.org-report-builder-bin,
ttf-dejavu, ${ooo-officebean-dep}, ${writer-w2l-dep},
openoffice.org-filter-mobiledev, ${lucene-depends}, ${java-common-depends}
Recommends: ${ooo-binfilter-dep}, ttf-liberation | msttcorefonts
Suggests: hunspell-dictionary, myspell-dictionary,
openoffice.org-help-${help-l10n-virtual-version},
openoffice.org-l10n-${help-l10n-virtual-version}, menu, unixodbc, cups-bsd,
libsane, openoffice.org-hyphenation, openoffice.org2-thesaurus, libxrender1,
libgl1, openoffice.org-gnome | openoffice.org-kde, iceweasel | firefox |
icedove | thunderbird | iceape-browser | mozilla-browser,
${java-runtime-depends}, openclipart-openoffice.org, pstoedit,
graphicsmagick-imagemagick-compat | imagemagick, libpaper-utils,
${gstreamer-plugins-suggests}
-Conflicts: openoffice.org2 (<< ${Source-Version})
+Conflicts: openoffice.org2 (<< ${Source-Version}), openoffice.org-java-common
(<< 1:3.0.0)
Replaces: openoffice.org2 (<< ${Source-Version}), openoffice.org-debian-files
Provides: openoffice.org2
Description: OpenOffice.org Office suite
=== modified file 'control.in'
--- a/control.in 2009-02-21 22:11:21 +0000
+++ b/control.in 2009-02-26 07:22:26 +0000
@@ -94,7 +94,7 @@
graphicsmagick-imagemagick-compat | imagemagick,
libpaper-utils,
${gstreamer-plugins-suggests}
-Conflicts: openoffice.org2 (<< ${Source-Version})
+Conflicts: openoffice.org2 (<< ${Source-Version}),
openoffice.orgVER-java-common (<< 1:3.0.0)
Replaces: openoffice.org2 (<< ${Source-Version}), openoffice.org-debian-files
Provides: openoffice.org2
Description: OpenOffice.org Office suite
=== modified file 'rules'
--- a/rules 2009-02-25 21:16:05 +0000
+++ b/rules 2009-02-26 07:22:26 +0000
@@ -21,7 +21,7 @@
#BINARY_VERSION=1:2.4.0-$(shell dpkg-parsechangelog | grep urgency \
| awk '{print $$2}' | sed -e s/"("// -e s/")"// | cut -d"-" -f2)
HELP_L10N_VIRTUAL_VERSION:=$(shell echo $(UPSTREAM_VERSION) | cut -d: -f2 | tr
[~] [\\-])
-#HELP_L10N_VIRTUAL_VERSION:=3.0
+#HELP_L10N_VIRTUAL_VERSION:=3.1
#VER:=3
OOVER:=3.1
@@ -2437,7 +2437,7 @@
endif
ifeq "$(USE_SCSOLVER)" "y"
- install -D -m644 $(SOURCE_TREE)/scsolver/$(shell . $(SOURCE_TREE)/*.sh;
echo $$OUTPATH$$PROEXT)/bin/libscsolver.uno.oxt \
+ install -D -m644 $(SOURCE_TREE)/scsolver/$(shell . $(SOURCE_TREE)/*.sh;
echo $$OUTPATH$$PROEXT)/bin/scsolver.uno.oxt \
$(PKGDIR)-calc/$(OOBRANDDIR)/share/extension/install/scsolver.uno.oxt
# we don't need it anymore - the menu entry is replaced with Koheis
rm -f $(PKGDIR)-calc/$(OODIR)/program/libsolver*.so
@@ -3055,7 +3055,7 @@
dpkg-shlibdeps -O -pscsolver-shlibs \
-Sdebian/uno-libs3/$(OOUREDIR)/lib \
-Sdebian/ure/$(OOUREDIR)/lib \
- $(SOURCE_TREE)/scsolver/$(shell . $(SOURCE_TREE)/*.sh;
echo $$OUTPATH$$PROEXT)/lib/scsolver.uno.so \
+ $(SOURCE_TREE)/scsolver/$(shell . $(SOURCE_TREE)/*.sh;
echo $$OUTPATH$$PROEXT)/lib/libscsolver.uno.so \
>> debian/openoffice.org$(VER)-calc.substvars
endif
ifeq "$(ENABLE_MINIMIZER)" "y"
