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

[libreoffice] 01/01: git update; update debian-hardened-buildflags-CPPFLAGS.diff; remove obsolete poms.diff



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

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

commit b3f8e8a34b0651cc85c62adaa4879a045b9371a1
Author: Rene Engelhard <rene@debian.org>
Date:   Sat Jan 16 13:37:18 2016 +0100

    git update; update debian-hardened-buildflags-CPPFLAGS.diff; remove obsolete poms.diff
---
 changelog                                        |   2 +-
 patches/debian-hardened-buildflags-CPPFLAGS.diff |   2 +-
 patches/poms.diff                                | 322 -----------------------
 patches/series                                   |   1 -
 4 files changed, 2 insertions(+), 325 deletions(-)

diff --git a/changelog b/changelog
index ca02dd0..18580f9 100644
--- a/changelog
+++ b/changelog
@@ -1,4 +1,4 @@
-libreoffice (1:5.0.5~rc1~git20151219-1) UNRELEASED; urgency=medium
+libreoffice (1:5.0.5~rc1~git201560116-1) UNRELEASED; urgency=medium
 
   * New upstream snapshot 
 
diff --git a/patches/debian-hardened-buildflags-CPPFLAGS.diff b/patches/debian-hardened-buildflags-CPPFLAGS.diff
index a6d149a..443c531 100644
--- a/patches/debian-hardened-buildflags-CPPFLAGS.diff
+++ b/patches/debian-hardened-buildflags-CPPFLAGS.diff
@@ -75,6 +75,6 @@ index 7acd068..b6d9735 100644
 -gb_LinkTarget_LDFLAGS += -fstack-protector-strong
 -endif
 -
- gb_CFLAGS_WERROR := $(if $(ENABLE_WERROR),-Werror)
+ gb_CFLAGS_WERROR := $(if $(ENABLE_WERROR),-Werror -Wno-error=deprecated-declarations)
  
  # This is the default in non-C++11 mode
