./packages/libreoffice/3.3.0/experimental r2213: more lintian fixes, also bump UDK_3.11@UDK_3.11 depends
------------------------------------------------------------
revno: 2213
committer: Rene Engelhard <rene@debian.org>
branch nick: debian
timestamp: Mon 2010-11-22 00:12:51 +0100
message:
more lintian fixes, also bump UDK_3.11@UDK_3.11 depends
added:
libreoffice-filter-mobiledev.lintian-overrides
modified:
changelog
libreoffice-base.lintian-overrides.in
libreoffice-calc.lintian-overrides.in
libreoffice-common.lintian-overrides.in
libreoffice-dev.lintian-overrides
libreoffice-draw.lintian-overrides.in
libreoffice-impress.lintian-overrides.in
libreoffice-math.lintian-overrides.in
libreoffice-writer.lintian-overrides.in
rules
uno-libs3.symbols
=== modified file 'changelog'
--- a/changelog 2010-11-21 14:44:55 +0000
+++ b/changelog 2010-11-21 23:12:51 +0000
@@ -1,11 +1,14 @@
libreoffice (1:3.3.0~beta3-3) UNRELEASED; urgency=low
- * debian/broffice.lintian-overrides: oop,s forgot s/broffice.org/broffice/
+ * debian/broffice.lintian-overrides: oops forgot s/broffice.org/broffice/
here...
- * debian/uno-libs3.symbols: tighten depends for osl_{set,clear}Environment@UDK_3.11
- to (>= 1.7.0+LibO3.3.0~beta3-1) (closes: #604201)
+ * debian/libreoffice-{filter-mobiledev,dev}.lintian-overrides,
+ libreoffice-{base,calc,draw,impress,math,writer}.lintian-overrides.in,
+ more lintian fixes
+ * debian/uno-libs3.symbols: tighten depends to (>= 1.7.0+LibO3.3.0~beta3)
+ for osl_{set,clear}Environment@UDK_3.11 (closes: #604201)
- -- Rene Engelhard <rene@debian.org> Sun, 21 Nov 2010 13:18:11 +0100
+ -- Rene Engelhard <rene@debian.org> Mon, 22 Nov 2010 00:12:47 +0100
libreoffice (1:3.3.0~beta3-2) experimental; urgency=low
=== modified file 'libreoffice-base.lintian-overrides.in'
--- a/libreoffice-base.lintian-overrides.in 2010-11-17 22:57:12 +0000
+++ b/libreoffice-base.lintian-overrides.in 2010-11-21 23:12:51 +0000
@@ -1,5 +1,5 @@
libreoffice-base: binary-or-shlib-defines-rpath
-libreoffice-base: menu-icon-missing /usr/share/icons/hicolor/32x32/apps/openofficeorg@ICONVERSION@-base.xpm
+libreoffice-base: menu-icon-missing /usr/share/icons/hicolor/32x32/apps/libreoffice-base.xpm
libreoffice-base: menu-item-contains-unknown-tag kderemove /usr/share/menu/libreoffice-base:4
libreoffice-base: desktop-command-not-in-package /usr/share/applications/libreoffice@VER@-base.desktop libreoffice
-
+libreoffice-base: menu-command-not-in-package /usr/share/menu/libreoffice-base:4 /usr/bin/libreoffice
=== modified file 'libreoffice-calc.lintian-overrides.in'
--- a/libreoffice-calc.lintian-overrides.in 2010-11-17 22:57:12 +0000
+++ b/libreoffice-calc.lintian-overrides.in 2010-11-21 23:12:51 +0000
@@ -1,4 +1,5 @@
libreoffice-calc: binary-or-shlib-defines-rpath
-libreoffice-calc: menu-icon-missing /usr/share/icons/hicolor/32x32/apps/openofficeorg@ICONVERSION@-calc.xpm
+libreoffice-calc: menu-icon-missing /usr/share/icons/hicolor/32x32/apps/libreoffice-calc.xpm
libreoffice-calc: menu-item-contains-unknown-tag kderemove /usr/share/menu/libreoffice-calc:5
libreoffice-calc: desktop-command-not-in-package /usr/share/applications/libreoffice@VER@-calc.desktop libreoffice
+libreoffice-calc: menu-command-not-in-package /usr/share/menu/libreoffice-calc:5 /usr/bin/libreoffice
=== modified file 'libreoffice-common.lintian-overrides.in'
--- a/libreoffice-common.lintian-overrides.in 2010-10-12 00:40:55 +0000
+++ b/libreoffice-common.lintian-overrides.in 2010-11-21 23:12:51 +0000
@@ -1,1 +1,1 @@
-libreoffice-common: file-missing-in-md5sums var/lib/openoffice/basis@BASIS_VERSION@/share/config/javasettingsunopkginstall.xml
+libreoffice-common: file-missing-in-md5sums var/lib/libreoffice/basis@BASIS_VERSION@/share/config/javasettingsunopkginstall.xml
=== modified file 'libreoffice-dev.lintian-overrides'
--- a/libreoffice-dev.lintian-overrides 2010-10-12 00:40:55 +0000
+++ b/libreoffice-dev.lintian-overrides 2010-11-21 23:12:51 +0000
@@ -1,2 +1,3 @@
libreoffice-dev: binary-or-shlib-defines-rpath
libreoffice-dev: csh-considered-harmful
+libreoffice-dev: wrong-section-according-to-package-name libreoffice-dev => libdevel
=== modified file 'libreoffice-draw.lintian-overrides.in'
--- a/libreoffice-draw.lintian-overrides.in 2010-11-17 22:57:12 +0000
+++ b/libreoffice-draw.lintian-overrides.in 2010-11-21 23:12:51 +0000
@@ -1,4 +1,5 @@
libreoffice-draw: binary-or-shlib-defines-rpath
-libreoffice-draw: menu-icon-missing /usr/share/icons/hicolor/32x32/apps/openofficeorg@ICONVERSION@-draw.xpm
+libreoffice-draw: menu-icon-missing /usr/share/icons/hicolor/32x32/apps/libreoffice-draw.xpm
libreoffice-draw: menu-item-contains-unknown-tag kderemove /usr/share/menu/libreoffice-draw:5
libreoffice-draw: desktop-command-not-in-package /usr/share/applications/libreoffice@VER@-draw.desktop libreoffice
+libreoffice-draw: menu-command-not-in-package /usr/share/menu/libreoffice-draw:5 /usr/bin/libreoffice
=== added file 'libreoffice-filter-mobiledev.lintian-overrides'
--- a/libreoffice-filter-mobiledev.lintian-overrides 1970-01-01 00:00:00 +0000
+++ b/libreoffice-filter-mobiledev.lintian-overrides 2010-11-21 23:12:51 +0000
@@ -0,0 +1,1 @@
+libreoffice-filter-mobiledev: desktop-command-not-in-package /usr/share/applications/libreoffice-javafilter.desktop libreoffice
=== modified file 'libreoffice-impress.lintian-overrides.in'
--- a/libreoffice-impress.lintian-overrides.in 2010-11-17 22:57:12 +0000
+++ b/libreoffice-impress.lintian-overrides.in 2010-11-21 23:12:51 +0000
@@ -1,4 +1,5 @@
libreoffice-impress: binary-or-shlib-defines-rpath
-libreoffice-impress: menu-icon-missing /usr/share/icons/hicolor/32x32/apps/openofficeorg@ICONVERSION@-impress.xpm
+libreoffice-impress: menu-icon-missing /usr/share/icons/hicolor/32x32/apps/libreoffice-impress.xpm
libreoffice-impress: menu-item-contains-unknown-tag kderemove /usr/share/menu/libreoffice-impress:5
libreoffice-impress: desktop-command-not-in-package /usr/share/applications/libreoffice@VER@-impress.desktop libreoffice
+libreoffice-impress: menu-command-not-in-package /usr/share/menu/libreoffice-impress:5 /usr/bin/libreoffice
=== modified file 'libreoffice-math.lintian-overrides.in'
--- a/libreoffice-math.lintian-overrides.in 2010-11-17 22:57:12 +0000
+++ b/libreoffice-math.lintian-overrides.in 2010-11-21 23:12:51 +0000
@@ -1,4 +1,5 @@
libreoffice-math: binary-or-shlib-defines-rpath
-libreoffice-math: menu-icon-missing /usr/share/icons/hicolor/32x32/apps/openofficeorg@ICONVERSION@-math.xpm
+libreoffice-math: menu-icon-missing /usr/share/icons/hicolor/32x32/apps/libreoffice-math.xpm
libreoffice-math: menu-item-contains-unknown-tag kderemove /usr/share/menu/libreoffice-math:5
libreoffice-math: desktop-command-not-in-package /usr/share/applications/libreoffice@VER@-math.desktop libreoffice
+libreoffice-math: menu-command-not-in-package /usr/share/menu/libreoffice-math:5 /usr/bin/libreoffice
=== modified file 'libreoffice-writer.lintian-overrides.in'
--- a/libreoffice-writer.lintian-overrides.in 2010-11-17 22:57:12 +0000
+++ b/libreoffice-writer.lintian-overrides.in 2010-11-21 23:12:51 +0000
@@ -1,5 +1,5 @@
libreoffice-writer: binary-or-shlib-defines-rpath
-libreoffice-writer: menu-icon-missing /usr/share/icons/hicolor/32x32/apps/openofficeorg@ICONVERSION@-writer.xpm
+libreoffice-writer: menu-icon-missing /usr/share/icons/hicolor/32x32/apps/libreoffice-writer.xpm
libreoffice-writer: menu-item-contains-unknown-tag kderemove /usr/share/menu/libreoffice-writer:5
libreoffice-writer: desktop-command-not-in-package /usr/share/applications/libreoffice@VER@-writer.desktop libreoffice
-
+libreoffice-writer: menu-command-not-in-package /usr/share/menu/libreoffice-writer:5 /usr/bin/libreoffice
=== modified file 'rules'
--- a/rules 2010-11-18 01:05:37 +0000
+++ b/rules 2010-11-21 23:12:51 +0000
@@ -2930,6 +2930,10 @@
echo 'exec /$(OODIR)/program/gsicheck.bin "$$@"'; \
) > $(PKGDIR)-dev/$(OODIR)/program/gsicheck
chmod 755 $(PKGDIR)-dev/$(OODIR)/program/gsicheck
+
+ # fix permissions
+ find $(PKGDIR)-dev/usr/share/idl/$(OODIRNAME) -type f -exec chmod 644 {} \;
+
endif
ifeq "$(INTERNAL_STDLIBS)" "y"
@@ -3278,7 +3282,7 @@
# menu files from sysui
dirname="`cd $(SOURCE_TREE)/sysui/$(shell . $(SOURCE_TREE)/*Env*.sh; echo $$OUTPATH$$PROEXT)/misc/desktopshare >/dev/null; pwd`" ;\
mkdir -p -m755 $(PKGDIR)-filter-mobiledev/usr/share/applications ;\
- sed -e 's,Exec=$${UNIXPRODUCTNAME}$${PRODUCTVERSION} \(.*\) %U,Exec=libreoffice$(VER) \1 %U,' \
+ sed -e 's,Exec=ooffice \(.*\) %U,Exec=libreoffice$(VER) \1 %U,' \
-e 's,Icon=$${WITHOUTDOTUNIXPRODUCTNAME},Icon=libreoffice,' \
-e 's,Name=$${PRODUCTNAME} $${PRODUCTVERSION},Name=LibreOffice $(VER),' \
-e 's/ / /' \
=== modified file 'uno-libs3.symbols'
--- a/uno-libs3.symbols 2010-11-21 14:38:02 +0000
+++ b/uno-libs3.symbols 2010-11-21 23:12:51 +0000
@@ -23,9 +23,9 @@
*@UDK_3.8 1.4.0
*@UDK_3.9 1.5.0
*@UDK_3.10 1.6.0
- UDK_3.11@UDK_3.11 1.7.0
- osl_clearEnvironment@UDK_3.11 1.7.0+LibO3.3.0~beta3-1
- osl_setEnvironment@UDK_3.11 1.7.0+LibO3.3.0~beta3-1
+ UDK_3.11@UDK_3.11 1.7.0+LibO3.3.0~beta3
+ osl_clearEnvironment@UDK_3.11 1.7.0+LibO3.3.0~beta3
+ osl_setEnvironment@UDK_3.11 1.7.0+LibO3.3.0~beta3
*@UDK_3.11 1.8.0
libuno_salhelpergcc3.so.3 ure #MINVER#
*@UDK_3_0_0 1.4.0
Reply to: