[Git][libreoffice-team/libreoffice/libreoffice][debian-experimental-6.1] 7 commits: update patches/apparmor-updates.diff based on master (child profile for gpg)

[Rene Engelhard]

Rene Engelhard pushed to branch debian-experimental-6.1 at Debian LibreOffice Maintainers / libreoffice / libreoffice


Commits:
f823c912 by Rene Engelhard at 2018-01-20T16:44:21+01:00
update patches/apparmor-updates.diff based on master (child profile for gpg)

- - - - -
d87efd04 by Rene Engelhard at 2018-01-20T23:44:24+01:00
make gpg signing really work (from master), thanks Christian Bolz

- - - - -
caf6c257 by Rene Engelhard at 2018-01-21T13:21:11+01:00
allow running the "certificate manager" applications for gpg

- - - - -
3c48296a by Rene Engelhard at 2018-01-21T14:45:37+01:00
fix mozilla profile access for x.509 siging (hopefully)

- - - - -
494acfb6 by Rene Engelhard at 2018-01-22T19:39:30+01:00
git update; make patches/mention-java-common-package.diff apply again

- - - - -
b184b516 by Rene Engelhard at 2018-01-22T20:06:13+01:00
make the apparmor patches apply (again)...

- - - - -
29d63ce2 by Rene Engelhard at 2018-01-22T20:26:27+01:00
Merge remote-tracking branch 'origin/debian-experimental-6.0' into debian-experimental-6.1

- - - - -


3 changed files:

- changelog
- patches/apparmor-complain.diff
- patches/mention-java-common-package.diff


Changes:

=====================================
changelog
=====================================
--- a/changelog
+++ b/changelog
@@ -1,4 +1,4 @@
-libreoffice (1:6.1.0~alpha1~git20180118-1) UNRELEASED; urgency=medium
+libreoffice (1:6.1.0~alpha1~git20180122-1) UNRELEASED; urgency=medium
 
   * New upstream snapshot
     - fixes cross-file links with xlsx files (closes: #658569)


=====================================
patches/apparmor-complain.diff
=====================================
--- a/patches/apparmor-complain.diff
+++ b/patches/apparmor-complain.diff
@@ -21,6 +21,6 @@ index b4baeab8f5ee..7861c9eac9bd 100644
  
 -profile libreoffice-soffice INSTDIR-program/soffice.bin {
 +profile libreoffice-soffice INSTDIR-program/soffice.bin flags=(complain) {
-   #include <abstractions/private-files-strict>
+   #include <abstractions/private-files>
  
    #include <abstractions/audio>


=====================================
patches/mention-java-common-package.diff
=====================================
--- a/patches/mention-java-common-package.diff
+++ b/patches/mention-java-common-package.diff
@@ -16,12 +16,13 @@ diff --git a/include/svtools/strings.hrc b/include/svtools/strings.hrc
 index f9dc617f4313..874b0400cbc5 100644
 --- a/include/svtools/strings.hrc
 +++ b/include/svtools/strings.hrc
-@@ -279,12 +279,12 @@
+@@ -281,13 +281,13 @@
  
  #define STR_SVT_DEFAULT_SERVICE_LABEL           NC_("STR_SVT_DEFAULT_SERVICE_LABEL", "$user$'s $service$")
  
 -#define STR_WARNING_JAVANOTFOUND                NC_("STR_WARNING_JAVANOTFOUND", "%PRODUCTNAME requires a Java runtime environment (JRE) to perform this task. Please install a JRE and restart %PRODUCTNAME.")
 +#define STR_WARNING_JAVANOTFOUND                NC_("STR_WARNING_JAVANOTFOUND", "%PRODUCTNAME requires a Java runtime environment (JRE) to perform this task. Please install a JRE (and libreoffice-java-common) and restart %PRODUCTNAME.")
+ #define STR_WARNING_JAVANOTFOUND_WIN            NC_("STR_WARNING_JAVANOTFOUND_WIN", "%PRODUCTNAME requires a %BITNESS-bit Java runtime environment (JRE) to perform this task. Please install a JRE and restart %PRODUCTNAME.")
  #define STR_WARNING_JAVANOTFOUND_MAC            NC_("STR_WARNING_JAVANOTFOUND_MAC", "%PRODUCTNAME requires Oracle's Java Development Kit (JDK) on Mac OS X 10.10 or greater to perform this task. Please install them and restart %PRODUCTNAME.")
  #define STR_WARNING_INVALIDJAVASETTINGS_MAC     NC_("STR_WARNING_INVALIDJAVASETTINGS_MAC", "The %PRODUCTNAME configuration has been changed. Under %PRODUCTNAME - Preferences - %PRODUCTNAME - Advanced, select the Java runtime environment you want to have used by %PRODUCTNAME.")
 -#define STR_WARNING_INVALIDJAVASETTINGS         NC_("STR_WARNING_INVALIDJAVASETTINGS", "The %PRODUCTNAME configuration has been changed. Under Tools - Options - %PRODUCTNAME - Advanced, select the Java runtime environment you want to have used by %PRODUCTNAME.")



View it on GitLab: https://salsa.debian.org/libreoffice-team/libreoffice/libreoffice/compare/df8d40c3a22d34de8deeda3844d040545748b1a1...29d63ce2dd4e6456b44c5edcd2da82343d855597

---
View it on GitLab: https://salsa.debian.org/libreoffice-team/libreoffice/libreoffice/compare/df8d40c3a22d34de8deeda3844d040545748b1a1...29d63ce2dd4e6456b44c5edcd2da82343d855597
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.alioth.debian.org/pipermail/pkg-openoffice-commits/attachments/20180122/068f6e0f/attachment-0001.html>