diff --git a/patches/poms.diff b/patches/poms.diff
deleted file mode 100644
index 3b6c6ba..0000000
--- a/patches/poms.diff
+++ /dev/null
@@ -1,322 +0,0 @@
-From 9ca2de8c5995657973665189903aa2eebe0ef69a Mon Sep 17 00:00:00 2001
-From: David Ostrovsky <david@ostrovsky.org>
-Date: Tue, 1 Dec 2015 00:20:09 +0100
-Subject: Expose metadata to deploy LibreOffice artifacts on Maven Central
-
-As outlined in the requirements to deploy the artifacts on Maven
-Central, the metdata must be provided:
-
-* Project Name, Description and URL
-* License Information
-* Developer Information
-* SCM Information
-
-[1] http://central.sonatype.org/pages/requirements.html
-
-Change-Id: I0bcd19a22d0e1a48f0faec0b414f816f7da5b318
-Reviewed-on: https://gerrit.libreoffice.org/20315
-Tested-by: Jenkins <ci@libreoffice.org>
-Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
-
-diff --git a/bean/pom.officebean.xml b/bean/pom.officebean.xml
-new file mode 100644
-index 0000000..8d366d2
---- /dev/null
-+++ b/bean/pom.officebean.xml
-@@ -0,0 +1,44 @@
-+<project>
-+  <modelVersion>4.0.0</modelVersion>
-+  <groupId>org.libreoffice</groupId>
-+  <artifactId>officebean</artifactId>
-+  <version>@version@</version>
-+  <packaging>jar</packaging>
-+  <name>LibreOffice - LOKit4Java</name>
-+  <description>LOKit4Java</description>
-+  <url>https://www.libreoffice.org</url>
-+
-+  <licenses>
-+    <license>
-+      <name>Mozilla Public License, Version 2.0</name>
-+      <url>https://www.mozilla.org/en-US/MPL/2.0</url>
-+      <distribution>repo</distribution>
-+    </license>
-+  </licenses>
-+
-+  <scm>
-+    <url>http://cgit.freedesktop.org/libreoffice/core</url>
-+    <connection>https://gerrit.libreoffice.org/#/admin/projects/core</connection>
-+  </scm>
-+
-+  <developers>
-+    <developer>
-+      <name>The Document Foundation</name>
-+    </developer>
-+  </developers>
-+
-+  <mailingLists>
-+    <mailingList>
-+      <name>LibreOffice Development Mailing List</name>
-+      <post>libreoffice@lists.freedesktop.org</post>
-+      <subscribe>http://lists.freedesktop.org/mailman/listinfo/libreoffice</subscribe>
-+      <unsubscribe>http://lists.freedesktop.org/mailman/listinfo/libreoffice</unsubscribe>
-+      <archive>http://lists.freedesktop.org/archives/libreoffice</archive>
-+    </mailingList>
-+  </mailingLists>
-+
-+  <issueManagement>
-+    <url>https://bugs.documentfoundation.org</url>
-+    <system>LibreOffice Issue Tracker</system>
-+  </issueManagement>
-+</project>
-diff --git a/javaunohelper/pom.juh.xml b/javaunohelper/pom.juh.xml
-new file mode 100644
-index 0000000..f132ead
---- /dev/null
-+++ b/javaunohelper/pom.juh.xml
-@@ -0,0 +1,44 @@
-+<project>
-+  <modelVersion>4.0.0</modelVersion>
-+  <groupId>org.libreoffice</groupId>
-+  <artifactId>juh</artifactId>
-+  <version>@version@</version>
-+  <packaging>jar</packaging>
-+  <name>LibreOffice - Java UNO helper</name>
-+  <description>Java UNO helper</description>
-+  <url>https://www.libreoffice.org</url>
-+
-+  <licenses>
-+    <license>
-+      <name>Mozilla Public License, Version 2.0</name>
-+      <url>https://www.mozilla.org/en-US/MPL/2.0</url>
-+      <distribution>repo</distribution>
-+    </license>
-+  </licenses>
-+
-+  <scm>
-+    <url>http://cgit.freedesktop.org/libreoffice/core</url>
-+    <connection>https://gerrit.libreoffice.org/#/admin/projects/core</connection>
-+  </scm>
-+
-+  <developers>
-+    <developer>
-+      <name>The Document Foundation</name>
-+    </developer>
-+  </developers>
-+
-+  <mailingLists>
-+    <mailingList>
-+      <name>LibreOffice Development Mailing List</name>
-+      <post>libreoffice@lists.freedesktop.org</post>
-+      <subscribe>http://lists.freedesktop.org/mailman/listinfo/libreoffice</subscribe>
-+      <unsubscribe>http://lists.freedesktop.org/mailman/listinfo/libreoffice</unsubscribe>
-+      <archive>http://lists.freedesktop.org/archives/libreoffice</archive>
-+    </mailingList>
-+  </mailingLists>
-+
-+  <issueManagement>
-+    <url>https://bugs.documentfoundation.org</url>
-+    <system>LibreOffice Issue Tracker</system>
-+  </issueManagement>
-+</project>
-diff --git a/jurt/pom.jurt.xml b/jurt/pom.jurt.xml
-new file mode 100644
-index 0000000..25e3403
---- /dev/null
-+++ b/jurt/pom.jurt.xml
-@@ -0,0 +1,44 @@
-+<project>
-+  <modelVersion>4.0.0</modelVersion>
-+  <groupId>org.libreoffice</groupId>
-+  <artifactId>jurt</artifactId>
-+  <version>@version@</version>
-+  <packaging>jar</packaging>
-+  <name>LibreOffice - Java Uno Runtime</name>
-+  <description>Java Uno Runtime</description>
-+  <url>https://www.libreoffice.org</url>
-+
-+  <licenses>
-+    <license>
-+      <name>Mozilla Public License, Version 2.0</name>
-+      <url>https://www.mozilla.org/en-US/MPL/2.0</url>
-+      <distribution>repo</distribution>
-+    </license>
-+  </licenses>
-+
-+  <scm>
-+    <url>http://cgit.freedesktop.org/libreoffice/core</url>
-+    <connection>https://gerrit.libreoffice.org/#/admin/projects/core</connection>
-+  </scm>
-+
-+  <developers>
-+    <developer>
-+      <name>The Document Foundation</name>
-+    </developer>
-+  </developers>
-+
-+  <mailingLists>
-+    <mailingList>
-+      <name>LibreOffice Development Mailing List</name>
-+      <post>libreoffice@lists.freedesktop.org</post>
-+      <subscribe>http://lists.freedesktop.org/mailman/listinfo/libreoffice</subscribe>
-+      <unsubscribe>http://lists.freedesktop.org/mailman/listinfo/libreoffice</unsubscribe>
-+      <archive>http://lists.freedesktop.org/archives/libreoffice</archive>
-+    </mailingList>
-+  </mailingLists>
-+
-+  <issueManagement>
-+    <url>https://bugs.documentfoundation.org</url>
-+    <system>LibreOffice Issue Tracker</system>
-+  </issueManagement>
-+</project>
-diff --git a/ridljar/pom.ridl.xml b/ridljar/pom.ridl.xml
-new file mode 100644
-index 0000000..96b862a0
---- /dev/null
-+++ b/ridljar/pom.ridl.xml
-@@ -0,0 +1,44 @@
-+<project>
-+  <modelVersion>4.0.0</modelVersion>
-+  <groupId>org.libreoffice</groupId>
-+  <artifactId>ridl</artifactId>
-+  <version>@version@</version>
-+  <packaging>jar</packaging>
-+  <name>LibreOffice - Types for the Java Uno typesystem</name>
-+  <description>Types for the Java Uno typesystem</description>
-+  <url>https://www.libreoffice.org</url>
-+
-+  <licenses>
-+    <license>
-+      <name>Mozilla Public License, Version 2.0</name>
-+      <url>https://www.mozilla.org/en-US/MPL/2.0</url>
-+      <distribution>repo</distribution>
-+    </license>
-+  </licenses>
-+
-+  <scm>
-+    <url>http://cgit.freedesktop.org/libreoffice/core</url>
-+    <connection>https://gerrit.libreoffice.org/#/admin/projects/core</connection>
-+  </scm>
-+
-+  <developers>
-+    <developer>
-+      <name>The Document Foundation</name>
-+    </developer>
-+  </developers>
-+
-+  <mailingLists>
-+    <mailingList>
-+      <name>LibreOffice Development Mailing List</name>
-+      <post>libreoffice@lists.freedesktop.org</post>
-+      <subscribe>http://lists.freedesktop.org/mailman/listinfo/libreoffice</subscribe>
-+      <unsubscribe>http://lists.freedesktop.org/mailman/listinfo/libreoffice</unsubscribe>
-+      <archive>http://lists.freedesktop.org/archives/libreoffice</archive>
-+    </mailingList>
-+  </mailingLists>
-+
-+  <issueManagement>
-+    <url>https://bugs.documentfoundation.org</url>
-+    <system>LibreOffice Issue Tracker</system>
-+  </issueManagement>
-+</project>
-diff --git a/ridljar/pom.unoloader.xml b/ridljar/pom.unoloader.xml
-new file mode 100644
-index 0000000..188a041
---- /dev/null
-+++ b/ridljar/pom.unoloader.xml
-@@ -0,0 +1,44 @@
-+<project>
-+  <modelVersion>4.0.0</modelVersion>
-+  <groupId>org.libreoffice</groupId>
-+  <artifactId>unoloader</artifactId>
-+  <version>@version@</version>
-+  <packaging>jar</packaging>
-+  <name>LibreOffice - UNO loader</name>
-+  <description>UNO loader</description>
-+  <url>https://www.libreoffice.org</url>
-+
-+  <licenses>
-+    <license>
-+      <name>Mozilla Public License, Version 2.0</name>
-+      <url>https://www.mozilla.org/en-US/MPL/2.0</url>
-+      <distribution>repo</distribution>
-+    </license>
-+  </licenses>
-+
-+  <scm>
-+    <url>http://cgit.freedesktop.org/libreoffice/core</url>
-+    <connection>https://gerrit.libreoffice.org/#/admin/projects/core</connection>
-+  </scm>
-+
-+  <developers>
-+    <developer>
-+      <name>The Document Foundation</name>
-+    </developer>
-+  </developers>
-+
-+  <mailingLists>
-+    <mailingList>
-+      <name>LibreOffice Development Mailing List</name>
-+      <post>libreoffice@lists.freedesktop.org</post>
-+      <subscribe>http://lists.freedesktop.org/mailman/listinfo/libreoffice</subscribe>
-+      <unsubscribe>http://lists.freedesktop.org/mailman/listinfo/libreoffice</unsubscribe>
-+      <archive>http://lists.freedesktop.org/archives/libreoffice</archive>
-+    </mailingList>
-+  </mailingLists>
-+
-+  <issueManagement>
-+    <url>https://bugs.documentfoundation.org</url>
-+    <system>LibreOffice Issue Tracker</system>
-+  </issueManagement>
-+</project>
-diff --git a/unoil/pom.unoil.xml b/unoil/pom.unoil.xml
-new file mode 100644
-index 0000000..356d25d
---- /dev/null
-+++ b/unoil/pom.unoil.xml
-@@ -0,0 +1,44 @@
-+<project>
-+  <modelVersion>4.0.0</modelVersion>
-+  <groupId>org.libreoffice</groupId>
-+  <artifactId>unoil</artifactId>
-+  <version>@version@</version>
-+  <packaging>jar</packaging>
-+  <name>LibreOffice - Maps IDL into java classes definitions</name>
-+  <description>Maps IDL into java classes definitions</description>
-+  <url>https://www.libreoffice.org</url>
-+
-+  <licenses>
-+    <license>
-+      <name>Mozilla Public License, Version 2.0</name>
-+      <url>https://www.mozilla.org/en-US/MPL/2.0</url>
-+      <distribution>repo</distribution>
-+    </license>
-+  </licenses>
-+
-+  <scm>
-+    <url>http://cgit.freedesktop.org/libreoffice/core</url>
-+    <connection>https://gerrit.libreoffice.org/#/admin/projects/core</connection>
-+  </scm>
-+
-+  <developers>
-+    <developer>
-+      <name>The Document Foundation</name>
-+    </developer>
-+  </developers>
-+
-+  <mailingLists>
-+    <mailingList>
-+      <name>LibreOffice Development Mailing List</name>
-+      <post>libreoffice@lists.freedesktop.org</post>
-+      <subscribe>http://lists.freedesktop.org/mailman/listinfo/libreoffice</subscribe>
-+      <unsubscribe>http://lists.freedesktop.org/mailman/listinfo/libreoffice</unsubscribe>
-+      <archive>http://lists.freedesktop.org/archives/libreoffice</archive>
-+    </mailingList>
-+  </mailingLists>
-+
-+  <issueManagement>
-+    <url>https://bugs.documentfoundation.org</url>
-+    <system>LibreOffice Issue Tracker</system>
-+  </issueManagement>
-+</project>
--- 
-cgit v0.10.2
diff --git a/patches/series b/patches/series
index d4d3c14..5c53ede 100644
--- a/patches/series
+++ b/patches/series
@@ -31,4 +31,3 @@ rsc-no-error-about-unknown-switch.diff
 liborcus-0.9.1.diff
 debian-branding.diff
 icu-56.diff
-poms.diff

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


Reply to: