------------------------------------------------------------
revno: 1776 [merge]
committer: Rene Engelhard <r...@debian.org>
branch nick: debian
timestamp: Mon 2010-01-25 22:24:55 +0100
message:
merge
modified:
openoffice.org-common.lintian-overrides.in
rules
=== modified file 'openoffice.org-common.lintian-overrides.in'
--- a/openoffice.org-common.lintian-overrides.in 2010-01-23 17:31:47
+0000
+++ b/openoffice.org-common.lintian-overrides.in 2010-01-25 21:16:09
+0000
@@ -1,2 +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
+openoffice.org-common: file-missing-in-md5sums
var/lib/openoffice/ba...@basis_version@/share/config/javasettingsunopkginstall.xml
=== modified file 'rules'
--- a/rules 2010-01-23 17:41:22 +0000
+++ b/rules 2010-01-25 21:24:55 +0000
@@ -2461,11 +2461,13 @@
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 core draw impress math writer; do \
+ for i in base calc draw impress math writer; do \
cat debian/openoffice.org$(VER)-$$i.menu.in \
| sed -e s/@ICONVERSION@/$$ICONVERSION/ \
- | sed -e s/@VER/$(VER)/ \
+ | sed -e s/@VER@/$(VER)/ \
> debian/openoffice.org$(VER)-$$i.menu; \
+ done
+ for i in base calc core draw impress math writer; do \
cat debian/openoffice.org$(VER)-$$i.lintian-overrides.in \
| sed -e s/@ICONVERSION@/$$ICONVERSION/ \
| sed -e s/@VER@/$(VER)/ \
