r35287 - in /packages/teem/trunk/debian: control copyright patches/10_renameapps.dpatch patches/20_soname.dpatch patches/30_cmakewarnings.dpatch rules

domibel-guest at users.alioth.debian.org domibel-guest at users.alioth.debian.org
Tue Oct 28 22:41:05 UTC 2008


Author: domibel-guest
Date: Tue Oct 28 22:41:05 2008
New Revision: 35287

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=35287
Log:
uses binary-indep target now

Modified:
    packages/teem/trunk/debian/control
    packages/teem/trunk/debian/copyright
    packages/teem/trunk/debian/patches/10_renameapps.dpatch
    packages/teem/trunk/debian/patches/20_soname.dpatch
    packages/teem/trunk/debian/patches/30_cmakewarnings.dpatch
    packages/teem/trunk/debian/rules

Modified: packages/teem/trunk/debian/control
URL: http://svn.debian.org/wsvn/debian-science/packages/teem/trunk/debian/control?rev=35287&op=diff
==============================================================================
--- packages/teem/trunk/debian/control (original)
+++ packages/teem/trunk/debian/control Tue Oct 28 22:41:05 2008
@@ -3,7 +3,8 @@
 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 (>= 6), cmake, dpatch, doxygen, graphviz, d-shlibs
+Build-Depends: debhelper (>= 6), cmake, dpatch, doxygen, graphviz,
+ d-shlibs, zlib1g-dev, libpng12-dev, libbz2-dev
 Standards-Version: 3.8.0
 Vcs-Browser: http://svn.debian.org/wsvn/debian-science/packages/teem/trunk/?rev=0&sc=0
 Vcs-Svn: svn://svn.debian.org/svn/debian-science/packages/teem/trunk/
@@ -53,6 +54,7 @@
   * Ten: for estimating, processing, and visualizing diffusion tensor fields,
     including fiber tractography methods.
 
+
 Package: teem-doc
 Section: doc
 Architecture: all
@@ -73,5 +75,3 @@
     based on any quantity Gage can measure
   * Ten: for estimating, processing, and visualizing diffusion tensor fields,
     including fiber tractography methods.
-
-

