[SCM] LibreOffice packaging repository branch, debian-experimental-4.0, updated. libreoffice_3.6.4-1-202-g8042b3a
The following commit has been merged in the debian-experimental-4.0 branch:
commit 8042b3abd2e18dc27a7f4e2673d3e3750ca9856c
Author: Rene Engelhard <rene@debian.org>
Date: Sat Dec 22 18:09:56 2012 +0100
lintian fixes; move ui-previewer binary into -core; python3-uno docdir; librelogo description
diff --git a/changelog b/changelog
index 5ef365d..964e60c 100644
--- a/changelog
+++ b/changelog
@@ -27,7 +27,7 @@ libreoffice (1:4.0.0~beta2-1) UNRELEASED; urgency=low
* debian/control*.in, debian/rules, debian/scripts/gid2pkgdirs.sh: binfilter
is gone. yay.
- -- Rene Engelhard <rene@debian.org> Fri, 07 Dec 2012 16:39:38 +0100
+ -- Rene Engelhard <rene@debian.org> Sat, 22 Dec 2012 18:03:18 +0100
libreoffice (1:3.6.4-1) experimental; urgency=low
diff --git a/control b/control
index 06356b2..fabe341 100644
--- a/control
+++ b/control
@@ -93,7 +93,7 @@ Conflicts: libreoffice-calc (<< ${binary:Version}), libreoffice-writer (<< ${bin
Breaks: myspell-ru (<< 0.99g5-8.1), myspell-lv (<< 0.7.3-3.1), myspell-et (<< 1:20030606-12.1), myspell-fi (<< 0.7-17.2), myspell-cs-cz (<< 20040229-4.1), myspell-el-gr (<< 0.3-1.1), myspell-nn (<< 2.0.10-3.1), myspell-nb (<< 2.0.10-3.1), hunspell-ar (<< 0.0.0+20080110-1.1), myspell-hu (<< 0.99.4-1.2), hunspell-gl-es (<< 2.2a-6), myspell-gv (<< 0.50-8), myspell-en-au (<< 2.1-5), myspell-fa (<< 0.20070816-2), hunspell-uz (<< 0.6-3.1), hunspell-ko (<< 0.3.3-1), hunspell-se (<< 1.0~beta6.20081222-1.1), hunspell-de-med (<< 20090825-1), hunspell-en-us (<< 20070829-3), myspell-sv-se (<< 1.3.8-6-2.2), myspell-sk (<< 0.5.5a-2.1), myspell-fo (<< 0.2.36-3), myspell-nl (<< 1:1.10-3), myspell-pt-br (<< 2009.03.30-1.1), myspell-pl (<< 20090830-1), myspell-pt-pt (<< 20090309-1.1), myspell-ga (<< 2.0-19), myspell-gd (<< 0.50-7), myspell-ku (<< 0.20.0-1.1), myspell-hr (<< 20060617-2), myspell-fr-gut (<< 1:1.0-26.1), myspell-eo (<< 2.1.2000.02.25-41), myspell-de-de-oldspell (<< 1:2-25.1), my
spell-da (<< 1.6.18-1.1), myspell-es (<< 1.10-7), myspell-de-at (<< 20071211-2), myspell-de-ch (<< 20071211-2), myspell-de-de (<< 20071211-2), hunspell-de-at (<< 20071211-2), hunspell-de-ch (<< 20071211-2), hunspell-de-de (<< 20071211-2), myspell-ca (<< 0.6-8), myspell-tl (<< 0.4-0-5), myspell-ne (<< 1.0-4.1), myspell-fr (<< 1.4-25), myspell-hy (<< 0.10.1-1.1), myspell-en-us (<< 1:3.1.0-3), myspell-en-gb (<< 1:3.1.0-3), myspell-en-za (<< 1:3.1.0-3), myspell-af (<< 1:3.1.0-3), myspell-it (<< 1:3.1.0-3), myspell-sw (<< 1:3.1.0-3), myspell-th (<< 1:3.1.0-3), hunspell-en-ca (<< 1:3.1.0-3), hunspell-ne (<< 1:3.1.0-3), hunspell-da (<< 1:3.1.0-3), hunspell-fr (<< 1:3.1.0-3), hunspell-vi (<< 1:3.1.0-3), hunspell-hu (<< 1:3.1.0-3), hunspell-sr (<< 1:3.1.0-3), hunspell-sh (<< 1:3.1.0-3), myspell-lv (<< 0.7.3-3.1), myspell-et (<< 1:20030606-12.1), myspell-nn (<< 2.0.10-3.1), myspell-nb (<< 2.0.10-3.1), libreoffice-filter-binfilter, libreoffice-evolution (<< 1:3.4.1~), libreoffice-kab (
<< 1:3.4.1~), libreoffice-sdbc-postgresql (<< 0.8.1~), mozilla-libreoffice (<< 1:3.5.0~beta~),
libreoffice-common (<< 1:3.6.1~rc1)
Provides: libreoffice-bundled
-Replaces: libreoffice-calc (<< 1:3.3.2-5), ure (<< 1:3.6.1-2), uno-libs3 (<< 1:3.6.1-2)
+Replaces: libreoffice-calc (<< 1:3.3.2-5), ure (<< 1:3.6.1-2), uno-libs3 (<< 1:3.6.1-2), libreoffice-common (<= 1:4.0.0~beta2-1)
Description: office productivity suite -- arch-dependent files
LibreOffice is a full-featured office productivity suite that provides
a near drop-in replacement for Microsoft(R) Office.
@@ -3333,7 +3333,7 @@ Description: Logo-like progamming language for LibreOffice
.
This package contains Librelogo, which is a pyuno-based Logo-like progamming
language with interactive vectorgraphics for education and DTP
- - basic Logo syntax for back compability with educational Logo systems
+ - basic Logo syntax for back compatibility with educational Logo systems
- interactive vectorgraphics in LibreOffice Writer
- native commands (easily translatable)
- Python data structures (list, tuple, set, dictionary) and other Python
diff --git a/control.in b/control.in
index fbe1752..4b8843c 100644
--- a/control.in
+++ b/control.in
@@ -183,7 +183,7 @@ Conflicts: libreofficeVER-unbundled,
Breaks: myspell-ru (<< 0.99g5-8.1), myspell-lv (<< 0.7.3-3.1), myspell-et (<< 1:20030606-12.1), myspell-fi (<< 0.7-17.2), myspell-cs-cz (<< 20040229-4.1), myspell-el-gr (<< 0.3-1.1), myspell-nn (<< 2.0.10-3.1), myspell-nb (<< 2.0.10-3.1), hunspell-ar (<< 0.0.0+20080110-1.1), myspell-hu (<< 0.99.4-1.2), hunspell-gl-es (<< 2.2a-6), myspell-gv (<< 0.50-8), myspell-en-au (<< 2.1-5), myspell-fa (<< 0.20070816-2), hunspell-uz (<< 0.6-3.1), hunspell-ko (<< 0.3.3-1), hunspell-se (<< 1.0~beta6.20081222-1.1), hunspell-de-med (<< 20090825-1), hunspell-en-us (<< 20070829-3), myspell-sv-se (<< 1.3.8-6-2.2), myspell-sk (<< 0.5.5a-2.1), myspell-fo (<< 0.2.36-3), myspell-nl (<< 1:1.10-3), myspell-pt-br (<< 2009.03.30-1.1), myspell-pl (<< 20090830-1), myspell-pt-pt (<< 20090309-1.1), myspell-ga (<< 2.0-19), myspell-gd (<< 0.50-7), myspell-ku (<< 0.20.0-1.1), myspell-hr (<< 20060617-2), myspell-fr-gut (<< 1:1.0-26.1), myspell-eo (<< 2.1.2000.02.25-41), myspell-de-de-oldspell (<< 1:2-25.1), my
spell-da (<< 1.6.18-1.1), myspell-es (<< 1.10-7), myspell-de-at (<< 20071211-2), myspell-de-ch (<< 20071211-2), myspell-de-de (<< 20071211-2), hunspell-de-at (<< 20071211-2), hunspell-de-ch (<< 20071211-2), hunspell-de-de (<< 20071211-2), myspell-ca (<< 0.6-8), myspell-tl (<< 0.4-0-5), myspell-ne (<< 1.0-4.1), myspell-fr (<< 1.4-25), myspell-hy (<< 0.10.1-1.1), myspell-en-us (<< 1:3.1.0-3), myspell-en-gb (<< 1:3.1.0-3), myspell-en-za (<< 1:3.1.0-3), myspell-af (<< 1:3.1.0-3), myspell-it (<< 1:3.1.0-3), myspell-sw (<< 1:3.1.0-3), myspell-th (<< 1:3.1.0-3), hunspell-en-ca (<< 1:3.1.0-3), hunspell-ne (<< 1:3.1.0-3), hunspell-da (<< 1:3.1.0-3), hunspell-fr (<< 1:3.1.0-3), hunspell-vi (<< 1:3.1.0-3), hunspell-hu (<< 1:3.1.0-3), hunspell-sr (<< 1:3.1.0-3), hunspell-sh (<< 1:3.1.0-3), myspell-lv (<< 0.7.3-3.1), myspell-et (<< 1:20030606-12.1), myspell-nn (<< 2.0.10-3.1), myspell-nb (<< 2.0.10-3.1), libreoffice-filter-binfilter, libreoffice-evolution (<< 1:3.4.1~), libreoffice-kab (
<< 1:3.4.1~), libreoffice-sdbc-postgresql (<< 0.8.1~), mozilla-libreoffice (<< 1:3.5.0~beta~),
libreoffice-common (<< 1:3.6.1~rc1)
Provides: libreofficeVER-bundled
-Replaces: libreofficeVER-calc (<< 1:3.3.2-5), ure (<< 1:3.6.1-2), uno-libs3 (<< 1:3.6.1-2)
+Replaces: libreofficeVER-calc (<< 1:3.3.2-5), ure (<< 1:3.6.1-2), uno-libs3 (<< 1:3.6.1-2), libreofficeVER-common (<= 1:4.0.0~beta2-1)
Description: office productivity suite -- arch-dependent files
LibreOffice is a full-featured office productivity suite that provides
a near drop-in replacement for Microsoft(R) Office.
diff --git a/control.librelogo.in b/control.librelogo.in
index 6d99d43..f07d9d4 100644
--- a/control.librelogo.in
+++ b/control.librelogo.in
@@ -10,7 +10,7 @@ Description: Logo-like progamming language for LibreOffice
.
This package contains Librelogo, which is a pyuno-based Logo-like progamming
language with interactive vectorgraphics for education and DTP
- - basic Logo syntax for back compability with educational Logo systems
+ - basic Logo syntax for back compatibility with educational Logo systems
- interactive vectorgraphics in LibreOffice Writer
- native commands (easily translatable)
- Python data structures (list, tuple, set, dictionary) and other Python
diff --git a/rules b/rules
index 7907eb5..9ced484 100755
--- a/rules
+++ b/rules
@@ -2258,7 +2258,7 @@ ifeq "$(BUILD_PYUNO)" "y"
cp -r $(SOURCE_TREE)/pyuno/demo \
debian/python3-uno/usr/share/doc/python3-uno; \
for i in $(SOURCE_TREE)/pyuno/doc/*; do \
- cp $$i debian/python3-uno/usr/share/doc/python-uno; \
+ cp $$i debian/python3-uno/usr/share/doc/python3-uno; \
done
cd debian/python3-uno/usr/share/doc/python3-uno && \
find . -type d -name "CVS" | xargs -r rm -rf
@@ -2320,7 +2320,7 @@ ifeq "$(PACKAGE_SDK)" "y"
# fix permissions
find $(PKGDIR)-dev/usr/share/idl/$(OODIRNAME) -type f -exec chmod 644 {} \;
- rm -f $(PKGDIR)-dev//usr/share/doc/libreoffice/sdk/readme/LICENSE.gz
+ rm -f $(PKGDIR)-dev/usr/share/doc/libreoffice/sdk/readme/LICENSE.gz
endif
ifeq "$(ENABLE_JAVA)" "y"
@@ -2514,7 +2514,8 @@ endif
done
chmod 644 $(PKGDIR)-common/$(OODIR)/LICENSE.odt
chmod 644 $(PKGDIR)-common/$(OODIR)/CREDITS.odt
-
+ # FIXME. Do we really need this (ALV2 mandating it) or can this go?
+ chmod 644 $(PKGDIR)-common/$(OODIR)/NOTICE
rm -rf $(PKGDIR)-common/$(OODIR)/LICENSE
# move uno_packages/cache to /var and create symlink for for
diff --git a/scripts/gid2pkgdirs.sh b/scripts/gid2pkgdirs.sh
index a02156d..c3b8657 100755
--- a/scripts/gid2pkgdirs.sh
+++ b/scripts/gid2pkgdirs.sh
@@ -152,7 +152,7 @@ mkdir -p $OODESTDIR/pkg/libreoffice-core/$OOINSTBASE/program; \
fi &&
( cd pkg/libreoffice-common/$OOINSTBASE/program
find -maxdepth 1 \
- -regex '\./\(.*\.so.*\|.*\.bin\|pagein\|nsplugin\|kdefilepicker\|msfontextract\|.*\.rdb\|javaldx\|oosplash\|uri-encode\|xpdfimport\)' \
+ -regex '\./\(.*\.so.*\|.*\.bin\|pagein\|nsplugin\|kdefilepicker\|msfontextract\|.*\.rdb\|javaldx\|oosplash\|uri-encode\|xpdfimport\|ui-previewer\)' \
-exec mv {} $OODESTDIR/pkg/libreoffice-core/$OOINSTBASE/program \;
);
--
LibreOffice packaging repository
Reply to: