tags 643488 + patch thanks Dear maintainer,
I've prepared an NMU for petsc (versioned as 3.1.dfsg-11.1), uploaded to DELAYED/0 as per DevRef ยง5.11.1. The diff is attached to this message. Regards, OdyX
diff -Nru petsc-3.1.dfsg/debian/changelog petsc-3.1.dfsg/debian/changelog --- petsc-3.1.dfsg/debian/changelog 2011-04-08 03:20:50.000000000 +0200 +++ petsc-3.1.dfsg/debian/changelog 2011-11-15 17:55:27.000000000 +0100 @@ -1,3 +1,13 @@ +petsc (3.1.dfsg-11.1) unstable; urgency=low + + * Non-maintainer upload. + * Don't mix source format 3.0 (quilt) and manual usage of quilt: + - Drop manual quilt calls from debian/rules; + - Drop superfluous quilt Build-Depends. + Closes: #643488 + + -- Didier Raboud <o...@debian.org> Tue, 15 Nov 2011 17:20:34 +0100 + petsc (3.1.dfsg-11) unstable; urgency=low [ Adam C. Powell, IV ] diff -Nru petsc-3.1.dfsg/debian/control petsc-3.1.dfsg/debian/control --- petsc-3.1.dfsg/debian/control 2011-04-08 03:18:58.000000000 +0200 +++ petsc-3.1.dfsg/debian/control 2011-11-15 17:16:55.000000000 +0100 @@ -5,7 +5,7 @@ Uploaders: "Adam C. Powell, IV" <hazel...@debian.org> DM-Upload-Allowed: yes Standards-Version: 3.9.2 -Build-Depends: debhelper (>= 5.0), quilt, python (>= 2.2), gfortran, automake, +Build-Depends: debhelper (>= 5.0), python (>= 2.2), gfortran, automake, libx11-dev, mpi-default-dev, mpi-default-bin, libblas-dev | libblas-3gf.so, liblapack-dev | liblapack-3gf.so, libsuitesparse-dev (>= 3.1.0-2), diff -Nru petsc-3.1.dfsg/debian/rules petsc-3.1.dfsg/debian/rules --- petsc-3.1.dfsg/debian/rules 2011-04-08 03:20:48.000000000 +0200 +++ petsc-3.1.dfsg/debian/rules 2011-11-15 17:16:47.000000000 +0100 @@ -59,7 +59,7 @@ # These are needed for -lam, -dec and -contrib builds -rm -rf debian/lib$(PETSC_NAME) debian/lib$(PETSC_NAME)-dev \ debian/lib$(PETSC_NAME)-dbg - -rm -f patch build* install* debian/*.substvars debian/extemp $(ARCH_GENERATED_FILES) + -rm -f build* install* debian/*.substvars debian/extemp $(ARCH_GENERATED_FILES) # This is commented because it really doesn't do anything useful for us # (removes example executables, so what?) # make PETSC_ARCH=$(PETSC_ARCH) PETSC_DIR=$(CURDIR) clean @@ -69,28 +69,17 @@ -rm -f `find . -name \*.o -print` `find . -name \*.pyc -print` -rm -rf lib $(PETSC_ARCH)-c-debug $(PETSC_ARCH)-c-opt configure.log - if [ -d .pc ]; then \ - QUILT_PATCHES=debian/patches quilt pop -a -R || test $$? = 2; \ - rm -rf .pc; \ - fi - -patch: - if [ ! -d .pc ]; then \ - QUILT_PATCHES=debian/patches quilt push -a; \ - fi - touch $@ - # PETSc uses the "doctext" program to convert html docs to man pages, which # apparently is open-source and available from # http://www.mcs.anl.gov/~gropp/sowing . When it is Debianized, I'll use it. -build-indep: patch +build-indep: # $(MAKE) -C docs PETSC_ARCH=$(PETSC_ARCH) \ # PETSC_DIR=$(CURDIR)/lib$(PETSC_NAME) manualpages touch $@ # With debugging=1, only static libraries are generated. # Build optimized libs second so files are consistent with optimized. -build-arch: patch +build-arch: echo Using MPI implementation $(PETSC_MPI) in directory $(PETSC_MPI_DIR) cp -fp /usr/share/automake-1.11/config.* config/configarch/ cp -fp /usr/share/automake-1.11/config.* config/BuildSystem/config/packages/