r35829 - in /packages/kwwidgets/trunk/debian: CMakeCache.txt.debian README.source control get-orig-source kwwidgets-doc.doc-base rules

domibel-guest at users.alioth.debian.org domibel-guest at users.alioth.debian.org
Fri Sep 11 17:26:58 UTC 2009


Author: domibel-guest
Date: Fri Sep 11 17:26:58 2009
New Revision: 35829

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=35829
Log:
more cleanup

Modified:
    packages/kwwidgets/trunk/debian/CMakeCache.txt.debian
    packages/kwwidgets/trunk/debian/README.source
    packages/kwwidgets/trunk/debian/control
    packages/kwwidgets/trunk/debian/get-orig-source
    packages/kwwidgets/trunk/debian/kwwidgets-doc.doc-base
    packages/kwwidgets/trunk/debian/rules

Modified: packages/kwwidgets/trunk/debian/CMakeCache.txt.debian
URL: http://svn.debian.org/wsvn/debian-science/packages/kwwidgets/trunk/debian/CMakeCache.txt.debian?rev=35829&op=diff
==============================================================================
--- packages/kwwidgets/trunk/debian/CMakeCache.txt.debian (original)
+++ packages/kwwidgets/trunk/debian/CMakeCache.txt.debian Fri Sep 11 17:26:58 2009
@@ -1,2 +1,1 @@
-VTK_DIR:PATH=/usr/lib/vtk-5.2
-
+CMAKE_SKIP_RPATH:BOOL=ON

Modified: packages/kwwidgets/trunk/debian/README.source
URL: http://svn.debian.org/wsvn/debian-science/packages/kwwidgets/trunk/debian/README.source?rev=35829&op=diff
==============================================================================
--- packages/kwwidgets/trunk/debian/README.source (original)
+++ packages/kwwidgets/trunk/debian/README.source Fri Sep 11 17:26:58 2009
@@ -1,4 +1,3 @@
 Please read 
 /usr/share/doc/quilt/README.source
 for more information.
-

Modified: packages/kwwidgets/trunk/debian/control
URL: http://svn.debian.org/wsvn/debian-science/packages/kwwidgets/trunk/debian/control?rev=35829&op=diff
==============================================================================
--- packages/kwwidgets/trunk/debian/control (original)
+++ packages/kwwidgets/trunk/debian/control Fri Sep 11 17:26:58 2009
@@ -3,10 +3,10 @@
 Maintainer: Debian Science Team <debian-science-maintainers at lists.alioth.debian.org>
 DM-Upload-Allowed: yes
 Uploaders: Dominique Belhachemi <domibel at cs.tu-berlin.de>
-Build-Depends: debhelper (>= 7), cdbs, cmake, quilt (>= 0.40), libvtk5-dev (>= 5.2.1-10),
- vtk-tcl, tcl8.5-dev, tk8.5-dev, libpng-dev, libfreetype6-dev, libxext-dev, libjpeg-dev,
- libtiff-dev, libexpat1-dev, libxft-dev, python-support (>= 0.5.3),
- python-all-dev (>= 2.3.5-11), python2.5-dev, python-vtk
+Build-Depends: debhelper (>= 7), cdbs, cmake, quilt (>= 0.40), vtk-tcl,
+ libvtk5-dev (>= 5.2.1-10), tcl8.5-dev, tk8.5-dev, libpng-dev,
+ libfreetype6-dev, libxext-dev, libjpeg-dev, libtiff-dev, libexpat1-dev,
+ libxft-dev, python-support, python-all-dev, python2.5-dev, python-vtk
 Build-Depends-Indep: doxygen, graphviz
 Standards-Version: 3.8.3
 Vcs-Browser: http://svn.debian.org/wsvn/debian-science/packages/kwwidgets/trunk/?rev=0&sc=0
@@ -34,7 +34,6 @@
 
 Package: libkwwidgets1.0.0908
 Architecture: any
-Replaces: libkwwidgets1
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: Cross-Platform GUI Toolkit - runtime
  Like many other GUI toolkits, it provides low-level core widgets
@@ -125,6 +124,7 @@
 Package: tcl8.5-kwwidgets
 Section: interpreters
 Architecture: any
+Conflicts: tcl8.4-kwwidgets
 Replaces: tcl8.4-kwwidgets
 Depends: ${shlibs:Depends}, ${misc:Depends}, tcl8.5, tk8.5
 Description: Cross-Platform GUI Toolkit - TCL/TK

Modified: packages/kwwidgets/trunk/debian/get-orig-source
URL: http://svn.debian.org/wsvn/debian-science/packages/kwwidgets/trunk/debian/get-orig-source?rev=35829&op=diff
==============================================================================
--- packages/kwwidgets/trunk/debian/get-orig-source (original)
+++ packages/kwwidgets/trunk/debian/get-orig-source Fri Sep 11 17:26:58 2009
@@ -1,3 +1,5 @@
+#!/bin/sh
+
 PACKAGE=kwwidgets
 
 VERSION=1.0.0~cvs20090825
@@ -7,23 +9,14 @@
 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
 cvs -d:pserver:anoncvs at www.kwwidgets.org:/cvsroot/KWWidgets export -D "$CVSDATE" KWWidgets
 #cvs -d:pserver:anoncvs at www.kwwidgets.org:/cvsroot/KWWidgets export -r Slicer-3-4 KWWidgets
 