Modified: packages/teem/trunk/debian/copyright
URL: http://svn.debian.org/wsvn/debian-science/packages/teem/trunk/debian/copyright?rev=35287&op=diff
==============================================================================
--- packages/teem/trunk/debian/copyright (original)
+++ packages/teem/trunk/debian/copyright Tue Oct 28 22:41:05 2008
@@ -10,78 +10,27 @@
  The Debian packaging is licensed under the GPL, see `/usr/share/common-licenses/GPL'
 
 
-Files: src/air/randMT.c
-Copyright:
- Copyright (C) 2006, 2005  Gordon Kindlmann
- Copyright (C) 2004, 2003, 2002, 2001, 2000, 1999, 1998  University of Utah
- Copyright (C) 1997 - 2002, Makoto Matsumoto and Takuji Nishimura,
- Copyright (C) 2000 - 2003, Richard J. Wagner
-
-License: LGPL
- This package is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
- .
- This package is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- Lesser General Public License for more details.
- .
- You should have received a copy of the GNU Lesser General Public
- License along with this package; if not, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
- .
- On Debian systems, the complete text of the GNU Lesser General
- Public License can be found in `/usr/share/common-licenses/LGPL'.
-
-
-Files: src/nrrd/gzio.c
-Copyright:
- Copyright (C) 2006, 2005  Gordon Kindlmann
- Copyright (C) 2004, 2003, 2002, 2001, 2000, 1999, 1998  University of Utah
- Copyright (C) 1995-2002 Jean-loup Gailly and Mark Adler
-
-License: LGPL
- This package is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
- .
- This package is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- Lesser General Public License for more details.
- .
- You should have received a copy of the GNU Lesser General Public
- License along with this package; if not, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
- .
- On Debian systems, the complete text of the GNU Lesser General
- Public License can be found in `/usr/share/common-licenses/LGPL'.
-
-
 Files: src/hex/*.c
 Copyright:
  Copyright (C) 2004, 2003, 2002 University of Utah
 
-License: LGPL
- This package is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
- .
- This package is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- Lesser General Public License for more details.
- .
- You should have received a copy of the GNU Lesser General Public
- License along with this package; if not, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
- .
- On Debian systems, the complete text of the GNU Lesser General
- Public License can be found in `/usr/share/common-licenses/LGPL'.
+License:
+  This software,  is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+
 
 
 Files: include/*

Modified: packages/teem/trunk/debian/patches/10_renameapps.dpatch
URL: http://svn.debian.org/wsvn/debian-science/packages/teem/trunk/debian/patches/10_renameapps.dpatch?rev=35287&op=diff
==============================================================================
--- packages/teem/trunk/debian/patches/10_renameapps.dpatch (original)
+++ packages/teem/trunk/debian/patches/10_renameapps.dpatch Tue Oct 28 22:41:05 2008
@@ -5,9 +5,9 @@
 ## DP: For each application app: rename "app" to "teem-app".
 
 @DPATCH@
-diff -urNad teem-1.10.0+svn3841~/src/bin/CMakeLists.txt teem-1.10.0+svn3841/src/bin/CMakeLists.txt
---- teem-1.10.0+svn3841~/src/bin/CMakeLists.txt	2008-05-18 20:47:45.000000000 +0200
-+++ teem-1.10.0+svn3841/src/bin/CMakeLists.txt	2008-05-18 20:48:55.000000000 +0200
+diff -urNad teem-1.10.0~svn3909~/src/bin/CMakeLists.txt teem-1.10.0~svn3909/src/bin/CMakeLists.txt
+--- teem-1.10.0~svn3909~/src/bin/CMakeLists.txt	2008-10-28 21:27:46.000000000 +0100
++++ teem-1.10.0~svn3909/src/bin/CMakeLists.txt	2008-10-28 22:30:39.000000000 +0100
 @@ -10,30 +10,30 @@
      )
  ENDMACRO(CREATE_EXEC)

Modified: packages/teem/trunk/debian/patches/20_soname.dpatch
URL: http://svn.debian.org/wsvn/debian-science/packages/teem/trunk/debian/patches/20_soname.dpatch?rev=35287&op=diff
==============================================================================
--- packages/teem/trunk/debian/patches/20_soname.dpatch (original)
+++ packages/teem/trunk/debian/patches/20_soname.dpatch Tue Oct 28 22:41:05 2008
@@ -5,10 +5,10 @@
 ## DP: use a soname version number
 
 @DPATCH@
-diff -urNad teem-1.10.0~svn3873~/CMakeLists.txt teem-1.10.0~svn3873/CMakeLists.txt
---- teem-1.10.0~svn3873~/CMakeLists.txt	2008-07-14 00:03:19.000000000 +0200
-+++ teem-1.10.0~svn3873/CMakeLists.txt	2008-07-14 00:05:30.000000000 +0200
-@@ -276,6 +276,8 @@
+diff -urNad teem-1.10.0~svn3909~/CMakeLists.txt teem-1.10.0~svn3909/CMakeLists.txt
+--- teem-1.10.0~svn3909~/CMakeLists.txt	2008-10-28 21:27:46.000000000 +0100
++++ teem-1.10.0~svn3909/CMakeLists.txt	2008-10-28 22:30:56.000000000 +0100
+@@ -299,6 +299,8 @@
    BUILD_WITH_INSTALL_RPATH OFF
    INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib
    INSTALL_NAME_DIR ${CMAKE_INSTALL_PREFIX}/lib

Modified: packages/teem/trunk/debian/patches/30_cmakewarnings.dpatch
URL: http://svn.debian.org/wsvn/debian-science/packages/teem/trunk/debian/patches/30_cmakewarnings.dpatch?rev=35287&op=diff
==============================================================================
--- packages/teem/trunk/debian/patches/30_cmakewarnings.dpatch (original)
+++ packages/teem/trunk/debian/patches/30_cmakewarnings.dpatch Tue Oct 28 22:41:05 2008
@@ -5,9 +5,9 @@
 ## DP: set cmake_policy
 
 @DPATCH@
-diff -urNad teem-1.10.0~svn3873~/src/bin/CMakeLists.txt teem-1.10.0~svn3873/src/bin/CMakeLists.txt
---- teem-1.10.0~svn3873~/src/bin/CMakeLists.txt	2008-07-13 23:27:50.000000000 +0200
-+++ teem-1.10.0~svn3873/src/bin/CMakeLists.txt	2008-07-13 23:28:08.000000000 +0200
+diff -urNad teem-1.10.0~svn3909~/src/bin/CMakeLists.txt teem-1.10.0~svn3909/src/bin/CMakeLists.txt
+--- teem-1.10.0~svn3909~/src/bin/CMakeLists.txt	2008-10-28 22:31:08.000000000 +0100
++++ teem-1.10.0~svn3909/src/bin/CMakeLists.txt	2008-10-28 22:31:08.000000000 +0100
 @@ -1,3 +1,8 @@
 +
 +    if(COMMAND cmake_policy)

Modified: packages/teem/trunk/debian/rules
URL: http://svn.debian.org/wsvn/debian-science/packages/teem/trunk/debian/rules?rev=35287&op=diff
==============================================================================
--- packages/teem/trunk/debian/rules (original)
+++ packages/teem/trunk/debian/rules Tue Oct 28 22:41:05 2008
@@ -52,20 +52,27 @@
         # build shared libs and binaries
 	cd $(SHARED_BUILD_PATH) && $(MAKE) VERBOSE=1
 
+	touch $@
+
+build-docs: build-stamp docs-stamp
+docs-stamp:
+	dh_testdir
+
 	# generate documentation
 	doxygen debian/Doxyfile
 
 	# remove zero byte files
-	find doc/ -depth -empty | xargs rm -rf 
+	find doc/ -depth -empty | xargs rm -rf
 
 	touch $@
+
 
 clean: clean-patched unpatch
 
 clean-patched:
 	dh_testdir
 	dh_testroot
-	rm -f build-stamp configure-stamp
+	rm -f build-stamp configure-stamp docs-stamp
 
 	# Add here commands to clean up after the build process.
 	rm -rf $(STATIC_BUILD_PATH)
@@ -98,7 +105,6 @@
 
 
 	dh_install -plibteem1-dev         debian/tmp/usr/lib/TEEM-1.10              usr/lib
-	dh_install -pteem-doc             doc/*                                     usr/share/doc/teem-doc
 	dh_install -pteem-apps            debian/tmp/usr/bin/*                      usr/bin
 
 
@@ -107,8 +113,10 @@
 
 
 # Build architecture-independent files here.
-binary-indep: build install
-# We have nothing to do by default.
+binary-indep: build build-docs install
+
+	dh_install -pteem-doc             doc/*                                     usr/share/doc/teem-doc
+
 
 # Build architecture-dependent files here.
 binary-arch: build install




More information about the debian-science-commits mailing list