./packages/openofficeorg/2.4.1/unstable r1175: -7
------------------------------------------------------------
revno: 1175
committer: Rene Engelhard <rene@debian.org>
branch nick: debian
timestamp: Fri 2008-08-22 17:58:09 +0200
message:
-7
modified:
changelog
control
rules
=== modified file 'changelog'
--- a/changelog 2008-08-20 14:14:32 +0000
+++ b/changelog 2008-08-22 15:58:09 +0000
@@ -1,7 +1,7 @@
openoffice.org (1:2.4.1-7) unstable; urgency=medium
* ooo-build:
- - update (r13219)
+ - update to debian-2-4-1 branch
* debian/control.mono.in:
- Section: libs to fix override disparity
* merge from experimental/3.0:
=== modified file 'control'
--- a/control 2008-08-20 14:14:32 +0000
+++ b/control 2008-08-22 15:58:09 +0000
@@ -8,7 +8,7 @@
Standards-Version: 3.8.0
XS-Python-Version: current
Vcs-Bzr: http://bzr.debian.org/pkg-openoffice/packages/openofficeorg/2.4.1/unstable
-Vcs-Svn: svn://svn.gnome.org/svn/ooo-build/branches/ooo-build-2-4-1
+Vcs-Svn: svn://svn.gnome.org/svn/ooo-build/branches/debian-2-4-1
Homepage: http://www.openoffice.org
Package: openoffice.org
@@ -222,7 +222,7 @@
Architecture: i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64
Depends: openoffice.org-core (= ${Source-Version}), openoffice.org-base-core (= ${Source-Version}), ${shlibs:Depends}, ${java-runtime-depends}, ${base-hsqldb-depends}, ${java-common-depends}
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 (<< ${Source-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)
+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 (<< ${Source-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 (<< ${Source-Version}), openoffice.org-common (= 2.0.4-4)
Provides: openoffice.org2-base
Description: OpenOffice.org office suite - database
=== modified file 'rules'
--- a/rules 2008-08-20 14:14:32 +0000
+++ b/rules 2008-08-22 15:58:09 +0000
@@ -64,7 +64,7 @@
MILESTONE=m17
#TAG=$(shell echo $(MWS) | tr A-Z a-z)-$(MILESTONE)
TAG=$(MWS)_$(MILESTONE)
-OOO_BUILD_BRANCH=ooo-build-2-4-1
+OOO_BUILD_BRANCH=debian-2-4-1
ifeq "" "$(OOO_BUILD_BRANCH)"
OOO_BUILD_SVN=svn://svn.gnome.org/svn/ooo-build/trunk
else
Reply to: