./packages/openofficeorg/3.2/unstable r1842: Hack around 0.7.6+... > 0.7.6+... by keeping 0.7.6 as version
------------------------------------------------------------
revno: 1842
committer: Rene Engelhard <rene@debian.org>
branch nick: unstable
timestamp: Fri 2010-03-05 16:41:09 +0100
message:
Hack around 0.7.6+... > 0.7.6+... by keeping 0.7.6 as version
modified:
changelog
control
control.in
rules
=== modified file 'changelog'
--- a/changelog 2010-03-05 12:16:05 +0000
+++ b/changelog 2010-03-05 15:41:09 +0000
@@ -1,9 +1,10 @@
openoffice.org (1:3.2.0-4) UNRELEASED; urgency=low
* debian/patches/update-postgresql-sdbc-to-0.7.6a.diff:
- update PostgreSQL driver to 0.7.6a (closes: #572590)
+ update PostgreSQL driver to 0.7.6a (closes: #572590).
+ Hack around 0.7.6+... > 0.7.6+... by keeping 0.7.6 as version.
* debian/control.in:
- - add Breaks: openoffice.org-sdbc-postgresql (<< 1:0.7.6a~) for -base
+ - add Breaks: openoffice.org-sdbc-postgresql (<< 1:0.7.6+OOo3.2.0-4) for -base
* debian/copyright: update
-- Rene Engelhard <rene@debian.org> Fri, 05 Mar 2010 09:59:53 +0100
=== modified file 'control'
--- a/control 2010-03-05 12:16:05 +0000
+++ b/control 2010-03-05 15:41:09 +0000
@@ -223,7 +223,7 @@
Architecture: i386 powerpc mips mipsel s390 m68k amd64 ia64 ppc64 s390x sparc hppa
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}
-Breaks: openoffice.org-sdbc-postgresql (<< 1:0.7.6a~)
+Breaks: openoffice.org-sdbc-postgresql (<< 1:0.7.6+OOo3.2.0-4)
Suggests: unixodbc, libmyodbc | odbc-postgresql | libsqliteodbc | tdsodbc | mdbtools, libmysql-java | libpg-java | libjtds-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), openoffice.org-calc (<< 1:3.2.0~rc1)
Conflicts: openoffice.org-debian-files, openoffice.org2-base (<< ${binary:Version}), openoffice.org-common (= 2.0.4-4), libhsqldb-java (>= 1.8.1~), openoffice.org-report-builder (<< 1.2.0~), openoffice.org-report-builder-bin (<< 1:3.2.0~)
=== modified file 'control.in'
--- a/control.in 2010-03-05 12:16:05 +0000
+++ b/control.in 2010-03-05 15:41:09 +0000
@@ -464,7 +464,7 @@
${base-hsqldb-depends},
${java-common-depends},
${misc:Depends}
-Breaks: openoffice.org-sdbc-postgresql (<< 1:0.7.6a~)
+Breaks: openoffice.org-sdbc-postgresql (<< 1:0.7.6+OOo3.2.0-4)
Suggests: unixodbc,
libmyodbc | odbc-postgresql | libsqliteodbc | tdsodbc | mdbtools,
libmysql-java | libpg-java | libjtds-java,
=== modified file 'rules'
--- a/rules 2010-03-04 15:32:17 +0000
+++ b/rules 2010-03-05 15:41:09 +0000
@@ -3513,7 +3513,7 @@
-v$(shell grep "<version" $(SOURCE_TREE)/sdext/source/presenter/description.xml | perl -pi -e 's,<version value=\"(.*)\" />,\1,; s/^\s+//')+OOo`echo $(BINARY_VERSION) | cut -d: -f2`
endif
dh_gencontrol -popenoffice.org$(VER)-sdbc-postgresql -- \
- -v`echo $(BINARY_VERSION) | cut -d: -f1`:$(shell grep ^PQ_SDBC_M $(SOURCE_TREE)/connectivity/source/drivers/postgresql/makefile.mk | cut -d"=" -f2 | xargs | sed -e s/\ /\./g)+OOo`echo $(BINARY_VERSION) | cut -d: -f2`
+ -v`echo $(BINARY_VERSION) | cut -d: -f1`:$(shell grep ^PQ_SDBC_M $(SOURCE_TREE)/connectivity/source/drivers/postgresql/makefile.mk | cut -d"=" -f2 | xargs | sed -e s/\ /\./g | sed -e s/a$$//)+OOo`echo $(BINARY_VERSION) | cut -d: -f2`
ifeq "$(ENABLE_MYSQLNATIVE)" "y"
dh_gencontrol -popenoffice.org$(VER)-mysql-connector -- \
-v$(shell grep "<version" $(SOURCE_TREE)/mysqlc/$(shell . $(SOURCE_TREE)/*.sh; echo $$OUTPATH$$PROEXT)/misc/description.xml | perl -pi -e 's,<version value=\"(.*)\" />,\1,; s/^\s+//; s/\s+$$//')+OOo`echo $(BINARY_VERSION) | cut -d: -f2`
Reply to: