CVS:oo-deb/debian changelog,1.222,1.223 rules,1.161,1.162

[Chris Halls <halls@gluck.debian.org>]

Update of /cvs/debian-openoffice/oo-deb/debian
In directory gluck:/tmp/cvs-serv29535

Modified Files:
	changelog rules 
Log Message:
- Don't enable debug symbols with gcc-3.0 (Woody backport),
  because gcc-3.0 -g1 generates huge debug info 


Index: changelog
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/changelog,v
retrieving revision 1.222
retrieving revision 1.223
diff -u -d -r1.222 -r1.223
--- changelog	28 Oct 2003 03:04:57 -0000	1.222
+++ changelog	30 Oct 2003 12:10:34 -0000	1.223
@@ -16,6 +16,8 @@
       invocation - now there are more warnings again but ldd does
       not crash sometimes when used with fakeroot [CH]
     - Replace diff usage of obsolete -0 flag with -U0 [CH]
+    - Don't enable debug symbols with gcc-3.0 (Woody backport),
+      because gcc-3.0 -g1 generates huge debug info [CH]
   * debian/control*:
     - Build-Depends:
       - libfontconfig1-dev | g++-3.0 to build without fontconfig on
@@ -25,7 +27,7 @@
     - Remove python-core so powerpc doesn't have to be built with
       IGNORE_MANIFEST_CHANGES=1 [CH]
 
- -- Rene Engelhard <rene@debian.org>  Tue, 28 Oct 2003 04:31:00 +0100
+ -- Chris Halls <halls@debian.org>  Thu, 30 Oct 2003 12:56:36 +0100
 
 openoffice.org (1.1.0-2) unstable; urgency=low
 

Index: rules
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/rules,v
retrieving revision 1.161
retrieving revision 1.162
diff -u -d -r1.161 -r1.162
--- rules	28 Oct 2003 03:04:57 -0000	1.161
+++ rules	30 Oct 2003 12:10:34 -0000	1.162
@@ -120,6 +120,9 @@
   MOZILLA=n
   export IGNORE_MANIFEST_CHANGES
 else
+  # gcc 3.0 didn't understand -g1, but newer compilers do
+  CONFIGURE_FLAGS+= --enable-symbols=SMALL 
+
   ifneq "$(MOZILLA)" "n"
     CONFIGURE_FLAGS+= --enable-mozilla 
   endif
@@ -564,7 +567,6 @@
 	    --enable-libart \
 	    --disable-rpath \
 	    --enable-crashdump \
-	    --enable-symbols=SMALL \
 	    --without-fonts \
 	    --with-system-zlib \
 	   $(CONFIGURE_FLAGS) \