[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

./packages/openofficeorg/3.1.1/unstable r1826: lintian fixes



------------------------------------------------------------
revno: 1826
committer: Rene Engelhard <rene@debian.org>
branch nick: unstable
timestamp: Sat 2010-01-23 18:31:47 +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-extensions.sh
  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/basis@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/basis@BASIS_VERSION@/program/services.rdb

=== modified file 'rules'
--- a/rules	2010-01-20 23:36:30 +0000
+++ b/rules	2010-01-23 17:31:47 +0000
@@ -1372,7 +1372,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
@@ -2394,7 +2394,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)/ \
@@ -2402,6 +2402,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
 
@@ -3096,6 +3097,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; \

=== 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


Reply to: