r46783 - in /packages/gspiceui/trunk/debian: changelog patches/01_makefile.patch rules

[gudjon-guest at users.alioth.debian.org]

Author: gudjon-guest
Date: Wed Jul  2 22:47:29 2014
New Revision: 46783

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=46783
Log:
Update hardening wrappers to dpkg-buildflags. It doesn't compile
so they are commented out in this release.

Modified:
    packages/gspiceui/trunk/debian/changelog
    packages/gspiceui/trunk/debian/patches/01_makefile.patch
    packages/gspiceui/trunk/debian/rules

Modified: packages/gspiceui/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-science/packages/gspiceui/trunk/debian/changelog?rev=46783&op=diff
==============================================================================
--- packages/gspiceui/trunk/debian/changelog	(original)
+++ packages/gspiceui/trunk/debian/changelog	Wed Jul  2 22:47:29 2014
@@ -1,4 +1,4 @@
-gspiceui (1.0.58svn201+dfsg-1) UNRELEASED; urgency=medium
+gspiceui (1.0.58svn201+dfsg-1) unstable; urgency=medium
 
   * New svn version (Closes: #750743)
   * Bump standards version to 3.9.5
@@ -10,7 +10,8 @@
   * Fix description (Closes: #749860)
   * Remove dependency on gwave, gwave is not available in Debian
   * Make vcs fields canonical
-  * Add hardening wrappers
+  * Update hardening wrappers to dpkg-buildflags. It doesn't compile
+    so they are commented out in this release.
 
  -- Gudjon I. Gudjonsson <gudjon at gudjon.org>  Tue, 24 Jun 2014 08:29:19 +0000
 

Modified: packages/gspiceui/trunk/debian/patches/01_makefile.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/gspiceui/trunk/debian/patches/01_makefile.patch?rev=46783&op=diff
==============================================================================
--- packages/gspiceui/trunk/debian/patches/01_makefile.patch	(original)
+++ packages/gspiceui/trunk/debian/patches/01_makefile.patch	Wed Jul  2 22:47:29 2014
@@ -49,15 +49,19 @@
  
  #******************************************************************************
  # Specify string values
-@@ -62,7 +62,7 @@
+@@ -62,10 +62,10 @@
  # Compiler options
  ifeq ($(GSPICEUI_DBG),0)
    # Options for release (not using -Wall since it's GCC specific)
 -  CXXFLAGS := -Ofast -pipe $(shell $(WXCFG) --cxxflags)
-+  CXXFLAGS += -pipe $(shell $(WXCFG) --cxxflags)
++  CXXFLAGS += $(shell $(WXCFG) --cxxflags)
  else
    # Options for development
-   CXXFLAGS := -Wall -g -pipe $(shell $(WXCFG) --cxxflags)
+-  CXXFLAGS := -Wall -g -pipe $(shell $(WXCFG) --cxxflags)
++  CXXFLAGS := -Wall -g $(shell $(WXCFG) --cxxflags)
+   ifeq ($(GSPICEUI_WXLIB),2.8)  # This suppresses warnings from gcc v4.8.1 with wxWidgets v2.8.12
+     CXXFLAGS += -Wno-unused-local-typedefs
+   endif
 @@ -76,7 +76,7 @@
  
  # Libraries
@@ -67,21 +71,21 @@
          $(shell pkg-config --libs-only-l pangox)
  
  # Objects
-@@ -115,7 +115,7 @@
- #   -o  place output file in $@
- 
- obj/%.o : %.cpp
--	$(CXX) -c $(CXXFLAGS) $(INCLUDES) $< -o $@
-+	$(CXX) -c $(CXXFLAGS) $(LDFLAGS) $(INCLUDES) $< -o $@
- 	@echo
- 
- # Linker Rules :
 @@ -123,7 +123,7 @@
  #   -o     specify the output file name
  
  $(BINDIR)/$(PROG) : $(OBJS)
 -	$(CXX) -pipe -o $(BINDIR)/$(PROG) obj/*.o $(LIBS)
-+	$(CXX) $(LDFLAGS) -pipe -o $(BINDIR)/$(PROG) obj/*.o $(LIBS)
++	$(CXX) $(LDFLAGS) -o $(BINDIR)/$(PROG) obj/*.o $(LIBS)
  ifeq ($(ROOT)/GSpiceUI.app,$(wildcard $(ROOT)/GSpiceUI.app))
  	cp $(BINDIR)/$(PROG) $(ROOT)/GSpiceUI.app/Contents/MacOS/gspiceui
  endif
+@@ -156,7 +156,7 @@
+ 	      test_StrUtils
+ 
+ # Compiler options
+-test_% : CXXFLAGS  = -Wall -g -pipe $(shell $(WXCFG) --cxxflags)
++test_% : CXXFLAGS  = -Wall -g $(shell $(WXCFG) --cxxflags)
+ ifeq ($(GSPICEUI_WXLIB),2.8)  # This suppresses warnings from gcc v4.8.1 with wxWidgets v2.8.12
+   test_% : CXXFLAGS += -Wno-unused-local-typedefs
+ endif

Modified: packages/gspiceui/trunk/debian/rules
URL: http://svn.debian.org/wsvn/debian-science/packages/gspiceui/trunk/debian/rules?rev=46783&op=diff
==============================================================================
--- packages/gspiceui/trunk/debian/rules	(original)
+++ packages/gspiceui/trunk/debian/rules	Wed Jul  2 22:47:29 2014
@@ -4,10 +4,10 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-CPPFLAGS:=$(shell dpkg-buildflags --get CPPFLAGS)
-CFLAGS:=$(shell dpkg-buildflags --get CFLAGS)
-CXXFLAGS:=$(shell dpkg-buildflags --get CXXFLAGS)
-LDFLAGS:=$(shell dpkg-buildflags --get LDFLAGS)
+#CPPFLAGS:=$(shell dpkg-buildflags --get CPPFLAGS)
+#CFLAGS:=$(shell dpkg-buildflags --get CFLAGS)
+#CXXFLAGS:=$(shell dpkg-buildflags --get CXXFLAGS)
+#LDFLAGS:=$(shell dpkg-buildflags --get LDFLAGS)
 
 ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
 	CFLAGS += -O0