The following commit has been merged in the debian-experimental-4.0 branch:
commit 4606cffe5654d5708549e0a078c28b923ae67208
Author: Rene Engelhard <r...@debian.org>
Date:   Thu Feb 14 21:18:59 2013 +0100

    forget to commit series; shorten changelog line

diff --git a/changelog b/changelog
index 3628453..56d8ffd 100644
--- a/changelog
+++ b/changelog
@@ -8,8 +8,8 @@ libreoffice (1:4.0.0-2) UNRELEASED; urgency=low
   * debian/patches/debian-hardened-buildflags.diff: only set CPPFLAGS here now
 
   * debian/rules:
-    - use /usr/share/dpkg/buildflags.mk for C(XX)FLAGS, LDFLAGS now that LO 
honours
-      those from the env in configure. Remove manual passing to make. 
+    - use /usr/share/dpkg/buildflags.mk for C(XX)FLAGS, LDFLAGS now that LO
+      honours those from the env in configure. Remove manual passing to make. 
 
  -- Rene Engelhard <r...@debian.org>  Fri, 08 Feb 2013 22:14:15 +0100
 
diff --git a/patches/series b/patches/series
index aa68a3d..ef83820 100644
--- a/patches/series
+++ b/patches/series
@@ -19,7 +19,7 @@ make-pyuno-work-with-system-wide-module-install.diff
 #search-usr-share-for-images.diff
 make-package-modules-not-suck.diff
 mediwiki-oor-replace.diff
-debian-hardened-buildflags.diff
+debian-hardened-buildflags-CPPFLAGS.diff
 gtk3-hack-explicit-gmodule.diff
 py2uno-module.diff
 ignore-sc_cellrangesbase-fails.diff

-- 
LibreOffice packaging repository


-- 
To UNSUBSCRIBE, email to debian-openoffice-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1u65id-0000gf...@vasks.debian.org

Reply via email to