------------------------------------------------------------
revno: 1774 [merge]
committer: Rene Engelhard <[email protected]>
branch nick: experimental
timestamp: Sat 2010-01-23 18:41:22 +0100
message:
lintian fixes
renamed:
openoffice.org-common.lintian-overrides =>
openoffice.org-common.lintian-overrides.in
openoffice.org-core.lintian-overrides =>
openoffice.org-core.lintian-overrides.in
modified:
rules
shell-lib-components.sh
shell-lib-extensions.sh
uno-libs3.lintian-overrides
openoffice.org-common.lintian-overrides.in
openoffice.org-core.lintian-overrides.in
=== renamed file 'openoffice.org-common.lintian-overrides' =>
'openoffice.org-common.lintian-overrides.in'
--- a/openoffice.org-common.lintian-overrides 2009-11-16 19:47:10 +0000
+++ b/openoffice.org-common.lintian-overrides.in 2010-01-23 17:31:47
+0000
@@ -1,1 +1,2 @@
openoffice.org-common: no-debconf-config
+openoffice.org-common: file-missing-in-md5sums
var/lib/openoffice/ba...@basis_version@/share/config/javasettingsunopkginstall.xml
=== renamed file 'openoffice.org-core.lintian-overrides' =>
'openoffice.org-core.lintian-overrides.in'
--- a/openoffice.org-core.lintian-overrides 2008-03-19 13:49:06 +0000
+++ b/openoffice.org-core.lintian-overrides.in 2010-01-23 17:31:47 +0000
@@ -1,1 +1,2 @@
openoffice.org-core: binary-or-shlib-defines-rpath
+openoffice.org-core: file-missing-in-md5sums
var/lib/openoffice/ba...@basis_version@/program/services.rdb
=== modified file 'rules'
--- a/rules 2010-01-21 08:37:32 +0000
+++ b/rules 2010-01-23 17:41:22 +0000
@@ -1407,7 +1407,7 @@
rm -f debian/openoffice.org-dev-doc.doc-base.*
rm -f debian/*.menu
- for i in base calc draw impress math writer; do \
+ for i in base calc core common draw impress math writer; do \
rm -f debian/openoffice.org-$$i.lintian-overrides; \
done
rm -f debian/*.install debian/*.dirs
@@ -2461,7 +2461,7 @@
endif
# add version to .menu and .lintian-overrides
ICONVERSION=`grep PRODUCTVERSION
$(SOURCE_TREE)/sysui/desktop/productversion.mk | head -n 1 | cut -d"=" -f2 |
cut -d"." -f1 | sed -e s/\ //g`; \
- for i in base calc draw impress math writer; do \
+ for i in base calc core draw impress math writer; do \
cat debian/openoffice.org$(VER)-$$i.menu.in \
| sed -e s/@ICONVERSION@/$$ICONVERSION/ \
| sed -e s/@VER/$(VER)/ \
@@ -2469,6 +2469,7 @@
cat debian/openoffice.org$(VER)-$$i.lintian-overrides.in \
| sed -e s/@ICONVERSION@/$$ICONVERSION/ \
| sed -e s/@VER@/$(VER)/ \
+ | sed -e s/@BASIS_VERSION@/$(BASIS_VERSION)/ \
> debian/openoffice.org$(VER)-$$i.lintian-overrides; \
done
@@ -3156,6 +3157,13 @@
zip -d
$(CURDIR)/$(PKGDIR)-wiki-publisher/$(OOBRANDDIR)/share/extension/install/wiki-publisher.oxt
license/THIRDPARTYLICENSEREADME.html
endif
+ # add version to .lintian-overrides
+ for i in common; do \
+ cat debian/openoffice.org$(VER)-$$i.lintian-overrides.in \
+ | sed -e s/@BASIS_VERSION@/$(BASIS_VERSION)/ \
+ > debian/openoffice.org$(VER)-$$i.lintian-overrides; \
+ done
+
for i in $(ARCH_INDEP_PACKAGES); do \
install -D -m644 debian/presubj \
debian/$$i/usr/share/bug/$$i/presubj; \
@@ -3306,6 +3314,8 @@
dh_compress -s -X.py -X.mk -X.sxd
dh_makeshlibs -puno-libs3 -V"ure (>= $(shell grep UREPACKAGEVERSION
$(SOURCE_TREE)/instsetoo_native/util/openoffice.lst | awk '{ print $$2 }'))" --
-c0
dh_makeshlibs -n -pure -V"ure (>= $(shell grep UREPACKAGEVERSION
$(SOURCE_TREE)/instsetoo_native/util/openoffice.lst | awk '{ print $$2 }'))"
+ # ugly hack, but why does that happen? It's not in .symbols...
+ grep -v PRIVATE debian/uno-libs3/DEBIAN/symbols
dh_installdeb -s
cp debian/shlibs.local.in debian/shlibs.local
ifeq "$(USE_SYSTEM_ICU)" "n"
=== modified file 'shell-lib-components.sh'
--- a/shell-lib-components.sh 2010-01-20 22:56:05 +0000
+++ b/shell-lib-components.sh 2010-01-23 17:32:17 +0000
@@ -8,7 +8,7 @@
echo "" >&2
echo -n "OpenOffice.org is running right now
with pid " >&2
echo -n "$PID." >&2
- echo -n " This can cause problems\n" >&2
+ echo " This can cause problems" >&2
echo "with (de-)registration of components and
extensions" >&2
echo "Thus this package will fail to install"
>&2
echo "You should close all running instances of
OpenOffice.org (including" >&2
=== modified file 'shell-lib-extensions.sh'
--- a/shell-lib-extensions.sh 2010-01-20 22:56:05 +0000
+++ b/shell-lib-extensions.sh 2010-01-23 17:31:47 +0000
@@ -8,7 +8,7 @@
echo "" >&2
echo -n "OpenOffice.org is running right now
with pid " >&2
echo -n "$PID." >&2
- echo -n " This can cause problems\n" >&2
+ echo " This can cause problems" >&2
echo "with (de-)registration of components and
extensions" >&2
echo "Thus this package will fail to install"
>&2
echo "You should close all running instances of
OpenOffice.org (including" >&2
=== modified file 'uno-libs3.lintian-overrides'
--- a/uno-libs3.lintian-overrides 2008-07-09 00:05:43 +0000
+++ b/uno-libs3.lintian-overrides 2010-01-23 17:41:22 +0000
@@ -1,1 +1,2 @@
uno-libs3: shlibs-declares-dependency-on-other-package
+uno-libs3: symbols-declares-dependency-on-other-package ure #MINVER#
