------------------------------------------------------------
revno: 1090
committer: Rene Engelhard <[EMAIL PROTECTED]>
branch nick: experimental
timestamp: Thu 2008-05-15 13:54:35 +0200
message:
get ure dep from .shlibs; fix installation of default icons
removed:
openoffice.org-core.shlibs.local
modified:
changelog
control
control.in
rules
=== modified file 'changelog'
--- a/changelog 2008-05-14 17:41:54 +0000
+++ b/changelog 2008-05-15 11:54:35 +0000
@@ -27,6 +27,9 @@
changes)
* debian/control.ure.in:
- remove unneeded ${shlibs:Depends} for ure-dbg
+ * debian/openoffice.org-core.shlibs.local, debian/rules:
+ - don't use a .shlibs.local for the URE libs anymore. Get the URE
+ dependency via the normal .shlibs mechanism
* debian/rules, debian/control.in,
debian/control.{minimizer,presenter,mediawiki}.in,
debian/openoffice.org*.{preinst,prerm,postinst}.in,
=== modified file 'control'
--- a/control 2008-05-14 11:24:10 +0000
+++ b/control 2008-05-15 11:54:35 +0000
@@ -106,7 +106,7 @@
Package: openoffice.org-core
Architecture: i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64
-Depends: ure (>= ${ure:Version}), openoffice.org-common (>> ${base-version}),
ttf-opensymbol, ${shlibs:Depends}, fontconfig, ${mozilla-nss-depends}
+Depends: openoffice.org-common (>> ${base-version}), ttf-opensymbol,
${shlibs:Depends}, fontconfig, ${mozilla-nss-depends}
Conflicts: openoffice.org-thesaurus, openoffice.org-unbundled,
openoffice.org-l10n-1.9.108, openoffice.org-l10n-1.9.114,
openoffice.org-l10n-1.9.121, openoffice.org-1.9.125, oooqs-kde, ooqstart-gnome,
openoffice.org-help-de (<< 2.0), openoffice.org-help-en (<< 2.0),
openoffice.org-help-el (<< 2.0), openoffice.org-help-es (<< 2.0),
openoffice.org-help-fr (<< 2.0), openoffice.org-help-it (<< 2.0),
openoffice.org-help-ja (<< 2.0), openoffice.org-help-ko (<< 2.0),
openoffice.org-help-pt-br (<< 2.0), openoffice.org-help-sv (<< 2.0),
openoffice.org-help-tr (<< 2.0), openoffice.org-help-zh-cn (<< 2.0),
openoffice.org-help-zh-tw (<< 2.0), openoffice.org-help-2.0.0,
openoffice.org-help-2.0.1, openoffice.org-help-2.0.2,
openoffice.org-help-2.0.3, openoffice.org-bin, openoffice.org2-core,
openoffice.org-crashrep, openoffice.org2-hunspell, openoffice.org-hunspell,
openoffice.org-calc (<< ${Source-Version}), openoffice.org-writer (<<
${Source-Version}), openoffice.org-impress (<< ${Source-Version}),
openoffice.org-draw (<< ${Source-Version}), openoffice.org-base (<<
${Source-Version}), openoffice.org-gtk (<< ${Source-Version}),
openoffice.org-gnome (<< ${Source-Version}), openoffice.org-kde (<<
${Source-Version}), openoffice.org-evolution (<< ${Source-Version}),
openoffice.org-filter-so52 (<< ${Source-Version}), openoffice.org-officebean
(<< ${Source-Version}), openoffice.org-dev (<< ${Source-Version}), libcairo2 (=
1.4.8-1), libicu38 (= 3.8~d01-1)
Provides: openoffice.org-bundled, openoffice.org2-core, openoffice.org-java,
openoffice.org2-hunspell, openoffice.org-hunspell
Replaces: openoffice.org-bin, openoffice.org (<< 1.9), openoffice.org-gtk (<<
2.0.3+2.0.4m179), openoffice.org2-core, openoffice.org-java,
openoffice.org2-hunspell, openoffice.org-hunspell, openoffice.org-common (<<
1:2.3.1), openoffice.org-calc (<< 2.2.1~oof680m15-2)
=== modified file 'control.in'
--- a/control.in 2008-05-15 08:55:36 +0000
+++ b/control.in 2008-05-15 11:54:35 +0000
@@ -181,8 +181,7 @@
Package: openoffice.orgVER-core
Architecture: %OOO_ARCHS%
-Depends: ure (>= ${ure:Version}),
- openoffice.orgVER-common (>> ${base-version}),
+Depends: openoffice.orgVER-common (>> ${base-version}),
ttf-opensymbol,
${shlibs:Depends},
fontconfig,
=== removed file 'openoffice.org-core.shlibs.local'
--- a/openoffice.org-core.shlibs.local 2007-07-26 15:21:49 +0000
+++ b/openoffice.org-core.shlibs.local 1970-01-01 00:00:00 +0000
@@ -1,10 +0,0 @@
-libuno_cppu 3
-libuno_cppuhelpergcc3 3
-libjvmaccessgcc3 3
-libreg 3
-librmcxt 3
-libuno_sal 3
-libuno_salhelpergcc3 3
-libstore 3
-libjvmfwk 3
-libuno_purpenvhelpergcc3 3
=== modified file 'rules'
--- a/rules 2008-05-14 17:41:54 +0000
+++ b/rules 2008-05-15 11:54:35 +0000
@@ -2633,9 +2633,9 @@
done
endif
set -e; \
- for s in andromeda industrial crystal hicontrast tango $(HUMAN); do \
+ for s in galaxy industrial crystal hicontrast tango $(HUMAN); do \
z=images_$$s.zip; \
- case "$$s" in andromeda) z=images.zip; esac; \
+ case "$$s" in galaxy) z=images.zip; esac; \
mkdir -p $(PKGDIR)-style-$$s/$(OODIR)/share/config; \
mv $(PKGDIR)-common/$(OODIR)/share/config/$$z \
$(PKGDIR)-style-$$s/$(OODIR)/share/config/; \
@@ -2829,7 +2829,6 @@
dh_makeshlibs -s -Nure -n -V -Xlibxmlsec
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 }'))"
dh_installdeb -s
- cat debian/openoffice.org-core.shlibs.local > debian/shlibs.local
ifneq "$(USE_SYSTEM_XMLSEC)" "y"
cat debian/shlibs.override.xmlsec >> debian/shlibs.local
endif
