r35390 - in /packages/kwwidgets/trunk/debian: changelog control rules

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

Author: domibel-guest
Date: Sat Dec 27 04:22:32 2008
New Revision: 35390

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=35390
Log:
minor changes

Modified:
    packages/kwwidgets/trunk/debian/changelog
    packages/kwwidgets/trunk/debian/control
    packages/kwwidgets/trunk/debian/rules

Modified: packages/kwwidgets/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-science/packages/kwwidgets/trunk/debian/changelog?rev=35390&op=diff
==============================================================================
--- packages/kwwidgets/trunk/debian/changelog (original)
+++ packages/kwwidgets/trunk/debian/changelog Sat Dec 27 04:22:32 2008
@@ -1,20 +1,17 @@
-kwwidgets (1.0.0~cvs20080526-3) experimental; urgency=low
+kwwidgets (1.0.0~cvs20080526-2) experimental; urgency=low
 
   [ Mathieu Malaterre ]
   * 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
-  * kwwidgets doxygen need toplevel vtk class (for doxygen hierarchy). vtk-doc is now required
+  * kwwidgets doxygen need toplevel vtk class (for doxygen hierarchy).
+    vtk-doc is now required
 
   [ Dominique Belhachemi]
   * added debian/libkwwidgets1.symbols
   * debhelper version increased to 7
-
- -- Dominique Belhachemi <domibel at cs.tu-berlin.de>  Sat, 20 Dec 2008 17:38:32 -0500
-
-kwwidgets (1.0.0~cvs20080526-2) experimental; urgency=low
-
   * debian/control: doxygen & graphviz moved to Build-Depends-Indep
 
  -- Dominique Belhachemi <domibel at cs.tu-berlin.de>  Wed, 12 Nov 2008 21:59:28 +0100

Modified: packages/kwwidgets/trunk/debian/control
URL: http://svn.debian.org/wsvn/debian-science/packages/kwwidgets/trunk/debian/control?rev=35390&op=diff
==============================================================================
--- packages/kwwidgets/trunk/debian/control (original)
+++ packages/kwwidgets/trunk/debian/control Sat Dec 27 04:22:32 2008
@@ -5,8 +5,8 @@
 Uploaders: Dominique Belhachemi <domibel at cs.tu-berlin.de>
 Build-Depends: debhelper (>= 7), cmake, dpatch, libvtk5-dev, tcl8.4-dev, vtk-tcl,
  tk8.4-dev, libpng-dev, libfreetype6-dev, libxext-dev, libjpeg-dev, libtiff-dev,
- libexpat1-dev, python-vtk, python2.5-dev, vtk-doc
-Build-Depends-Indep: doxygen, graphviz
+ libexpat1-dev, python-vtk, python2.5-dev
+Build-Depends-Indep: doxygen, graphviz, vtk-doc
 Standards-Version: 3.8.0
 Vcs-Browser: http://svn.debian.org/wsvn/debian-science/packages/kwwidgets/trunk/?rev=0&sc=0
 Vcs-Svn: svn://svn.debian.org/svn/debian-science/packages/kwwidgets/trunk/

Modified: packages/kwwidgets/trunk/debian/rules
URL: http://svn.debian.org/wsvn/debian-science/packages/kwwidgets/trunk/debian/rules?rev=35390&op=diff
==============================================================================
--- packages/kwwidgets/trunk/debian/rules (original)
+++ packages/kwwidgets/trunk/debian/rules Sat Dec 27 04:22:32 2008
@@ -46,9 +46,6 @@
 
 	if [ ! -d $(SHARED_BUILD_PATH) ]; then mkdir $(SHARED_BUILD_PATH); fi
 
-	# double execution of cmake
-	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
 
@@ -79,9 +76,9 @@
 	dh_testdir
 
 	# 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
+#	$(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
@@ -128,7 +125,7 @@
 
 install-indep: build-indep
 	dh_install -pkwwidgets-doc        $(SHARED_BUILD_PATH)/Utilities/Doxygen/doc/*    /usr/share/doc/kwwidgets-doc
-	dh_install -pkwwidgets-examples   Examples                                 usr/share/KWWidgets
+	dh_install -pkwwidgets-examples   Examples                                 usr/share/kwwidgets