------------------------------------------------------------
revno: 1172
committer: Rene Engelhard <[EMAIL PROTECTED]>
branch nick: debian
timestamp: Wed 2008-08-20 16:14:32 +0200
message:
more -report-builder fixes; more -java-common Replaces:
modified:
changelog
control
control.in
control.reportdesign.in
rules
=== modified file 'changelog'
--- a/changelog 2008-08-16 06:04:25 +0000
+++ b/changelog 2008-08-20 14:14:32 +0000
@@ -1,16 +1,17 @@
-openoffice.org (1:2.4.1-6.7pre) unstable; urgency=low
+openoffice.org (1:2.4.1-7) unstable; urgency=medium
* ooo-build:
- update (r13219)
- * debian/control.mono.in: Section: libs to fix override disparity
+ * debian/control.mono.in:
+ - Section: libs to fix override disparity
* merge from experimental/3.0:
- debian/control.in:
+ remove xutils build-dep, nas was using xmkmf and it's long gone here
* debian/control.in:
- Standards-Version: 3.8.0 (already following it)
- - For upgrades from 1:2.4.1-3~bpo40+1 add a Replaces:
- openoffice.org-java-common (= 1:2.4.1-3~bpo40+1) to -base because of
- hsqldb, see below. (closes: #494512)
+ - For upgrades from bpo packages add a Replaces on
+ openoffice.org-java-common to -base because of hsqldb, see below.
+ (closes: #494512)
* debian/copyright:
- wrap "Debian package authors:" line to please lintian
* debian/rules:
@@ -23,7 +24,7 @@
the SRB also often work with older librpt*/OOo, but that would not work
with the current packaging due to shlibdeps.
- -- Rene Engelhard <[EMAIL PROTECTED]> Sat, 16 Aug 2008 02:33:49 -0300
+ -- Rene Engelhard <[EMAIL PROTECTED]> Wed, 20 Aug 2008 16:14:21 +0200
openoffice.org (1:2.4.1-6) unstable; urgency=low
=== modified file 'control'
--- a/control 2008-08-16 05:45:26 +0000
+++ b/control 2008-08-20 14:14:32 +0000
@@ -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.4.1-3~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
@@ -3157,9 +3157,8 @@
Package: openoffice.org-report-builder
Section: misc
-Priority: optional
-Architecture: i386 powerpc sparc mips mipsel s390 armel amd64 ppc64 ia64
-Depends: ${shlibs:Depends}, ${report-builder-jar-depends}, openoffice.org-base
(>= 2.3.0~src680m225), openoffice.org-report-builder-bin,
openoffice.org-java-common (>= 1:2.3.0~oog680m1)
+Architecture: all
+Depends: ${report-builder-jar-depends}, openoffice.org-base (>=
2.3.0~src680m225), openoffice.org-report-builder-bin,
openoffice.org-java-common (>= 1:2.3.0~oog680m1)
Conflicts: openoffice.org-reportdesigner
Replaces: openoffice.org-reportdesigner
Provides: openoffice.org-reportdesigner
=== modified file 'control.in'
--- a/control.in 2008-08-16 05:25:48 +0000
+++ b/control.in 2008-08-20 14:14:32 +0000
@@ -439,7 +439,12 @@
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)
=== modified file 'control.reportdesign.in'
--- a/control.reportdesign.in 2008-08-16 05:23:17 +0000
+++ b/control.reportdesign.in 2008-08-20 14:14:32 +0000
@@ -1,8 +1,7 @@
Package: openoffice.orgVER-report-builder
Section: misc
-Priority: optional
-Architecture: %OOO_JAVA_ARCHS%
-Depends: ${shlibs:Depends}, ${report-builder-jar-depends},
openoffice.orgVER-base (>= 2.3.0~src680m225),
openoffice.orgVER-report-builder-bin, openoffice.org-java-common (>=
1:2.3.0~oog680m1)
+Architecture: all
+Depends: ${report-builder-jar-depends}, openoffice.orgVER-base (>=
2.3.0~src680m225), openoffice.orgVER-report-builder-bin,
openoffice.org-java-common (>= 1:2.3.0~oog680m1)
Conflicts: openoffice.org-reportdesigner
Replaces: openoffice.org-reportdesigner
Provides: openoffice.org-reportdesigner
=== modified file 'rules'
--- a/rules 2008-08-20 02:48:09 +0000
+++ b/rules 2008-08-20 14:14:32 +0000
@@ -2873,7 +2873,6 @@
# causes ldd crashes sometimes when used with fakeroot:
# -l $(PKGDIR)-core/$(OPENOFFICEDIR)/program
dh_gencontrol -s $(DEBHELPER_OPTIONS) -Nure -Nure-dbg \
- -Nopenoffice.org$(VER)-report-builder \
-Nopenoffice.org$(VER)-presentation-minimizer \
-Nopenoffice.org$(VER)-sdbc-postgresql -- \
-V'base-version=$(BASE_VERSION)' \
@@ -2898,11 +2897,6 @@
debian/openoffice.org$(VER)-officebean/DEBIAN/control
endif
endif
-ifeq "$(ENABLE_REPORTDESIGN)" "y"
- dh_gencontrol -popenoffice.org$(VER)-report-builder -- \
- -V'report-builder-jar-depends=$(REPORT_BUILDER_JAR_DEPENDS)' \
- -v`echo $(BINARY_VERSION) | cut -d: -f1`:$(shell grep
"<version" $(SOURCE_TREE)/reportdesign/util/post.xml | perl -pi -e 's,<version
value=\"(.*)\"/>,\1,; s/^\s+//')+OOo`echo $(BINARY_VERSION) | cut -d: -f2`
-endif
dh_gencontrol -popenoffice.org$(VER)-presentation-minimizer -- \
-v$(shell grep "<version"
$(SOURCE_TREE)/sdext/source/minimizer/description.xml | perl -pi -e 's,<version
value=\"(.*)\" />,\1,; s/^\s+//')+OOo`echo $(BINARY_VERSION) | cut -d: -f2`
dh_gencontrol -popenoffice.org$(VER)-sdbc-postgresql -- \
@@ -2994,6 +2988,7 @@
dh_clideps -i
endif
dh_gencontrol -i $(DEBHELPER_OPTIONS) \
+ -Nopenoffice.org$(VER)-report-builder \
-Nlibpcvslib-perl \
-Nlibuno-cli-basetypes1.0-cil \
-Nlibuno-cli-types1.1-cil \
@@ -3020,6 +3015,11 @@
dh_gencontrol -plibuno-cli-ure1.0-cil -- \
-v$(shell grep CLI_URE_NEW_VERSION
$(SOURCE_TREE)/cli_ure/version/version.txt | cut -d"=" -f2)+OOo`echo
$(BINARY_VERSION) | cut -d: -f2`
endif
+ifeq "$(ENABLE_REPORTDESIGN)" "y"
+ dh_gencontrol -popenoffice.org$(VER)-report-builder -- \
+ -V'report-builder-jar-depends=$(REPORT_BUILDER_JAR_DEPENDS)' \
+ -v`echo $(BINARY_VERSION) | cut -d: -f1`:$(shell grep
"<version" $(SOURCE_TREE)/reportdesign/util/post.xml | perl -pi -e 's,<version
value=\"(.*)\"/>,\1,; s/^\s+//')+OOo`echo $(BINARY_VERSION) | cut -d: -f2`
+endif
ifeq "$(PACKAGE_PCVSLIB)" "y"
dh_gencontrol -plibpcvslib-perl -- \
-v0.02+OOo`echo $(BINARY_VERSION) | cut -d: -f2`
