[SCM] Debian packaging for swt-gtk. branch, master-3.8, updated. debian/3.8.0-m6-1-9-g6e351c8

[Niels Thykier]

The following commit has been merged in the master-3.8 branch:
commit 7e20fc1877381f329baa5a83d9c3397d962be760
Author: Niels Thykier <niels at thykier.net>
Date:   Wed May 9 16:22:53 2012 +0200

    Merge CFLAGS and CPPFLAGS
    
    Signed-off-by: Niels Thykier <niels at thykier.net>

diff --git a/debian/patches/common/01-make_linux.patch b/debian/patches/common/01-make_linux.patch
index 8615758..9c75468 100644
--- a/debian/patches/common/01-make_linux.patch
+++ b/debian/patches/common/01-make_linux.patch
@@ -30,7 +30,7 @@ index c8cc080..998cfcd 100644
  GLX_OBJECTS = swt.o glx.o glx_structs.o glx_stats.o
  
 -CFLAGS = -O -Wall \
-+override CFLAGS += $(CPPFLAGS) \
++override CFLAGS = \
  		-DSWT_VERSION=$(SWT_VERSION) \
  		$(NATIVE_STATS) \
  		-DLINUX -DGTK \
@@ -39,7 +39,7 @@ index c8cc080..998cfcd 100644
  		-fPIC \
  		${SWT_PTR_CFLAGS}
 -LFLAGS = -shared -fPIC ${SWT_LFLAGS}
-+override LFLAGS += -shared -fPIC ${SWT_LFLAGS}
++LFLAGS += $(DEB_LDFLAGS) -shared -fPIC ${SWT_LFLAGS}
  
 +NO_STRIP=1
  ifndef NO_STRIP
@@ -77,7 +77,7 @@ index c8cc080..998cfcd 100644
  
  $(AWT_LIB): $(AWT_OBJECTS)
 -	$(CC) $(AWT_LFLAGS) -o $(AWT_LIB) $(AWT_OBJECTS) $(AWT_LIBS)
-+	$(CC) $(AWT_LFLAGS) -o $(AWT_LIB) $(AWT_OBJECTS) -Wl,--as-needed $(AWT_LIBS)
++	$(CC) $(AWT_LFLAGS) $(DEB_LDFLAGS) -o $(AWT_LIB) $(AWT_OBJECTS) -Wl,--as-needed $(AWT_LIBS)
  
  #
  # Atk lib
diff --git a/debian/rules b/debian/rules
index 675b09c..5577aef 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,7 +1,9 @@
 #!/usr/bin/make -f
 
-DPKG_EXPORT_BUILDFLAGS:=1
+export DEB_CFLAGS_MAINT_APPEND=-fPIC
 include /usr/share/dpkg/buildflags.mk
+CFLAGS+=$(CPPFLAGS)
+export DEB_LDFLAGS  := $(LDFLAGS)
 
 include /usr/share/cdbs/1/class/makefile.mk
 include /usr/share/cdbs/1/rules/debhelper.mk

-- 
Debian packaging for swt-gtk.