[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[libreoffice] 01/01: perl deprecation fix is upsteam...



This is an automated email from the git hooks/post-receive script.

rene pushed a commit to branch debian-experimental-4.4
in repository libreoffice.

commit 137a8e0ec770f9894940a70e8a6e642260977df2
Author: Rene Engelhard <rene@debian.org>
Date:   Sat Jun 20 18:37:14 2015 +0200

    perl deprecation fix is upsteam...
---
 changelog                                          |  6 +++++
 patches/fix-perl-deprecation-in-lo-xlate-lang.diff | 26 ----------------------
 patches/series                                     |  1 -
 3 files changed, 6 insertions(+), 27 deletions(-)

diff --git a/changelog b/changelog
index cd7acbb..d0d9821 100644
--- a/changelog
+++ b/changelog
@@ -1,3 +1,9 @@
+libreoffice (1:4.4.5~rc1~git20150614-1) UNRELEASED; urgency=medium
+
+  * New upstream snapshot
+
+ -- Rene Engelhard <rene@debian.org>  Sun, 14 Jun 2015 21:49:06 +0200
+
 libreoffice (1:4.4.4~rc2-1) unstable; urgency=medium
 
   * New upstream release candidate
diff --git a/patches/fix-perl-deprecation-in-lo-xlate-lang.diff b/patches/fix-perl-deprecation-in-lo-xlate-lang.diff
deleted file mode 100644
index fc6b621..0000000
--- a/patches/fix-perl-deprecation-in-lo-xlate-lang.diff
+++ /dev/null
@@ -1,26 +0,0 @@
-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 ce38d39..54ca169 100644
--- a/patches/series
+++ b/patches/series
@@ -32,6 +32,5 @@ 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
 liborcus-0.9.1.diff
 libwps-0.4.diff

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git


Reply to: