[python-escript] 03/04: Inactivate already applied patches + fix package build issues

Joel Fenwick jfenwick-guest at moszumanska.debian.org
Tue Apr 5 02:58:02 UTC 2016


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

jfenwick-guest pushed a commit to branch debian
in repository python-escript.

commit 5ae2cd0502a49e84707050b3a75b80bc856bd437
Author: Joel Fenwick <joelfenwick at uq.edu.au>
Date:   Mon Apr 4 16:19:28 2016 +1000

    Inactivate already applied patches + fix package build issues
---
 debian/changelog      |  2 +-
 debian/patches/series | 12 ++++++------
 debian/rules          |  5 ++++-
 3 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index b20877c..c9a4811 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,7 @@
 python-escript (4.2.0.1-1) experimental; urgency=low
   * First debian release of escript. Upstream version 4.2.0.1
   * closes: 783157
- -- Joel Fenwick <j.oelpublic at gmail.com>  Thu, 04 Apr 2016 10:49:00 +1000
+ -- Joel Fenwick <j.oelpublic at gmail.com>  Mon, 04 Apr 2016 10:49:00 +1000
 
 Old Changelog:
 python-escript (4.1-1) experimental; urgency=low
diff --git a/debian/patches/series b/debian/patches/series
index 52fb93d..5593ba5 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,6 +1,6 @@
-release-sanity
-mpi-gaol
-grammar-errors
-relocating-debian-dir
-doxygenfix
-dateless-gz
+#release-sanity
+#mpi-gaol
+#grammar-errors
+#relocating-debian-dir
+#doxygenfix
+#dateless-gz
diff --git a/debian/rules b/debian/rules
index e0d21f2..cc716d8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -32,6 +32,7 @@ endif
 
 override_dh_clean:
 	rm -rf build condif.log esys include lib release .sconf_tmp .sconsign.dblite config.log .sconf_temp
+	rm -rf scons/templates/*.pyc
 	rm -rf $(BDEST)
 	rm -rf $(B3DEST)
 	rm -rf $(BMDEST)
@@ -107,7 +108,9 @@ override_dh_auto_build:
 	# fix paths in each package and
 	# fix some external links in the doc package
 	debian/utils/tweak.sh "$(WORK)" "$(WORKM)" "$(WORK3)" "$(WORK3M)"
-
+	rm -f scons/templates/*.pyc
+	rm -f site_scons/*.pyc
+	rm -f utest.sh itest.sh
 
 override_dh_shlibdeps:
 	# so libraries we just built are checked as well

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



More information about the debian-science-commits mailing list