[slepc] 29/30: fix #751245

[Drew Parsons]

This is an automated email from the git hooks/post-receive script.

dparsons pushed a commit to branch debian
in repository slepc.

commit f52031eb818c94b0b6d496d28afdd30a66cdc128
Author: trophime-guest <trophime-guest at 7ca82aff-d165-4cda-a4f1-7f280d66a853>
Date:   Tue Jun 24 11:30:28 2014 +0000

    fix #751245
---
 debian/changelog | 13 ++++++++++++-
 debian/rules     | 43 +++++++++++++++----------------------------
 2 files changed, 27 insertions(+), 29 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 6047023..435a1b5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+slepc (3.4.2.dfsg-2.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Rebuild against gcc 4.9 (Closes: #751245).
+  * Add debian/source
+  * debian/rules:
+    - simplify clean target 
+    - remove patch target
+
+ -- Christophe Trophime <christophe.trophime at lncmi.cnrs.fr>  Tue, 24 Jun 2014 10:13:59 +0200
+
 slepc (3.4.2.dfsg-2) unstable; urgency=low
 
   [ Anton Gladky ]
@@ -19,7 +30,7 @@ slepc (3.4.2.dfsg-1) unstable; urgency=low
 
   [ Johannes Ring ]
   * Team upload.
-  * Add symlink to the configuration header (Closes: #675039).
+  * Add symlink to the configuration header (Closes: #675039
 
   [ Sylvestre Ledru ]
   * remove -dbg packages from the build dep
diff --git a/debian/rules b/debian/rules
index a2b921f..cac5d79 100755
--- a/debian/rules
+++ b/debian/rules
@@ -34,41 +34,28 @@ export CPPFLAGS=-I/usr/include/petsc
 
 clean:
 	dh_testdir
-	-if [ -e patch ]; then \
-	  debian/rules unpatch; \
-	fi
-	-mv tags thetags
-	dh_clean
-	-mv thetags tags
-	rm -f build* install* $(ARCH_GENERATED_FILES)
-	-$(MAKE) PETSC_ARCH=$(PETSC_ARCH)-c-debug PETSC_DIR=$(PETSC_DIR) \
-	  SLEPC_DIR=$(CURDIR) allclean
-	-$(MAKE) PETSC_ARCH=$(PETSC_ARCH)-c-opt PETSC_DIR=$(PETSC_DIR) \
-	  SLEPC_DIR=$(CURDIR) allclean
+	if [ -f TAGS.backup ]; then mv -f TAGS.backup TAGS; fi
+	dh_quilt_unpatch
+	dh_clean -XTAGS
+	-rm -f build* install* $(ARCH_GENERATED_FILES)
+#	-$(MAKE) PETSC_ARCH=$(PETSC_ARCH)-c-debug PETSC_DIR=$(PETSC_DIR) \
+#	  SLEPC_DIR=$(CURDIR) allclean
+#	-$(MAKE) PETSC_ARCH=$(PETSC_ARCH)-c-opt PETSC_DIR=$(PETSC_DIR) \
+#	  SLEPC_DIR=$(CURDIR) allclean
 # These probably should be removed by `make clean' but aren't
-	rm -f `find . -name \*.pyc -print`
-	rm -rf $(PETSC_ARCH)-c-debug $(PETSC_ARCH)-c-opt
-	rm -rf lib debian/extemp
+	-rm -f `find . -name \*.pyc -print`
+	-rm -rf $(PETSC_ARCH)-c-debug $(PETSC_ARCH)-c-opt
+	-rm -rf lib debian/extemp
 
-patch:
-	if [ ! -e $@ ]; then \
-	  QUILT_PATCHES=debian/patches quilt push -a || test $$? = 2; \
-	fi
-	touch $@
-
-unpatch:
-	if [ -e patch ]; then \
-	  QUILT_PATCHES=debian/patches quilt pop -a -R || test $$? = 2; \
-	  rm -rf patch .pc; \
-	fi
-
-build-indep: patch
+build-indep: 
 # We have nothing to do by default.
+	dh_quilt_patch
 	touch $@
 
 # With debugging=1, only static libraries are generated.
 # Build optimized libs second so files are consistent with optimized.
-build-arch: patch
+build-arch: 
+	dh_quilt_patch
 	PETSC_ARCH=$(PETSC_ARCH)-c-debug PETSC_DIR=$(PETSC_DIR) \
 	  SLEPC_DIR=$(CURDIR) ./configure --with-arpack-dir=/usr/lib/debug/usr/lib \
 	  --with-arpack-flags=-lparpack,-larpack

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/slepc.git