Author: malat-guest Date: 2010-05-23 14:04:01 +0000 (Sun, 23 May 2010) New Revision: 4824
Removed: trunk/packages/dicom3tools/trunk/debian/patches/ourdisp_xinclude.patch Modified: trunk/packages/dicom3tools/trunk/debian/control trunk/packages/dicom3tools/trunk/debian/patches/series trunk/packages/dicom3tools/trunk/debian/rules Log: Properly fix X11 class compilation Modified: trunk/packages/dicom3tools/trunk/debian/control =================================================================== --- trunk/packages/dicom3tools/trunk/debian/control 2010-05-23 13:20:43 UTC (rev 4823) +++ trunk/packages/dicom3tools/trunk/debian/control 2010-05-23 14:04:01 UTC (rev 4824) @@ -4,7 +4,7 @@ DM-Upload-Allowed: yes Uploaders: Mathieu Malaterre <[email protected]> Priority: extra -Build-Depends: debhelper (>= 7), quilt, xutils-dev, libx11-dev, x11proto-xext-dev +Build-Depends: debhelper (>= 7), quilt, xutils-dev, libx11-dev, libxext-dev Standards-Version: 3.8.4 Vcs-Browser: http://svn.debian.org/wsvn/debian-med/trunk/packages/dicom3tools/trunk/?rev=0&sc=0 Vcs-Svn: svn://svn.debian.org/svn/debian-med/trunk/packages/dicom3tools/trunk/ Deleted: trunk/packages/dicom3tools/trunk/debian/patches/ourdisp_xinclude.patch =================================================================== --- trunk/packages/dicom3tools/trunk/debian/patches/ourdisp_xinclude.patch 2010-05-23 13:20:43 UTC (rev 4823) +++ trunk/packages/dicom3tools/trunk/debian/patches/ourdisp_xinclude.patch 2010-05-23 14:04:01 UTC (rev 4824) @@ -1,13 +0,0 @@ -For some reason the include path contains -I/usr/include/X11, but C++ files -needs -I/usr/include - ---- dicom3tools-1.0~20081122.orig/config/Project.p-tmpl.orig 2010-05-23 14:45:13.000000000 +0200 -+++ dicom3tools-1.0~20081122/config/Project.p-tmpl 2010-05-23 14:46:16.000000000 +0200 -@@ -134,6 +134,7 @@ - PROJECTLIBOURDISPEXTRAINCLUDES = -I$(PROJECTINCLUDEDIR)/$(PROJECTGENERICINCLUDEDIRNAME) \ - -I$(PROJECTINCLUDEDIR)/$(PROJECTLOCALEINCLUDEDIRNAME) \ - -I$(PROJECTINCLUDEDIR)/$(PROJECTOURDISPINCLUDEDIRNAME) \ -+ SystemIncludeOption \ - SystemIncludeOption/**/$(X11INCLUDEPATH) - - PROJECTLIBDCONVERTEXTRAINCLUDES = -I$(PROJECTINCLUDEDIR)/$(PROJECTGENERICINCLUDEDIRNAME) \ Modified: trunk/packages/dicom3tools/trunk/debian/patches/series =================================================================== --- trunk/packages/dicom3tools/trunk/debian/patches/series 2010-05-23 13:20:43 UTC (rev 4823) +++ trunk/packages/dicom3tools/trunk/debian/patches/series 2010-05-23 14:04:01 UTC (rev 4824) @@ -5,4 +5,3 @@ jpegdump.man.patch bmpdump.man.patch pvrg_naming.patch -ourdisp_xinclude.patch Modified: trunk/packages/dicom3tools/trunk/debian/rules =================================================================== --- trunk/packages/dicom3tools/trunk/debian/rules 2010-05-23 13:20:43 UTC (rev 4823) +++ trunk/packages/dicom3tools/trunk/debian/rules 2010-05-23 14:04:01 UTC (rev 4824) @@ -28,9 +28,12 @@ CFLAGS = -Wall -g -ifneq (,$(findstring regression_testing_dicom,$(DEB_BUILD_OPTIONS))) +ifneq (,$(findstring regression_testing_dicom,$(MM_BUILD_OPTIONS))) DCLIST = -name andump\* -o -name ancreate\* -o -name dcencap\* -o -name dccp\* -o -name dctoraw\* -o -name dcjpeg\* -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\* -IMAKEFLAGS = -DDefaultUIDRoot=1.3.6.1.4.1.35045 +ifneq (,$(filter default_uid_root=%,$(MM_BUILD_OPTIONS))) + DEFAULTUIDROOT = $(patsubst default_uid_root=%,%,$(filter default_uid_root=%,$(MM_BUILD_OPTIONS))) + IMAKEFLAGS = -DDefaultUIDRoot=$(DEFAULTUIDROOT) +endif else 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\* endif @@ -49,7 +52,7 @@ find . -name \*.awk -exec sed -i -e 's@/dev/tty@/dev/std...@g' {} \; # Add here commands to configure the package. sh Configure - imake -I./config -DTmpPath=/tmp -DOptimizeLevel=$(OPT_FLAGS) $(IMAKEFLAGS) -DSystemIncludeOption=-I/usr/include + imake -I./config -DTmpPath=/tmp -DOptimizeLevel=$(OPT_FLAGS) $(IMAKEFLAGS) touch configure-stamp build: build-stamp _______________________________________________ debian-med-commit mailing list [email protected] http://lists.alioth.debian.org/mailman/listinfo/debian-med-commit
