[med-svn] r8275 - in trunk/packages/dicom3tools/trunk/debian: . source

[Mathieu Malaterre]

Author: malat-guest
Date: 2011-10-25 17:06:08 +0000 (Tue, 25 Oct 2011)
New Revision: 8275

Added:
   trunk/packages/dicom3tools/trunk/debian/source/
   trunk/packages/dicom3tools/trunk/debian/source/format
Modified:
   trunk/packages/dicom3tools/trunk/debian/changelog
   trunk/packages/dicom3tools/trunk/debian/rules
Log:
some work on dicom3tools

Modified: trunk/packages/dicom3tools/trunk/debian/changelog
===================================================================
--- trunk/packages/dicom3tools/trunk/debian/changelog	2011-10-25 16:39:25 UTC (rev 8274)
+++ trunk/packages/dicom3tools/trunk/debian/changelog	2011-10-25 17:06:08 UTC (rev 8275)
@@ -1,3 +1,10 @@
+dicom3tools (1.0~20110918-2) UNRELEASED; urgency=low
+
+  * Switch to dpkg-source 3.0 (quilt) format
+  * Add hardening compilation flags
+
+ -- Mathieu Malaterre <mathieu.malaterre at gmail.com>  Tue, 25 Oct 2011 16:53:19 +0000
+
 dicom3tools (1.0~20110918-1) unstable; urgency=low
 
   * New upstream

Modified: trunk/packages/dicom3tools/trunk/debian/rules
===================================================================
--- trunk/packages/dicom3tools/trunk/debian/rules	2011-10-25 16:39:25 UTC (rev 8274)
+++ trunk/packages/dicom3tools/trunk/debian/rules	2011-10-25 17:06:08 UTC (rev 8275)
@@ -1,22 +1,9 @@
 #!/usr/bin/make -f
-# -*- makefile -*-
-# Sample debian/rules that uses debhelper.
-# This file was originally written by Joey Hess and Craig Small.
-# As a special exception, when this file is copied by dh-make into a
-# dh-make output file, you may use that output file without restriction.
-# This special exception was added by Craig Small in version 0.37 of dh-make.
-
-include /usr/share/quilt/quilt.make
-
-# Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
+DPKG_EXPORT_BUILDFLAGS = 1
+-include /usr/share/dpkg/buildflags.mk
 
-# These are used for cross-compiling and for saving the configure script
-# from having to guess our platform (since we know it already)
-DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-
 VER_MAJOR = 1
 VER_MINOR = 0
 VER_PATCH = $(shell dpkg-parsechangelog | grep '^Version' | cut -d' ' -f2 | cut -f1 -d- | cut -f2 -d~)
@@ -26,8 +13,6 @@
 DEBIAN_SRC_DIR = dicom3tools-$(VER_FULL)
 DEBIAN_SRC_TAR = dicom3tools_$(VER_FULL).orig.tar.gz
 
-CFLAGS = -Wall -g
-
 ifneq (,$(findstring regression_testing_dicom,$(MM_BUILD_OPTIONS)))
 DCLIST = -name andump\* -o -name dccp\* -o -name dcintro\* -o -name rawtodc\* -o -name pdftodc\* -o -name rawnjl2\* -o -name ancreate\* -o -name dcencap\* -o -name dccp\* -o -name dctoraw\* -o -name dcjpeg\* -o -name dcmulti\* -o -name dcuncat\* -o -name pnmtodc\* -o -name dcjls\* -o -name dcj2k\* -o -name dcunjpeg\* -o -name dcunjls\* -o -name bmpdump\* -o -name jpegdump\* -o -name dcdirdmp\* -o -name dcdump\* -o -name dcentvfy\* -o -name dcfile\* -o -name dchist\* -o -name dciodvfy\* -o -name dckey\* -o -name dcsort\* -o -name dcsrdump\* -o -name dcstats\* -o -name dctable\* -o -name dctopgm8\* -o -name dcposn\* -o -name dctopgx\* -o -name dctopnm\* -o -name pgxtodc\* -o -name pnmtodc\* -o -name rawftodc\* -o -name rawtodc\*
 ifneq (,$(filter default_uid_root=%,$(MM_BUILD_OPTIONS)))
@@ -38,13 +23,6 @@
 DCLIST = -name andump\* -o -name jpegdump\* -o -name dcdirdmp\* -o -name dcdump\* -o -name dcentvfy\* -o -name dcfile\* -o -name dchist\* -o -name dciodvfy\* -o -name dckey\* -o -name dcsort\* -o -name dcsrdump\* -o -name dcstats\* -o -name dctable\* -o -name dctopgm8\* -o -name dcposn\* -o -name dctopgx\* -o -name dctopnm\*
 endif
 
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-	OPT_FLAGS = -O0
-else
-	OPT_FLAGS = -O2
-endif
-CFLAGS += $(OPT_FLAGS)
-
 configure: configure-stamp
 configure-stamp: $(QUILT_STAMPFN)
 	dh_testdir

Added: trunk/packages/dicom3tools/trunk/debian/source/format
===================================================================
--- trunk/packages/dicom3tools/trunk/debian/source/format	                        (rev 0)
+++ trunk/packages/dicom3tools/trunk/debian/source/format	2011-10-25 17:06:08 UTC (rev 8275)
@@ -0,0 +1 @@
+3.0 (quilt)