r44074 - in /packages/fftw/trunk/debian: ./ changelog control fftw-dev.install patches/00list patches/series rules sfftw-dev.install

sylvestre at users.alioth.debian.org sylvestre at users.alioth.debian.org
Tue Nov 29 09:15:50 UTC 2011 

Author: sylvestre
Date: Tue Nov 29 09:15:49 2011
New Revision: 44074

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=44074
Log:
  * Team upload.
  * New upstream release
  * Package moved into the Debian Science team (no answer from the previous
    maintainer) and package not maintained.
  * Standards-Version updated to version 3.9.2
  * Vcs-Browser & Vcs-Svn updated
  * Switch to mpi-default-dev (Closes: #571446)
  * Get ride of .la files (Closes: #633175)
  * Fix lintian warning debhelper-but-no-misc-depends
  * Fix lintian warning patch-system-but-direct-changes-in-diff 
  * Switch to dpkg-source 3.0 (quilt) format
 

Added:
    packages/fftw/trunk/debian/patches/series
Removed:
    packages/fftw/trunk/debian/patches/00list
Modified:
    packages/fftw/trunk/debian/   (props changed)
    packages/fftw/trunk/debian/changelog
    packages/fftw/trunk/debian/control
    packages/fftw/trunk/debian/fftw-dev.install
    packages/fftw/trunk/debian/rules
    packages/fftw/trunk/debian/sfftw-dev.install

Propchange: packages/fftw/trunk/debian/
------------------------------------------------------------------------------
    MergeWithUpstream = 1

Modified: packages/fftw/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-science/packages/fftw/trunk/debian/changelog?rev=44074&op=diff
==============================================================================
--- packages/fftw/trunk/debian/changelog (original)
+++ packages/fftw/trunk/debian/changelog Tue Nov 29 09:15:49 2011
@@ -1,3 +1,19 @@
+fftw (2.1.5-1) unstable; urgency=low
+
+  * Team upload.
+  * New upstream release
+  * Package moved into the Debian Science team (no answer from the previous
+    maintainer) and package not maintained.
+  * Standards-Version updated to version 3.9.2
+  * Vcs-Browser & Vcs-Svn updated
+  * Switch to mpi-default-dev (Closes: #571446)
+  * Get ride of .la files (Closes: #633175)
+  * Fix lintian warning debhelper-but-no-misc-depends
+  * Fix lintian warning patch-system-but-direct-changes-in-diff 
+  * Switch to dpkg-source 3.0 (quilt) format
+
+ -- Sylvestre Ledru <sylvestre at debian.org>  Tue, 29 Nov 2011 01:48:33 +0100
+
 fftw (2.1.3-22) unstable; urgency=low
 
   * Add missed patches from 2.1.3-20.1 to dpatch (closes: #480908)

Modified: packages/fftw/trunk/debian/control
URL: http://svn.debian.org/wsvn/debian-science/packages/fftw/trunk/debian/control?rev=44074&op=diff
==============================================================================
--- packages/fftw/trunk/debian/control (original)
+++ packages/fftw/trunk/debian/control Tue Nov 29 09:15:49 2011
@@ -1,16 +1,20 @@
 Source: fftw
 Section: oldlibs
 Priority: extra
-Maintainer: Paul Brossier <piem at debian.org>
-Build-Depends: debhelper (>= 4.0.0), autotools-dev, autoconf, automake, dpatch, libtool, libmpich1.0-dev, gfortran
-Build-Conflicts: autoconf2.13, automake1.4          
-Standards-Version: 3.7.3
+Maintainer: Debian Science Team <debian-science-maintainers at lists.alioth.debian.org>
+Uploaders: Paul Brossier <piem at debian.org>
+Build-Depends: debhelper (>= 4.0.0), autotools-dev, autoconf, automake, libtool,
+ mpi-default-dev, gfortran
+Standards-Version: 3.9.2
+Vcs-Svn: svn://svn.debian.org/svn/debian-science/packages/fftw/
+Vcs-Browser: http://svn.debian.org/viewsvn/debian-science/packages/fftw/
+Homepage: http://fftw.org
 
 Package: fftw2
 Architecture: any
 Section: oldlibs
-Depends: ${shlibs:Depends}
-Suggests: fftw-dev, mpich-bin
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Suggests: fftw-dev, mpi-defaults-bin
 Provides: fftw2-double
 Conflicts: fftw2-double
 Description: library for computing Fast Fourier Transforms
@@ -25,7 +29,7 @@
 Package: fftw-dev
 Architecture: any
 Section: oldlibs
-Depends: fftw2 (= ${binary:Version}), ${shlibs:Depends}
+Depends: fftw2 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
 Provides: fftw-double-dev
 Conflicts: fftw1-dev, fftw-double-dev
 Description: library for computing Fast Fourier Transforms
@@ -35,8 +39,8 @@
 Package: sfftw2
 Architecture: any
 Section: oldlibs
-Depends: ${shlibs:Depends}
-Suggests: sfftw-dev, mpich-bin
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Suggests: sfftw-dev, mpi-defaults-bin
 Provides: fftw2-single
 Conflicts: fftw2-single, fftw2 (<= 2.1.3-10)
 Description: library for computing Fast Fourier Transforms
@@ -51,7 +55,7 @@
 Package: sfftw-dev
 Architecture: any
 Section: oldlibs
-Depends: sfftw2 (= ${binary:Version}), ${shlibs:Depends}
+Depends: sfftw2 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
 Provides: fftw-single-dev
 Conflicts: fftw1-dev, fftw-dev (<< 2.1.3-8), fftw-single-dev
 Description: library for computing Fast Fourier Transforms
@@ -61,7 +65,7 @@
 Package: fftw-docs
 Architecture: all
 Section: doc
-Depends: ${shlibs:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}
 Suggests: fftw2
 Conflicts: fftw-dev (<< 2.1.3-15), k6fftwgel (<< 1.1-8), k7fftwgel (<< 1.2-6), p4fftwgel-dev (<< 1.2-5)
 Description: documentation for fftw

Modified: packages/fftw/trunk/debian/fftw-dev.install
URL: http://svn.debian.org/wsvn/debian-science/packages/fftw/trunk/debian/fftw-dev.install?rev=44074&op=diff
==============================================================================
--- packages/fftw/trunk/debian/fftw-dev.install (original)
+++ packages/fftw/trunk/debian/fftw-dev.install Tue Nov 29 09:15:49 2011
@@ -1,4 +1,3 @@
 usr/include/*
 usr/lib/lib*.a
 usr/lib/lib*.so
-usr/lib/*.la

Added: packages/fftw/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/debian-science/packages/fftw/trunk/debian/patches/series?rev=44074&op=file
==============================================================================
--- packages/fftw/trunk/debian/patches/series (added)
+++ packages/fftw/trunk/debian/patches/series Tue Nov 29 09:15:49 2011
@@ -1,0 +1,4 @@
+02_fix_tests.dpatch
+#03_fix_doc.dpatch
+#04_configure.dpatch
+05_ac_define_syntax.diff

Modified: packages/fftw/trunk/debian/rules
URL: http://svn.debian.org/wsvn/debian-science/packages/fftw/trunk/debian/rules?rev=44074&op=diff
==============================================================================
--- packages/fftw/trunk/debian/rules (original)
+++ packages/fftw/trunk/debian/rules Tue Nov 29 09:15:49 2011
@@ -1,6 +1,4 @@
 #!/usr/bin/make -f
-
-include /usr/share/dpatch/dpatch.make
 
 ARCHITECTURE := $(shell dpkg-architecture -qDEB_HOST_ARCH)
 DEB_HOST_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
@@ -14,7 +12,7 @@
 	CFLAGS += -O2
 endif
 
-CONFFLAGS := --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info --enable-shared --enable-mpi --enable-threads 
+CONFFLAGS := --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info --enable-shared --enable-mpi --enable-threads
 
 ifeq ($(ARCHITECTURE), i386)
   ARCHCONFFLAGS := --enable-i386-hacks
@@ -22,15 +20,15 @@
 
 build: build-arch build-indep
 
-autoreconf-stamp: patch-stamp 
-	autoreconf -f -i
+autoreconf-stamp: 
+	autoreconf -f -i -I.
 	touch autoreconf-stamp
 
 build-arch: build-arch-stamp
 build-arch-stamp: autoreconf-stamp 
 	dh_testdir
 	# single precision
-	F77=gfortran CFLAGS="$(CFLAGS)" ./configure $(CONFFLAGS) --enable-float --enable-type-prefix $(ARCHCONFFLAGS)
+	F77=gfortran CFLAGS="$(CFLAGS)" CC=mpicc ./configure $(CONFFLAGS) --enable-float --enable-type-prefix $(ARCHCONFFLAGS)
 	$(MAKE)
 	#$(MAKE) -C tests check
 	./tests/fftw_test  -t -e -v -p 1024 -x 1
@@ -38,7 +36,7 @@
 	$(MAKE) install DESTDIR=$(CURDIR)/debian/tmp-single
 	$(MAKE) clean
 	# double precision
-	F77=gfortran CFLAGS="$(CFLAGS)" ./configure $(CONFFLAGS) $(ARCHCONFFLAGS)
+	F77=gfortran CFLAGS="$(CFLAGS)" CC=mpicc ./configure $(CONFFLAGS) $(ARCHCONFFLAGS)
 	$(MAKE)
 	#$(MAKE) -C tests check
 	./tests/fftw_test  -t -e -v -p 1024 -x 1
@@ -55,7 +53,7 @@
 	$(MAKE) -C FAQ 
 	touch build-indep-stamp
 
-clean: clean1st unpatch
+clean: clean1st 
 clean1st:
 	dh_testdir
 	dh_testroot
@@ -64,12 +62,6 @@
 	[ ! -f Makefile ] || $(MAKE) distclean
 	[ ! -f Makefile ] || $(MAKE) -C doc clean-local
 	[ ! -f Makefile ] || $(MAKE) -C FAQ clean 
-ifneq "$(wildcard /usr/share/misc/config.sub)" ""
-	cp -f /usr/share/misc/config.sub config.sub
-endif
-ifneq "$(wildcard /usr/share/misc/config.guess)" ""
-	cp -f /usr/share/misc/config.guess config.guess
-endif
 	rm -rf $(CURDIR)/debian/tmp-*
 	dh_clean 
 
@@ -136,4 +128,4 @@
 	$(MAKE) -f debian/rules DH_OPTIONS=-a binary-common
 
 binary: binary-arch binary-indep
-.PHONY: build clean binary-indep binary-arch binary install install-indep install-arch patch unpatch clean1st autoreconf-stamp
+.PHONY: build clean binary-indep binary-arch binary install install-indep install-arch clean1st autoreconf-stamp

Modified: packages/fftw/trunk/debian/sfftw-dev.install
URL: http://svn.debian.org/wsvn/debian-science/packages/fftw/trunk/debian/sfftw-dev.install?rev=44074&op=diff
==============================================================================
--- packages/fftw/trunk/debian/sfftw-dev.install (original)
+++ packages/fftw/trunk/debian/sfftw-dev.install Tue Nov 29 09:15:49 2011
@@ -1,4 +1,3 @@
 usr/include/*
 usr/lib/lib*.a
 usr/lib/lib*.so
-usr/lib/*.la

More information about the debian-science-commits mailing list