[med-svn] r10933 - in trunk/packages/dssp/trunk/debian: . patches

[Maarten Hekkelman]

Author: mhekkel-guest
Date: 2012-05-22 06:35:04 +0000 (Tue, 22 May 2012)
New Revision: 10933

Added:
   trunk/packages/dssp/trunk/debian/README.source
Modified:
   trunk/packages/dssp/trunk/debian/changelog
   trunk/packages/dssp/trunk/debian/compat
   trunk/packages/dssp/trunk/debian/patches/makefile
   trunk/packages/dssp/trunk/debian/rules
Log:
added hardening, debhelper back to 7

Added: trunk/packages/dssp/trunk/debian/README.source
===================================================================
--- trunk/packages/dssp/trunk/debian/README.source	                        (rev 0)
+++ trunk/packages/dssp/trunk/debian/README.source	2012-05-22 06:35:04 UTC (rev 10933)
@@ -0,0 +1,2 @@
+[Laszlo Kajan <lkajan at rostlab.org.]
+ * Compatibility level for dh is kept at 7 in order to allow building on current Ubuntu LTS (lucid): this has debhelper 7.

Modified: trunk/packages/dssp/trunk/debian/changelog
===================================================================
--- trunk/packages/dssp/trunk/debian/changelog	2012-05-22 06:17:07 UTC (rev 10932)
+++ trunk/packages/dssp/trunk/debian/changelog	2012-05-22 06:35:04 UTC (rev 10933)
@@ -1,7 +1,8 @@
 dssp (2.0.4-2) unstable; urgency=low
 
   * Fix for compiling with gcc 4.7, std::min (Closes: #673434)
-  * Dropped debhelper 7/lucid support.
+  * Added the use of dpkg-buildflags to include hardening flags since
+    debhelper is still maintained at version 7.
 
  -- Maarten L. Hekkelman <m.hekkelman at cmbi.ru.nl>  Mon, 21 May 2012 10:00:00 +0200
 

Modified: trunk/packages/dssp/trunk/debian/compat
===================================================================
--- trunk/packages/dssp/trunk/debian/compat	2012-05-22 06:17:07 UTC (rev 10932)
+++ trunk/packages/dssp/trunk/debian/compat	2012-05-22 06:35:04 UTC (rev 10933)
@@ -1 +1 @@
-9
+7

Modified: trunk/packages/dssp/trunk/debian/patches/makefile
===================================================================
--- trunk/packages/dssp/trunk/debian/patches/makefile	2012-05-22 06:17:07 UTC (rev 10932)
+++ trunk/packages/dssp/trunk/debian/patches/makefile	2012-05-22 06:35:04 UTC (rev 10933)
@@ -12,7 +12,7 @@
 Author: Laszlo Kajan <lkajan at rostlab.org>
 --- a/makefile
 +++ b/makefile
-@@ -9,25 +9,21 @@
+@@ -9,37 +9,36 @@
  # new one if it doesn't exist. In this make.config you can set site
  # specific variables like the Boost library location.
  
@@ -27,6 +27,9 @@
 -LIB_DIR				= $(BOOST_LIB_DIR)
 -INC_DIR				= $(BOOST_INC_DIR)
 -MAN_DIR				= $(DEST_DIR)man/man1/
++CXXFLAGS			:= $(shell dpkg-buildflags --get CXXFLAGS)
++LDFLAGS				:= $(shell dpkg-buildflags --get LDFLAGS)
++
 +BIN_DIR				= $(DESTDIR)/usr/bin
 +MAN_DIR				= $(DESTDIR)/usr/share/man/man1
  
@@ -41,12 +44,27 @@
  
 -CFLAGS				= $(INC_DIR:%=-I%) -iquote src -g -Wall -Wno-multichar -pthread
 -LDOPTS				= $(LIB_DIR:%=-L%) $(LIBS:%=-l%) -g -pthread
-+CFLAGS				+= -I $(HOME)/projects/boost/include -iquote src -g -Wall -Wno-multichar -pthread
++CXXFLAGS			+= -I $(HOME)/projects/boost/include -iquote src -g -Wall -Wno-multichar -pthread
 +LDOPTS				+= -L $(HOME)/projects/boost/lib $(LIBS:%=-l%) -g -pthread
  
  OBJ_DIR				= obj
  
-@@ -48,25 +44,21 @@
+ ifeq ($(DEBUG),1)
+ OBJ_DIR				:= $(OBJ_DIR).dbg
+-CFLAGS				+= -g3
++CXXFLAGS			+= -g3
+ else
+ DEFINES				+= NDEBUG
+-CFLAGS				+= -O3
++CXXFLAGS			+= -O3
+ endif
+ 
+-CFLAGS				+= $(DEFINES:%=-D%)
++CXXFLAGS			+= $(DEFINES:%=-D%)
+ 
+ DIST_NAME			= dssp-$(VERSION)
+ 
+@@ -48,25 +47,21 @@
  OBJECTS = $(OBJ_DIR)/mkdssp.o $(OBJ_DIR)/dssp.o $(OBJ_DIR)/primitives-3d.o $(OBJ_DIR)/structure.o $(OBJ_DIR)/utils.o
  
  mkdssp: $(OBJECTS)
@@ -68,7 +86,7 @@
 +	mkdir -p $(OBJ_DIR)
 +
 +$(OBJ_DIR)/%.o: %.cpp | $(OBJ_DIR)
-+	$(CXX) -MD -c -o $@ $< $(CFLAGS)
++	$(CXX) -MD -c -o $@ $< $(CXXFLAGS)
  
  clean:
  	rm -rf $(OBJ_DIR)/* mkdssp
@@ -82,7 +100,7 @@
  
  dist: $(OBJECTS)
  	@ rm -rf $(DIST_NAME)
-@@ -81,11 +73,3 @@
+@@ -81,11 +76,3 @@
  	@ cp doc/mkdssp.1 $(DIST_NAME)/doc/mkdssp.1
  	tar czf $(DIST_NAME).tgz $(DIST_NAME)
  	cp $(DIST_NAME).tgz dssp_$(VERSION).orig.tar.gz

Modified: trunk/packages/dssp/trunk/debian/rules
===================================================================
--- trunk/packages/dssp/trunk/debian/rules	2012-05-22 06:17:07 UTC (rev 10932)
+++ trunk/packages/dssp/trunk/debian/rules	2012-05-22 06:35:04 UTC (rev 10933)
@@ -1,6 +1,10 @@
 #!/usr/bin/make -f
 
 DH_VERBOSE := 1
+PPFLAGS:=$(shell dpkg-buildflags --get CPPFLAGS)
+CFLAGS:=$(shell dpkg-buildflags --get CFLAGS)
+CXXFLAGS:=$(shell dpkg-buildflags --get CXXFLAGS)
+LDFLAGS:=$(shell dpkg-buildflags --get LDFLAGS)
 
 %:
 	dh $@ --parallel