./packages/openofficeorg/3.1/unstable r1539: make -common conflict against -core having another basisX.Y than -common and introduce new BASIS_VERSION variable
------------------------------------------------------------
revno: 1539
committer: Rene Engelhard <rene@debian.org>
branch nick: unstable
timestamp: Thu 2009-05-14 14:28:01 +0200
message:
make -common conflict against -core having another basisX.Y than -common and introduce new BASIS_VERSION variable
modified:
changelog
control.in
rules
=== modified file 'changelog'
--- a/changelog 2009-05-13 08:24:16 +0000
+++ b/changelog 2009-05-14 12:28:01 +0000
@@ -7,12 +7,14 @@
* debian/rules:
- add support for boost-defaults
- more fixes for GCC_VERSION setting
+ - introduce new BASIS_VERSION variable
* debian/control.in, debian/rules:
- allow flex again, bump build-dep for flex if we use gcc 4.4 for safety
* debian/control.in:
- update openclipart-openoffice.org conflicts to (<= 0.18+dfsg-7)
- make -emailmerge Pre-Depend on ${python:Depends}, python-uno
(closes: #522022, #527558)
+ - make -common conflict against -core having another basisX.Y than -common
* debian/copyright:
- actually add Files: section matching the upstream tarballs
* debian/rules, debian/broffice.org.{preinst,postrm}.in,
=== modified file 'control.in'
--- a/control.in 2009-05-08 16:30:52 +0000
+++ b/control.in 2009-05-14 12:28:01 +0000
@@ -283,6 +283,8 @@
broffice.org (<< ${base-version}),
openclipart-openoffice.org (<= 0.18+dfsg-7),
dictionaries-common (<< 0.98.14)
+ openoffice.orgVER-core (<< ${basis-version}),
+ openoffice.orgVER-core (>= ${basis-version}.99)
Provides: openoffice.org2-common,
openoffice.org-l10n-en-us
Replaces: openoffice.org-debian-files,
=== modified file 'rules'
--- a/rules 2009-05-13 08:24:16 +0000
+++ b/rules 2009-05-14 12:28:01 +0000
@@ -24,6 +24,7 @@
HELP_L10N_VIRTUAL_VERSION:=3.1
#VER:=3
OOVER:=3.1
+BASIS_VERSION:=$(OOVER)
PACKAGES := $(shell dh_listpackages)
ARCH_INDEP_PACKAGES := $(shell dh_listpackages -i)
@@ -40,7 +41,7 @@
PKGDIR:=debian/openoffice.org$(VER)
OODIRNAME=openoffice$(VER)
OOBRANDDIR:=usr/lib/$(OODIRNAME)
-OOBASISDIR:=$(OOBRANDDIR)/basis$(OOVER)
+OOBASISDIR:=$(OOBRANDDIR)/basis$(BASIS_VERSION)
OOSDKDIR:=$(OOBASISDIR)/sdk
OOUREDIR:=usr/lib/ure
# compatability
@@ -3043,6 +3044,7 @@
-Nopenoffice.org$(VER)-sdbc-postgresql -- \
-V"ure:Version=$(shell grep UREPACKAGEVERSION $(SOURCE_TREE)/instsetoo_native/util/openoffice.lst | awk '{ print $$2 }')+OOo`echo $(BINARY_VERSION) | cut -d: -f2`" \
-V'base-version=$(BASE_VERSION)' \
+ -V'basis-version=$(BASIS_VERSION)' \
-V'help-l10n-virtual-version=$(HELP_L10N_VIRTUAL_VERSION)' \
-V'dev-stl-depends=$(DEV_STL_DEPENDS)' \
-V'base-hsqldb-depends=$(BASE_HSQLDB_DEPENDS)' \
Reply to: