[libreoffice] 01/02: update to rc2; fix control with perl 5.22; regen control..
This is an automated email from the git hooks/post-receive script.
rene pushed a commit to branch master
in repository libreoffice.
commit e3db5b0ba86d7219ccc1d97e4ce376416b8b1ece
Author: Rene Engelhard <rene@debian.org>
Date: Sun Jun 14 20:39:43 2015 +0200
update to rc2; fix control with perl 5.22; regen control..
---
changelog | 9 ++++++--
control | 2 +-
patches/fix-perl-deprecation-in-lo-xlate-lang.diff | 26 ++++++++++++++++++++++
patches/series | 1 +
4 files changed, 35 insertions(+), 3 deletions(-)
diff --git a/changelog b/changelog
index b2bf23c..091add1 100644
--- a/changelog
+++ b/changelog
@@ -1,7 +1,12 @@
-libreoffice (1:4.4.4~rc1-2) UNRELEASED; urgency=medium
+libreoffice (1:4.4.4~rc2-1) unstable; urgency=medium
+
+ * New upstream release candidate
* debian/patches/rsc-no-error-about-unknown-switch.diff: *really* don't
error out on unknown CPPFLAGS
+ * debian/patches/fix-perl-deprecation-in-lo-xlate-lang.diff: fix
+ "Can't use a hash as a reference" deprecation warning/error in
+ lo-xlate-lang (closes: #788613)
* debian/control{,.in}:
- suggest openclipart2-libreoffice | openclipart-libreoffice
@@ -10,7 +15,7 @@ libreoffice (1:4.4.4~rc1-2) UNRELEASED; urgency=medium
* debian/copyright:
- remove long gone dmake (closes: #788311)
- -- Rene Engelhard <rene@debian.org> Wed, 03 Jun 2015 23:27:58 +0200
+ -- Rene Engelhard <rene@debian.org> Sun, 14 Jun 2015 20:09:46 +0200
libreoffice (1:4.4.4~rc1-1) unstable; urgency=medium
diff --git a/control b/control
index 9770944..40f83a2 100644
--- a/control
+++ b/control
@@ -222,7 +222,7 @@ Suggests: cups-bsd,
libxrender1,
myspell-dictionary,
mythes-thesaurus,
- openclipart2-libreoffice | openclipart-libreoffice,
+ opencliipart2-libreoffice | openclipart-libreoffice,
pstoedit,
unixodbc,
${gstreamer-plugins-suggests},
diff --git a/patches/fix-perl-deprecation-in-lo-xlate-lang.diff b/patches/fix-perl-deprecation-in-lo-xlate-lang.diff
new file mode 100644
index 0000000..fc6b621
--- /dev/null
+++ b/patches/fix-perl-deprecation-in-lo-xlate-lang.diff
@@ -0,0 +1,26 @@
+From 9ca4ab546b817b1fb14b09b522f92fa031d2ba0e Mon Sep 17 00:00:00 2001
+From: Rene Engelhard <rene@debian.org>
+Date: Sun, 14 Jun 2015 19:38:59 +0200
+Subject: [PATCH] deb#788713: fix (fatal) perl deprecation in lo-xlate-lang
+
+Change-Id: I82c63358d9400b2c8bd391a88bba18ffae52a14b
+---
+ bin/lo-xlate-lang | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/bin/lo-xlate-lang b/bin/lo-xlate-lang
+index b7a2879..c54f379 100755
+--- a/bin/lo-xlate-lang
++++ b/bin/lo-xlate-lang
+@@ -102,7 +102,7 @@ if ($LanguageCode =~ (m/^all$/)) {
+ }
+
+ usage ("no mapping found for $LanguageCode\n",1)
+- if (!(%$LanguageMap->{$LanguageCode}));
++ if (!($LanguageMap->{$LanguageCode}));
+
+ print $LanguageMap->{$LanguageCode}, "\n";
+
+--
+2.1.4
+
diff --git a/patches/series b/patches/series
index dc63e21..a98767a 100644
--- a/patches/series
+++ b/patches/series
@@ -32,3 +32,4 @@ icu-icudata-link-fix-armhf.diff
system-collada2gltf.diff
libebook-1.2.so.16.diff
rsc-no-error-about-unknown-switch.diff
+fix-perl-deprecation-in-lo-xlate-lang.diff
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git
Reply to: