r36868 - in /packages/fenics/ufc/trunk/debian: cdbs/ changelog control copyright rules ufc.install

Thu Sep 2 09:36:21 UTC 2010

Author: johannr-guest
Date: Thu Sep  2 09:36:13 2010
New Revision: 36868

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=36868
Log:
* New upstream release.
* Switch to CMake CDBS class.
  - Remove CDBS files for SCons and remove note in debian/copyright.
  - Replace scons with cmake in Build-Depends in debian/control.
  - Add UFC CMake config file to debian/ufc.install.
* Bump Standards-Version to 3.9.1 (no changes needed).

Removed:
    packages/fenics/ufc/trunk/debian/cdbs/
Modified:
    packages/fenics/ufc/trunk/debian/changelog
    packages/fenics/ufc/trunk/debian/control
    packages/fenics/ufc/trunk/debian/copyright
    packages/fenics/ufc/trunk/debian/rules
    packages/fenics/ufc/trunk/debian/ufc.install

Modified: packages/fenics/ufc/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-science/packages/fenics/ufc/trunk/debian/changelog?rev=36868&op=diff
==============================================================================

--- packages/fenics/ufc/trunk/debian/changelog (original)
+++ packages/fenics/ufc/trunk/debian/changelog Thu Sep  2 09:36:13 2010
@@ -1,3 +1,14 @@
+ufc (1.4.2-1) unstable; urgency=low
+
+  * New upstream release.
+  * Switch to CMake CDBS class.
+    - Remove CDBS files for SCons and remove note in debian/copyright.
+    - Replace scons with cmake in Build-Depends in debian/control.
+    - Add UFC CMake config file to debian/ufc.install.
+  * Bump Standards-Version to 3.9.1 (no changes needed).
+
+ -- Johannes Ring <johannr at simula.no>  Thu, 02 Sep 2010 08:25:44 +0200
+
 ufc (1.4.1-1) unstable; urgency=low
 
   * New upstream release.

Modified: packages/fenics/ufc/trunk/debian/control
URL: http://svn.debian.org/wsvn/debian-science/packages/fenics/ufc/trunk/debian/control?rev=36868&op=diff
==============================================================================
--- packages/fenics/ufc/trunk/debian/control (original)
+++ packages/fenics/ufc/trunk/debian/control Thu Sep  2 09:36:13 2010
@@ -4,8 +4,8 @@
 Maintainer: Debian Science Team <debian-science-maintainers at lists.alioth.debian.org>
 Uploaders: Christophe Prud'homme <prudhomm at debian.org>, Johannes Ring <johannr at simula.no>
 Build-Depends: cdbs (>= 0.4.49), debhelper (>= 7), python-all-dev, 
- python-central (>= 0.6.0), scons, swig (>= 1.3.35), libboost-dev
-Standards-Version: 3.9.0
+ python-central (>= 0.6.0), cmake (>= 2.8.0), swig (>= 1.3.35), libboost-dev
+Standards-Version: 3.9.1
 XS-Python-Version: >= 2.5
 Homepage: http://www.fenics.org/wiki/UFC
 DM-Upload-Allowed: yes

Modified: packages/fenics/ufc/trunk/debian/copyright
URL: http://svn.debian.org/wsvn/debian-science/packages/fenics/ufc/trunk/debian/copyright?rev=36868&op=diff
==============================================================================
--- packages/fenics/ufc/trunk/debian/copyright (original)
+++ packages/fenics/ufc/trunk/debian/copyright Thu Sep  2 09:36:13 2010
@@ -20,7 +20,7 @@
     The header file ufc.h and the UFC Python utils are released into 
     the public domain. 
 
-The Debian packaging is Â© 2008-2009, Johannes Ring <johannr at simula.no> and
+The Debian packaging is Â© 2008-2010, Johannes Ring <johannr at simula.no> and
 is licensed under the GPL version 2 or later, see 
 `/usr/share/common-licenses/GPL-2'.
 
@@ -46,10 +46,6 @@
 Copyright: Â© 1994 Peter Williams
 License: LGPL-2+
 
-Files: debian/cdbs/1/class/scons*.mk
-Copyright: Â© 2005 Matthew A. Nicholson <matt at matt-land.com> 
-License: GPL-2+
-
 Files: doc/manual/eps/insertion.eps
 Copyright: Â© 2004 artofcode LLC, Benicia, CA.
 License: PD

Modified: packages/fenics/ufc/trunk/debian/rules
URL: http://svn.debian.org/wsvn/debian-science/packages/fenics/ufc/trunk/debian/rules?rev=36868&op=diff
==============================================================================
--- packages/fenics/ufc/trunk/debian/rules (original)
+++ packages/fenics/ufc/trunk/debian/rules Thu Sep  2 09:36:13 2010
@@ -1,42 +1,11 @@
 #!/usr/bin/make -f
 
-include debian/cdbs/1/class/scons.mk
 include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/cmake.mk
 
 DEB_COMPRESS_EXCLUDE := .pdf
 DEB_INSTALL_DOCS_ALL += README AUTHORS TODO
-DEB_SCONS_OPTIONS = prefix=/usr
-DEB_DH_INSTALL_SOURCEDIR = debian/tmp
-DEB_SCONS_INSTALL_OPTIONS = DESTDIR=$(CURDIR)/debian/tmp
 USCAN_DESTDIR := $(CURDIR)
-SCONS = `which scons`
-PYVERSIONS = $(shell pyversions --requested debian/control)
-
-clean::
-	rm -f config.log
-	rm -f options.cache
-	rm -f src/ufc/_ufc.so
-	rm -f src/ufc/ufc.py
-	rm -f src/ufc/ufc_wrap.cc
-	rm -f src/ufc/ufc_wrap.cxx
-	rm -f src/ufc/ufc_wrap.os
-	rm -f swig_config.pyc
-	rm -f ufc-1.pc
-	-rm -rf $(addprefix build-, $(PYVERSIONS))
-	-rm -rf $(addprefix build-stamp-, $(PYVERSIONS))
-	-rm -rf $(addprefix install-stamp-, $(PYVERSIONS))
-
-common-build-arch:: $(addprefix build-stamp-, $(PYVERSIONS))
-build-stamp-%:
-	mkdir build-$*
-	cp -r `ls | grep -vE '(build-|stamp|debian)'` build-$*
-	cd build-$* && `which $*` $(SCONS) prefix=/usr
-	touch $@
-
-common-install-arch:: $(addprefix install-stamp-, $(PYVERSIONS))
-install-stamp-%:
-	cd build-$* && `which $*` $(SCONS) install DESTDIR=$(CURDIR)/debian/tmp
-	touch $@
 
 binary-install/python-ufc::
 	dh_pycentral -p$(cdbs_curpkg)

Modified: packages/fenics/ufc/trunk/debian/ufc.install
URL: http://svn.debian.org/wsvn/debian-science/packages/fenics/ufc/trunk/debian/ufc.install?rev=36868&op=diff
==============================================================================
--- packages/fenics/ufc/trunk/debian/ufc.install (original)
+++ packages/fenics/ufc/trunk/debian/ufc.install Thu Sep  2 09:36:13 2010
@@ -1,2 +1,3 @@
 usr/include/ufc.h
 usr/lib/pkgconfig/ufc-1.pc
+usr/share/ufc/ufc-config.cmake


