------------------------------------------------------------ revno: 1353 committer: Rene Engelhard <r...@debian.org> branch nick: debian timestamp: Tue 2008-12-23 19:37:56 +0100 message: Rene Engelhard 2008-12-23 merge Rene Engelhard 2008-12-23 add missing Depends: on ${java-runtime-depends} Rene Engelhard 2008-12-23 debian/rules: apply Python26 patchset if build... Rene Engelhard 2008-12-23 debian/startcenter.desktop.in: use ooo-gulls.p... Rene Engelhard 2008-12-23 remove obsolete variable modified: changelog control control.in control.reportdesign.in rules startcenter.desktop.in ------------------------------------------------------------ revno: 1352.1.1 committer: Rene Engelhard <r...@debian.org> branch nick: debian timestamp: Tue 2008-12-23 14:32:16 +0100 message: remove obsolete variable modified: rules ------------------------------------------------------------ revno: 1352.1.2 committer: Rene Engelhard <r...@debian.org> branch nick: debian timestamp: Tue 2008-12-23 14:34:36 +0100 message: debian/startcenter.desktop.in: use ooo-gulls.png as Icon modified: changelog startcenter.desktop.in ------------------------------------------------------------ revno: 1352.1.3 committer: Rene Engelhard <r...@debian.org> branch nick: debian timestamp: Tue 2008-12-23 14:35:58 +0100 message: debian/rules: apply Python26 patchset if building with python 2.6 modified: changelog rules ------------------------------------------------------------ revno: 1352.1.4 committer: Rene Engelhard <r...@debian.org> branch nick: debian timestamp: Tue 2008-12-23 14:41:23 +0100 message: merge modified: changelog control control.reportdesign.in ------------------------------------------------------------ revno: 1022.1.210 committer: Rene Engelhard <r...@debian.org> branch nick: unstable timestamp: Tue 2008-12-23 14:31:12 +0100 message: add missing Depends: on ${java-runtime-depends} modified: changelog control control.reportdesign.in
=== modified file 'changelog' --- a/changelog 2008-12-23 11:24:22 +0000 +++ b/changelog 2008-12-23 13:41:23 +0000 @@ -1,3 +1,13 @@ +openoffice.org (1:3.0.1~rc1-2.3pre) experimental; urgency=low + + * debian/startcenter.desktop.in: use ooo-gulls.png as Icon + * debian/rules: + - apply Python26 patchset if building with python 2.6 + * debian/control.reportdesign.in: + - add missing Depends: on ${java-runtime-depends} + + -- Rene Engelhard <r...@debian.org> Tue, 23 Dec 2008 14:34:51 +0100 + openoffice.org (1:3.0.1~rc1-2) experimental; urgency=low * ooo-build:
=== modified file 'control' --- a/control 2008-12-23 11:24:22 +0000 +++ b/control 2008-12-23 18:37:56 +0000 @@ -157,7 +157,7 @@ Package: openoffice.org-calc Architecture: i386 powerpc sparc mips mipsel armel s390 m68k amd64 ia64 ppc64 -Depends: openoffice.org-core (= ${Source-Version}), openoffice.org-base-core (= ${Source-Version}), ${shlibs:Depends}, ${lpsolve-dep} +Depends: openoffice.org-core (= ${Source-Version}), openoffice.org-base-core (= ${Source-Version}), ${shlibs:Depends}, ${lpsolve-dep}, ${scsolver:Depends} Replaces: openoffice.org2-core (<< 1.9.113-0pre1), openoffice.org (<< 1.9), openoffice.org-debian-files, openoffice.org-core (<= 2.2.0-4), openoffice.org2-calc (<< ${Source-Version}), openoffice.org-common (<< 2.0.3+2.0.4m179) Conflicts: openoffice.org-bin (<< 1.9), openoffice.org-debian-files, openoffice.org2-calc (<< ${Source-Version}) Provides: openoffice.org2-calc @@ -3241,7 +3241,7 @@ Package: openoffice.org-report-builder Section: misc Architecture: all -Depends: ${report-builder-jar-depends}, openoffice.org-report-builder-bin (>= ${base-version}), openoffice.org-java-common (>= ${base-version}) +Depends: ${report-builder-jar-depends}, openoffice.org-report-builder-bin (>= ${base-version}), openoffice.org-java-common (>= ${base-version}), ${java-runtime-depends} Conflicts: openoffice.org-reportdesigner, openoffice.org-report-builder-bin (>= ${base-version}.1), openoffice.org-java-common (>= ${base-version}.1) Replaces: openoffice.org-reportdesigner Provides: openoffice.org-reportdesigner === modified file 'control.in' --- a/control.in 2008-12-23 11:24:22 +0000 +++ b/control.in 2008-12-23 18:37:56 +0000 @@ -341,7 +341,7 @@ Depends: openoffice.orgVER-core (= ${Source-Version}), openoffice.orgVER-base-core (= ${Source-Version}), ${shlibs:Depends}, - ${lpsolve-dep} + ${lpsolve-dep}, ${scsolver-shlibs:Depends} Replaces: openoffice.org2-core (<< 1.9.113-0pre1), openoffice.org (<< 1.9), openoffice.org-debian-files, === modified file 'control.reportdesign.in' --- a/control.reportdesign.in 2008-09-21 09:44:31 +0000 +++ b/control.reportdesign.in 2008-12-23 13:41:23 +0000 @@ -1,7 +1,7 @@ Package: openoffice.orgVER-report-builder Section: misc Architecture: all -Depends: ${report-builder-jar-depends}, openoffice.orgVER-report-builder-bin (>= ${base-version}), openoffice.org-java-common (>= ${base-version}) +Depends: ${report-builder-jar-depends}, openoffice.orgVER-report-builder-bin (>= ${base-version}), openoffice.org-java-common (>= ${base-version}), ${java-runtime-depends} Conflicts: openoffice.org-reportdesigner, openoffice.orgVER-report-builder-bin (>= ${base-version}.1), openoffice.org-java-common (>= ${base-version}.1) Replaces: openoffice.org-reportdesigner Provides: openoffice.org-reportdesigner === modified file 'rules' --- a/rules 2008-12-23 11:24:22 +0000 +++ b/rules 2008-12-23 18:37:56 +0000 @@ -164,7 +164,6 @@ RUN_API_TESTS=n RUN_UNIT_TESTS=n USE_LIBCURL4=y -USE_SYSTEM_LIBSVG=y USE_SYSTEM_DMAKE=y USE_LIBSUITESPARSE=y USE_BZIP_COMPRESS=n @@ -454,6 +453,9 @@ endif BUILD_DEPS += , python-dev (>= 2.4) DBG_DBG_SUGGESTS+= , python-dbg + ifeq "$(PYMAJOR).$(PYMINOR)" "2.6" + ADDITIONAL_SECTIONS += Python26 + endif else BUILD_DEPS += , python endif @@ -3114,6 +3116,14 @@ -Sdebian/ure/$(OOUREDIR)/lib \ $(SOURCE_TREE)/connectivity/$(shell . $(SOURCE_TREE)/*.sh; echo $$OUTPATH$$PROEXT)/lib/postgresql-sdbc*.so \ > debian/openoffice.org$(VER)-sdbc-postgresql.substvars +ifeq "$(USE_SCSOLVER)" "y" + LD_LIBRARY_PATH="/usr/lib/libfakeroot:debian/uno-libs3/$(OOUREDIR)/lib:debian/ure/$(OOUREDIR)/lib:$(PKGDIR)-core/$(OODIR)/program" \ + dpkg-shlibdeps -O -p scsolver-shlibs \ + -Sdebian/uno-libs3/$(OOUREDIR)/lib \ + -Sdebian/ure/$(OOUREDIR)/lib \ + $(SOURCE_TREE)/scsolver/$(shell . $(SOURCE_TREE)/*.sh; echo $$OUTPATH$$PROEXT)/lib/scsolver.uno.so \ + >> debian/openoffice.org$(VER)-calc.substvars +endif ifeq "$(ENABLE_MINIMIZER)" "y" LD_LIBRARY_PATH="/usr/lib/libfakeroot:debian/uno-libs3/$(OOUREDIR)/lib:debian/ure/$(OOUREDIR)/lib:$(PKGDIR)-core/$(OODIR)/program" \ dpkg-shlibdeps -O \ === modified file 'startcenter.desktop.in' --- a/startcenter.desktop.in 2008-11-12 07:16:10 +0000 +++ b/startcenter.desktop.in 2008-12-23 13:34:36 +0000 @@ -4,7 +4,7 @@ Comment=OpenOffice.org tryexec=ooff...@ver@ exec=ooff...@ver@ %U -Icon=ooo-writer.png +Icon=ooo-gulls.png Terminal=false Type=Application Categories=Office