------------------------------------------------------------ revno: 1461 committer: Rene Engelhard <r...@debian.org> branch nick: unstable timestamp: Wed 2009-04-15 21:09:05 +0200 message: update ooo-build; resolve conflicts/regen control modified: changelog control control.in
=== modified file 'changelog' --- a/changelog 2009-04-15 10:02:51 +0000 +++ b/changelog 2009-04-15 19:09:05 +0000 @@ -1,5 +1,8 @@ openoffice.org (1:3.0.1-11) UNRELEASED; urgency=low + * ooo-build + - update (142ca02d3bfd7bb2ce4574348a499d1568dfb449) + * debian/control.in, debian/control.kde.in, debian/rules: - disable -kde and -kdeab as they're for KDE3 (closes: #523899). Improve BUILD_KDE conditional @@ -14,7 +17,7 @@ - -dbg -> debug, -l10n-* -> localization, -officebean -> java, -base -> database, ttf-opensymbol -> fonts, *cli* -> cli-mono - -- Rene Engelhard <r...@debian.org> Mon, 13 Apr 2009 19:43:23 +0200 + -- Rene Engelhard <r...@debian.org> Wed, 15 Apr 2009 21:02:53 +0200 openoffice.org (1:3.0.1-10) unstable; urgency=low
=== modified file 'control' --- a/control 2009-04-15 09:45:34 +0000 +++ b/control 2009-04-15 19:09:05 +0000 @@ -219,11 +219,8 @@ Package: openoffice.org-base Architecture: i386 powerpc sparc mips mipsel armel s390 m68k amd64 ia64 ppc64 -<<<<<<< TREE +Section: database Depends: openoffice.org-core (= ${binary:Version}), openoffice.org-base-core (= ${binary:Version}), ${shlibs:Depends}, ${java-runtime-depends}, ${base-hsqldb-depends}, ${java-common-depends}, ${misc:Depends} -======= -Section: database ->>>>>>> MERGE-SOURCE Suggests: unixodbc, libmyodbc | odbc-postgresql | libsqliteodbc | tdsodbc | mdbtools, libmysql-java | libpg-java, openoffice.org-gcj, openoffice.org-report-builder Replaces: openoffice.org-core (<< 2.0.1), openoffice.org-common (<< 1.9.113-0pre1), openoffice.org-bin (<< 1.9), openoffice.org-debian-files, openoffice.org2-base (<< ${binary:Version}), openoffice.org-java, openoffice.org-java-common (= 1:2.3.1-2~bpo40+1), openoffice.org-java-common (= 1:2.4.0-4~bpo40+1), openoffice.org-java-common (= 1:2.4.1-3~bpo40+1), openoffice.org-java-common (= 2.2.0-6~bpo.1), openoffice.org-java-common (= 2.2.1-1~bpo.1), openoffice.org-java-common (= 2.2.1-9~bpo40+1) Conflicts: openoffice.org-debian-files, openoffice.org2-base (<< ${binary:Version}), openoffice.org-common (= 2.0.4-4) @@ -403,12 +400,8 @@ Package: openoffice.org-officebean Architecture: i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64 -<<<<<<< TREE -Section: misc +Section: java Depends: openoffice.org-core (= ${binary:Version}), ${shlibs:Depends}, ${java-runtime-depends}, ${java-common-depends}, ${misc:Depends} -======= -Section: java ->>>>>>> MERGE-SOURCE Replaces: openoffice.org-common (<< 1.9.113-0pre1), openoffice.org2-officebean Provides: openoffice.org2-officebean Conflicts: openoffice.org2-officebean === modified file 'control.in' --- a/control.in 2009-04-15 09:43:12 +0000 +++ b/control.in 2009-04-15 19:09:05 +0000 @@ -445,12 +445,9 @@ Package: openoffice.orgVER-base Architecture: %OOO_ARCHS% -<<<<<<< TREE -Depends: openoffice.orgVER-core (= ${binary:Version}), - openoffice.orgVER-base-core (= ${binary:Version}), -======= Section: database ->>>>>>> MERGE-SOURCE +Depends: openoffice.orgVER-core (= ${binary:Version}), + openoffice.orgVER-base-core (= ${binary:Version}), ${shlibs:Depends}, ${java-runtime-depends}, ${base-hsqldb-depends}, @@ -676,12 +673,8 @@ Package: openoffice.orgVER-officebean Architecture: %OOO_JAVA_ARCHS% -<<<<<<< TREE -Section: misc -Depends: openoffice.orgVER-core (= ${binary:Version}), -======= Section: java ->>>>>>> MERGE-SOURCE +Depends: openoffice.orgVER-core (= ${binary:Version}), ${shlibs:Depends}, ${java-runtime-depends}, ${java-common-depends},