[SCM] LibreOffice packaging repository branch, debian-experimental-3.4.0, updated. libreoffice_3.3.3-3-125-g9b80f68
The following commit has been merged in the debian-experimental-3.4.0 branch:
commit 9b80f687bb79b8b7de311e2341f7278e6b21ffbe
Author: Rene Engelhard <rene@debian.org>
Date: Thu Jul 7 09:22:39 2011 +0200
more lintian fixes
diff --git a/control b/control
index e4c90dd..e1cbf0e 100644
--- a/control
+++ b/control
@@ -394,7 +394,7 @@ Description: office productivity suite -- legacy 1.0 XML DTD
Package: libreoffice-script-provider-bsh
Architecture: all
Section: java
-Depends: libreoffice-java-common, ${java-runtime-depends}, ${bsh-depends}
+Depends: libreoffice-java-common, ${java-runtime-depends}, ${bsh-depends}, ${misc:Depends}
Replaces: libreoffice-java-common (<< 1:3.4~)
Description: BeanShell script support provider for LibreOffice scripting framework
LibreOffice is a full-featured office productivity suite that provides
@@ -411,7 +411,7 @@ Package: libreoffice-script-provider-js
Architecture: all
Section: web
Replaces: libreoffice-common (<< 1:3.4~)
-Depends: libreoffice-java-common, ${java-runtime-depends}
+Depends: libreoffice-java-common, ${java-runtime-depends}, ${misc:Depends}
Description: JavaScript script support provider for LibreOffice scripting framework
LibreOffice is a full-featured office productivity suite that provides
a near drop-in replacement for Microsoft(R) Office.
diff --git a/control.in b/control.in
index 811aec6..010a61a 100644
--- a/control.in
+++ b/control.in
@@ -552,7 +552,7 @@ Description: office productivity suite -- legacy 1.0 XML DTD
Package: libreoffice-script-provider-bsh
Architecture: all
Section: java
-Depends: libreoffice-java-common, ${java-runtime-depends}, ${bsh-depends}
+Depends: libreoffice-java-common, ${java-runtime-depends}, ${bsh-depends} , ${misc:Depends}
Replaces: libreoffice-java-common (<< 1:3.4~)
Description: BeanShell script support provider for LibreOffice scripting framework
LibreOffice is a full-featured office productivity suite that provides
@@ -569,7 +569,7 @@ Package: libreoffice-script-provider-js
Architecture: all
Section: web
Replaces: libreoffice-common (<< 1:3.4~)
-Depends: libreoffice-java-common, ${java-runtime-depends}
+Depends: libreoffice-java-common, ${java-runtime-depends}, ${misc:Depends}
Description: JavaScript script support provider for LibreOffice scripting framework
LibreOffice is a full-featured office productivity suite that provides
a near drop-in replacement for Microsoft(R) Office.
diff --git a/rules b/rules
index dc24017..7c1dea7 100755
--- a/rules
+++ b/rules
@@ -2473,6 +2473,7 @@ ifeq "$(BUILD_PYUNO)" "y"
mkdir -p debian/python-uno/$(OOBRANDDIR)/share/extensions
mv debian/tmp/$(OOBRANDDIR)/share/extensions/script-provider-for-python \
debian/python-uno/$(OOBRANDDIR)/share/extensions
+ rm -f $debian/python-uno/$(OOBRANDDIR)/share/extensions/script-provider-for-python/registration/LICENSE
endif
mkdir -p debian/python-uno/usr/share/doc/python-uno
@@ -3041,7 +3042,8 @@ ifeq "$(ENABLE_JAVA)" "y"
rm -rf $(PKGDIR)-script-provider-bsh
mkdir -p $(PKGDIR)-script-provider-bsh/$(OOBRANDDIR)/share/extensions
mv debian/tmp/$(OOBRANDDIR)/share/extensions/script-provider-for-beanshell \
- $(PKGDIR)-script-provider-bsh/$(OOBRANDDIR)/share/extensions
+ $(PKGDIR)-script-provider-bsh/$(OOBRANDDIR)/share/extensions
+ rm -f $(PKGDIR)-script-provider-bsh/$(OOBRANDDIR)/share/extensions/script-provider-for-beanshell/registration/LICENSE
ifneq (,$(filter beanshell, $(SYSTEM_STUFF)))
ln -sf /usr/share/java/bsh.jar \
$(PKGDIR)-script-provider-bsh/$(OOBRANDDIR)/share/extensions/script-provider-for-beanshell/bsh.jar
--
LibreOffice packaging repository
Reply to: