r35376 - in /packages/kwwidgets/trunk/debian: ./ changelog get-orig-source rules

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

Author: malat-guest
Date: Sat Dec 20 12:41:53 2008
New Revision: 35376

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=35376
Log:
some improvements

Modified:
    packages/kwwidgets/trunk/debian/   (props changed)
    packages/kwwidgets/trunk/debian/changelog
    packages/kwwidgets/trunk/debian/get-orig-source
    packages/kwwidgets/trunk/debian/rules

Propchange: packages/kwwidgets/trunk/debian/
------------------------------------------------------------------------------
    mergeWithUpstream = 1

Modified: packages/kwwidgets/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-science/packages/kwwidgets/trunk/debian/changelog?rev=35376&op=diff
==============================================================================
--- packages/kwwidgets/trunk/debian/changelog (original)
+++ packages/kwwidgets/trunk/debian/changelog Sat Dec 20 12:41:53 2008
@@ -1,3 +1,13 @@
+kwwidgets (1.0.0~cvs20080526-3) experimental; urgency=low
+
+  * debian/get-orig-source: cvs login is not required
+  * debian/rules: support DEB_BUILD_OPTIONS=parallel=4, DEB_BUILD_OPTIONS=noopt
+  * debian/rules: remove testing (neither installed, not run) 
+  * debian/rules: remove duplicate configuration
+  * debian/rules: use doxygen target
+
+ -- Mathieu Malaterre <mathieu.malaterre at gmail.com>  Sat, 20 Dec 2008 13:38:41 +0100
+
 kwwidgets (1.0.0~cvs20080526-2) experimental; urgency=low
 
   * debian/control: doxygen & graphviz moved to Build-Depends-Indep

Modified: packages/kwwidgets/trunk/debian/get-orig-source
URL: http://svn.debian.org/wsvn/debian-science/packages/kwwidgets/trunk/debian/get-orig-source?rev=35376&op=diff
==============================================================================
--- packages/kwwidgets/trunk/debian/get-orig-source (original)
+++ packages/kwwidgets/trunk/debian/get-orig-source Sat Dec 20 12:41:53 2008
@@ -7,8 +7,8 @@
 TARFILE=kwwidgets_$VERSION.orig.tar.gz
 CVSHOME=:pserver:anoncvs at www.kwwidgets.org:/cvsroot/KWWidgets
 
-echo "ENTER PASSWORD : (press return)"
-cvs -d:pserver:anoncvs at www.kwwidgets.org:/cvsroot/KWWidgets login
+#echo "ENTER PASSWORD : (press return)"
+#cvs -d:pserver:anoncvs at www.kwwidgets.org:/cvsroot/KWWidgets login
 cvs -d:pserver:anoncvs at www.kwwidgets.org:/cvsroot/KWWidgets checkout -D "$CVSDATE" KWWidgets
 # cvs -d:pserver:anoncvs at www.kwwidgets.org:/cvsroot/KWWidgets checkout -r Slicer-3-2 KWWidgets
 

Modified: packages/kwwidgets/trunk/debian/rules
URL: http://svn.debian.org/wsvn/debian-science/packages/kwwidgets/trunk/debian/rules?rev=35376&op=diff
==============================================================================
--- packages/kwwidgets/trunk/debian/rules (original)
+++ packages/kwwidgets/trunk/debian/rules Sat Dec 20 12:41:53 2008
@@ -9,16 +9,30 @@
 # Uncomment this to turn on verbose mode.
 export DH_VERBOSE=1
 
+CFLAGS = -g
+ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+	CFLAGS += -O0
+else
+	CFLAGS += -O2
+endif
+export CFLAGS
+
+# set the number of build jobs
+ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
+        JOBS := -j$(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
+endif
+
 SHARED_BUILD_PATH = DEB_build_shared
 CMAKE_FLAGS = -DCMAKE_INSTALL_PREFIX:PATH=/usr \
+              -DCMAKE_VERBOSE_MAKEFILE=$(DH_VERBOSE) \
               -DCMAKE_CXX_FLAGS="-Wno-deprecated -I/usr/include/python2.5" \
               -DCMAKE_SHARED_LINKER_FLAGS="-Wl,--as-needed" \
               -DCMAKE_EXE_LINKER_FLAGS="-Wl,--as-needed" \
               -DCMAKE_SKIP_RPATH:BOOL=ON \
               -DBUILD_DOCUMENTATION:BOOL=ON \
               -DKWWidgets_BUILD_EXAMPLES:BOOL=OFF \
-              -DKWWidgets_BUILD_TESTING:BOOL=ON \
-              -DVTK_INSTALL_LIB_DIR="/lib/vtk-5.0"
+              -DKWWidgets_BUILD_TESTING:BOOL=OFF \
+              -DVTK_DIR="/usr/lib/vtk-5.0"
 
 
 get-orig-source:
@@ -36,9 +50,6 @@
 	cd $(SHARED_BUILD_PATH) \
               && cmake $(CURDIR) $(CMAKE_FLAGS) -DBUILD_SHARED_LIBS:BOOL=ON
 
-	cd $(SHARED_BUILD_PATH) \
-              && cmake $(CURDIR) $(CMAKE_FLAGS) -DBUILD_SHARED_LIBS:BOOL=ON
-
 	touch configure-stamp
 
 
@@ -53,7 +64,7 @@
 	# Add here commands to compile the package.
 
 	# build shared libs and binaries
-	cd $(SHARED_BUILD_PATH) && $(MAKE) VERBOSE=1
+	$(MAKE) $(JOBS) -C $(SHARED_BUILD_PATH)
 
         # perform tests ('-' ignores return values)
 #	- cd $(SHARED_BUILD_PATH) && ctest -D Nightly -VV
@@ -65,8 +76,10 @@
 build-indep-stamp: configure
 	dh_testdir
 
-	doxygen -u -s $(SHARED_BUILD_PATH)/Utilities/Doxygen/doxyfile
-	doxygen $(SHARED_BUILD_PATH)/Utilities/Doxygen/doxyfile
+  # KWWidgetsDoxygenDoc is a target not associated with 'all'
+	$(MAKE) $(JOBS) KWWidgetsDoxygenDoc -C $(SHARED_BUILD_PATH)
+	#doxygen -u -s $(SHARED_BUILD_PATH)/Utilities/Doxygen/doxyfile
+	#doxygen $(SHARED_BUILD_PATH)/Utilities/Doxygen/doxyfile
 
         # remove zero byte files
 	find $(SHARED_BUILD_PATH)/Utilities/Doxygen/doc/ -depth -empty | xargs rm -rf
@@ -99,7 +112,7 @@
 	# Add here commands to install the package into debian/tmp
 	
 	# install binaries and shared libs
-	cd $(SHARED_BUILD_PATH) && $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
+	$(MAKE) $(JOBS) -C $(SHARED_BUILD_PATH) install DESTDIR=$(CURDIR)/debian/tmp
 
 
 	dh_install -plibkwwidgets1        debian/tmp/usr/lib/lib*.so.*             usr/lib