[SCM] LibreOffice packaging repository branch, master, updated. libreoffice_3.4.3-4-10-ga7d3bec

[Rene Engelhard]

The following commit has been merged in the master branch:
commit a7d3bece135567483f0a804a5ed458f6c398496a
Author: Rene Engelhard <r...@debian.org>
Date:   Mon Oct 24 20:56:39 2011 +0200

    change debug in DEB_BUILD_OPTIONS not to do -g only but also --enable-debug

diff --git a/changelog b/changelog
index 6ffdfa2..b40eaa0 100644
--- a/changelog
+++ b/changelog
@@ -6,13 +6,15 @@ libreoffice (1:3.4.3-5) UNRELEASED; urgency=low
     - don't try to use internal jfreereport on ia64; disable the SRB
       instead.
     - fix USE_SYSTEM_TEXTCAT_DATA for squeeze
+    - change debug in DEB_BUILD_OPTIONS not to do -g only but also
+      --enable-debug
   * debian/watch:
     - point to libreoffice-bootstrap-(\d.\d.\d).\d.tar.bz2 in debian/watch;
       does not suffice but we should reference the source and not binaries
   * debian/rules, debian/*.menu.in:
     - also add icon version to debian menus (closes: #645953)
 
- -- Rene Engelhard <r...@debian.org>  Fri, 21 Oct 2011 16:05:19 +0200
+ -- Rene Engelhard <r...@debian.org>  Mon, 24 Oct 2011 20:43:10 +0200
 
 libreoffice (1:3.4.3-4) unstable; urgency=low
 
diff --git a/rules b/rules
index 4c2b905..d0a679f 100755
--- a/rules
+++ b/rules
@@ -581,23 +581,18 @@ ifneq "$(BUILD_DBG_PACKAGE)" "y"
        # build with small symbols anyway
        SMALL_SYMBOLS = y
 else
-  ifeq (debug,$(findstring debug,$(DEB_BUILD_OPTIONS)))
+  ifeq "$(SQUEEZE_BACKPORTS)" "y"
+       SMALL_SYMBOLS = y
+  else
+    ifneq (,$(findstring i386,$(ARCH)))
        SMALL_SYMBOLS = n
         USE_XZ_COMPRESS = y
-  else
-    ifeq "$(SQUEEZE_BACKPORTS)" "y"
-       SMALL_SYMBOLS = y
     else
-      ifneq (,$(findstring i386,$(ARCH)))
+      ifneq (,$(findstring amd64,$(ARCH)))
        SMALL_SYMBOLS = n
         USE_XZ_COMPRESS = y
       else
-        ifneq (,$(findstring amd64,$(ARCH)))
-       SMALL_SYMBOLS = n
-        USE_XZ_COMPRESS = y
-        else
        SMALL_SYMBOLS = y
-        endif
       endif
     endif
   endif
@@ -617,6 +612,10 @@ export CFLAGS CXXFLAGS
 else
        CONFIGURE_FLAGS += --enable-symbols
 endif
+ifeq (debug,$(findstring debug,$(DEB_BUILD_OPTIONS)))
+       CONFIGURE_FLAGS += --enable-debug
+endif
+
 
 ifeq (noopt,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
        ARCH_FLAGS += -O0

-- 
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/e1riqmg-000238...@vasks.debian.org