-
-# Remove all CVS directories
-#echo "Removing all CVS directories"
-#for REMOVE_CVS in `find KWWidgets -name CVS`; do
-#        rm -rf "$REMOVE_CVS"
-#done
 for REMOVE_CVS in `find KWWidgets -name .cvsignore`; do
         rm "$REMOVE_CVS"
 done
 
-
 mv KWWidgets $FOLDER
 
-tar cvzf $TARFILE $FOLDER
+GZIP=-9 tar cvzf $TARFILE $FOLDER
 rm -rf $FOLDER

Modified: packages/kwwidgets/trunk/debian/kwwidgets-doc.doc-base
URL: http://svn.debian.org/wsvn/debian-science/packages/kwwidgets/trunk/debian/kwwidgets-doc.doc-base?rev=35829&op=diff
==============================================================================
--- packages/kwwidgets/trunk/debian/kwwidgets-doc.doc-base (original)
+++ packages/kwwidgets/trunk/debian/kwwidgets-doc.doc-base Fri Sep 11 17:26:58 2009
@@ -14,7 +14,3 @@
 Format: HTML
 Index: /usr/share/doc/kwwidgets-doc/html/index.html
 Files: /usr/share/doc/kwwidgets-doc/html/*.html
-
-
-
-

Modified: packages/kwwidgets/trunk/debian/rules
URL: http://svn.debian.org/wsvn/debian-science/packages/kwwidgets/trunk/debian/rules?rev=35829&op=diff
==============================================================================
--- packages/kwwidgets/trunk/debian/rules (original)
+++ packages/kwwidgets/trunk/debian/rules Fri Sep 11 17:26:58 2009
@@ -24,6 +24,7 @@
 DEB_MAKE_BUILD_TARGET    := $(JOBS)
 DEB_MAKE_INSTALL_TARGET  := $(JOBS) install
 
+
 $(DEB_BUILDDIR)/CMakeCache.txt: debian/CMakeCache.txt.debian
 	cp $< $@
 	echo CMAKE_INSTALL_PREFIX:PATH=$(CURDIR)/debian/tmp/usr >> $@
@@ -31,32 +32,19 @@
 	echo CMAKE_CXX_FLAGS:STRING=-Wno-deprecated -I/usr/include/python2.5 >> $@
 	echo CMAKE_SHARED_LINKER_FLAGS:STRING=-Wl,--as-needed >> $@
 	echo CMAKE_EXE_LINKER_FLAGS:STRING=-Wl,--as-needed >> $@
-	echo CMAKE_SKIP_RPATH:BOOL=ON >> $@
 	echo BUILD_DOCUMENTATION:BOOL=ON >> $@
 	echo KWWidgets_BUILD_EXAMPLES:BOOL=OFF >> $@
 	echo KWWidgets_BUILD_TESTING:BOOL=OFF >> $@
 	echo BUILD_SHARED_LIBS:BOOL=ON >> $@
 
 
-#This package is using
-#    -DCMAKE_INSTALL_PREFIX:PATH=$(CURDIR)/debian/tmp/usr
-#    $(MAKE) $(JOBS) -C $(SHARED_BUILD_PATH) install
-#instead of
-#    -DCMAKE_INSTALL_PREFIX:PATH=/usr
-#    $(MAKE) $(JOBS) -C $(SHARED_BUILD_PATH) install DESTDIR=$(CURDIR)/debian/tmp
-#
-# else, python tries to install into the wrong directory
-# ./Wrapping/Python/CMakeLists.txt:69:      set(KWWidgets_PYTHON_SETUP_ARGS "--prefix=\"${DOLLAR}{CMAKE_INSTALL_PREFIX}\""
-
-
 get-orig-source:
 	/bin/sh $(CURDIR)/debian/get-orig-source
+
 
 common-configure-arch:: $(DEB_BUILDDIR)/CMakeCache.txt
 	cd $(DEB_BUILDDIR) && cmake ..
 
-##       # perform tests ('-' ignores return values)
-##	- cd $(SHARED_BUILD_PATH) && ctest -D Nightly -VV
 
 common-build-arch::
 	echo "python-kwwidgets: non-dev-pkg-with-shlib-symlink" > debian/python-kwwidgets.lintian-overrides
@@ -65,21 +53,19 @@
 
 
 install/kwwidgets-doc::
-	#	KWWidgetsDoxygenDoc is a target not associated with 'all'
-	#       $(MAKE) $(JOBS) KWWidgetsDoxygenDoc -C $(SHARED_BUILD_PATH)
 	doxygen -u -s $(DEB_BUILDDIR)/Utilities/Doxygen/Doxyfile
 	doxygen $(DEB_BUILDDIR)/Utilities/Doxygen/Doxyfile
-        # remove zero byte files
+	# remove zero byte files
 	find $(DEB_BUILDDIR)/Utilities/Doxygen/doc/ -depth -empty | xargs rm -rf
 
 
 install/python-kwwidgets::
-#        dh_pysupport -p$(pkg_python)
 	dh_pysupport -v
 
 
 install/kwwidgets-examples::
 	dh_installexamples  -pkwwidgets-examples  Examples/*
 
+
 clean::
 	rm -rf $(DEB_BUILDDIR)




More information about the debian-science-commits mailing list