------------------------------------------------------------
revno: 1068
committer: Rene Engelhard <[EMAIL PROTECTED]>
branch nick: debian
timestamp: Tue 2008-05-06 11:50:18 +0200
message:
* debian/rules, debian/control.in: URE is now a part of the "three-layer
office". Remove PACKAGE_URE conditionals and make -core depend on ure.
modified:
changelog
control.in
rules
=== modified file 'changelog'
--- a/changelog 2008-05-06 08:42:12 +0000
+++ b/changelog 2008-05-06 09:50:18 +0000
@@ -37,6 +37,8 @@
- make impress recommend libxrandr2 as OOo now can detect size
chages through it
- build-depend against libxrandr-dev
+ * debian/rules, debian/control.in: URE is now a part of the "tree-layer
+ office". Remove PACKAGE_URE conditionals and make -core depend on ure.
* debian/copyright: LGPL v3
* debian/scripts/vars.*: add PLATFORMID (not kfreebsd-* yet...)
=== modified file 'control.in'
--- a/control.in 2008-05-01 06:43:09 +0000
+++ b/control.in 2008-05-06 09:50:18 +0000
@@ -181,7 +181,8 @@
Package: openoffice.orgVER-core
Architecture: %OOO_ARCHS%
-Depends: openoffice.orgVER-common (>> ${base-version}),
+Depends: ure (>= ${ure:Version}),
+ openoffice.orgVER-common (>> ${base-version}),
ttf-opensymbol,
${shlibs:Depends},
fontconfig,
=== modified file 'rules'
--- a/rules 2008-05-06 09:45:32 +0000
+++ b/rules 2008-05-06 09:50:18 +0000
@@ -143,7 +143,6 @@
NEONSONR=27
PARALLEL_BUILD=n
MOZILLA=xulrunner
-PACKAGE_URE=y
ENABLE_OPENGL=y
SYSTEM_OPENSSL=y
NEW_DPKG_SHLIBDEPS=y
@@ -445,7 +444,7 @@
else
# -g gives a far too big deb (>400M, ca. 1GB I-S)
SMALL_SYMBOLS = y
- DBG_DBG_SUGGESTS+= , libc6.1-dbg [alpha ia64], libc0.1-dbg
[kfreebsd-i386 kfreebsd-amd64], libc0.3-dbg [hurd-i386], libc6-dbg [!ia64
!alpha !kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libatk1.0-dbg,
libglib2.0-0-dbg, libgnomevfs2-0-dbg, libstdc++6-$(shell g++ --version | head
-n 1 | cut -d' ' -f3 | cut -d'.' -f1,2)-dbg, libx11-6-dbg, libxext6-dbg,
libxaw7-dbg, libxml2-dbg, libgtk2.0-0-dbg, libxau6-dbg, libice6-dbg,
libsm6-dbg, libxinerama1-dbg, libfontconfig1-dbg
+ DBG_DBG_SUGGESTS+= , libc6.1-dbg [alpha ia64], libc0.1-dbg
[kfreebsd-i386 kfreebsd-amd64], libc0.3-dbg [hurd-i386], libc6-dbg [!ia64
!alpha !kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], ure-dbg, libatk1.0-dbg,
libglib2.0-0-dbg, libgnomevfs2-0-dbg, libstdc++6-$(shell g++ --version | head
-n 1 | cut -d' ' -f3 | cut -d'.' -f1,2)-dbg, libx11-6-dbg, libxext6-dbg,
libxaw7-dbg, libxml2-dbg, libgtk2.0-0-dbg, libxau6-dbg, libice6-dbg,
libsm6-dbg, libxinerama1-dbg, libfontconfig1-dbg
ifeq "$(USE_LIBCURL4)" "y"
DBG_DBG_SUGGESTS+= , libcurl3-dbg
else
@@ -1280,10 +1279,8 @@
perl -pi -e 's|(Depends: openoffice.org$(VER)-writer,
openoffice.org$(VER)-l10n-en-us)|\1, ttf-devanagari-fonts|' \
debian/control
endif
-ifeq "$(PACKAGE_URE)" "y"
sed -e "s|openoffice.orgVER|openoffice.org$(VER)|g" \
>> debian/control < debian/control.ure.in
-endif
ifeq "$(ENABLE_JAVA)" "y"
ifeq "$(BUILD_JARS_NATIVE)" "y"
sed -e "s|openoffice.orgVER|openoffice.org$(VER)|g" \
@@ -1892,7 +1889,6 @@
cp -r --preserve=mode debian/tmp/pkg/openoffice.org-filter-binfilter
$(PKGDIR)-filter-binfilter || exit 1
endif
-ifeq "$(PACKAGE_URE)" "y"
rm -rf debian/ure debian/ure.*.debhelper ;\
cp -r --preserve=mode debian/tmp/pkg/ure debian/ure || exit 1
# not needed
@@ -1901,7 +1897,6 @@
# should go into /usr/share/doc
mkdir -p debian/ure/usr/share/doc/ure
mv debian/ure/usr/lib/ure/README debian/ure/usr/share/doc/ure
-endif
rm -rf debian/mozilla-openoffice.org
debian/mozilla-openoffice.org.*.debhelper
rm -rf $(PKGDIR) $(PKGDIR).*.debhelper
@@ -2892,9 +2887,7 @@
dh_fixperms -s
ifeq "$(BUILD_DBG_PACKAGE)" "y"
dh_strip -s -Nure --dbg-package=openoffice.org$(VER)-dbg
- ifeq "$(PACKAGE_URE)" "y"
dh_strip -pure --dbg-package=ure-dbg
- endif
# dh_strip --dbg-package= is not idempotent, force copying of the
binaries
# again...
rm -f $(STAMP_DIR)/install-arch
@@ -2912,9 +2905,7 @@
endif
dh_compress -s -X.py -X.mk -X.sxd
dh_makeshlibs -s -Nure -n -V -Xlibxmlsec
-ifeq "$(PACKAGE_URE)" "y"
dh_makeshlibs -pure -n -V"ure (>= $(shell grep -A 1 "PRODUCTNAME URE"
$(SOURCE_TREE)/instsetoo_native/util/openoffice.lst | tail -n 1 | awk '{ print
$$2 }'))"
-endif
dh_installdeb -s
cat debian/openoffice.org-core.shlibs.local > debian/shlibs.local
ifneq "$(USE_SYSTEM_XMLSEC)" "y"
@@ -2981,6 +2972,7 @@
-Nopenoffice.org$(VER)-presenter-screen \
-Nopenoffice.org$(VER)-wiki-publisher \
-Nopenoffice.org$(VER)-sdbc-postgresql -- \
+ -V"ure:Version=$(shell grep -A 1 "PRODUCTNAME URE"
$(SOURCE_TREE)/instsetoo_native/util/openoffice.lst | tail -n 1 | awk '{ print
$$2 }')+OOo`echo $(BINARY_VERSION) | cut -d: -f2` \
-V'base-version=$(BASE_VERSION)' \
-V'help-l10n-virtual-version=$(HELP_L10N_VIRTUAL_VERSION)' \
-V'dev-stl-depends=$(DEV_STL_DEPENDS)' \
@@ -3033,11 +3025,9 @@
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`
-ifeq "$(PACKAGE_URE)" "y"
dh_gencontrol -pure -pure-dbg -- \
-V"ure:Version=$(shell grep -A 1 "PRODUCTNAME URE"
$(SOURCE_TREE)/instsetoo_native/util/openoffice.lst | tail -n 1 | awk '{ print
$$2 }')+OOo`echo $(BINARY_VERSION) | cut -d: -f2`" \
-v$(shell grep -A 1 "PRODUCTNAME URE"
$(SOURCE_TREE)/instsetoo_native/util/openoffice.lst | tail -n 1 | awk '{ print
$$2 }')+OOo`echo $(BINARY_VERSION) | cut -d: -f2`
-endif
dh_md5sums -s
dh_builddeb -s $(DEBHELPER_OPTIONS)
