[Pkg-octave-commit] [SCM] dynare branch, master, updated. 9e78a4e4310f594204d70475951a1389ed827bb7

Fri Feb 26 17:03:12 UTC 2010

The following commit has been merged in the master branch:
commit 9e78a4e4310f594204d70475951a1389ed827bb7
Author: Sébastien Villemot <sebastien.villemot at ens.fr>
Date:   Fri Feb 26 17:56:26 2010 +0100

    Rewrite debian/rules using debhelper override rules, no longer run the testsuite, removed unnecessary patches

diff --git a/debian/changelog b/debian/changelog
index 694a94e..7e660b7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,20 @@
 dynare (4.1.0-2) UNRELEASED; urgency=low
 
   * debian/control:
-    Update Standards-Version to 3.8.4, no additional changes needed.
+    + Update Standards-Version to 3.8.4, no additional changes needed.
+    + Bump dependency on debhelper (>=7.0.50), because using override rules
+      in debian/rules.
   * debian/watch:
     Update for new upstream website.
-
- -- Sébastien Villemot <sebastien.villemot at ens.fr>  Fri, 26 Feb 2010 17:23:03 +0100
+  * debian/rules:
+    + Complete rewrite using override rules from debhelper.
+    + No longer run the testsuite (too long, creates problems on some archs).
+    + Use uscan in get-orig-source rule.
+  * debian/patches/testsuite-fs2000,
+    debian/patches/testsuite-blas-singularity:
+    Removed patches, no longer necessary since we don't run the testsuite.
+
+ -- Sébastien Villemot <sebastien.villemot at ens.fr>  Fri, 26 Feb 2010 17:52:53 +0100
 
 dynare (4.1.0-1) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 951598f..7e6c1ae 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,7 @@ Uploaders: Sébastien Villemot <sebastien.villemot at ens.fr>,
 DM-Upload-Allowed: yes
 Section: math
 Priority: optional
-Build-Depends: debhelper (>= 7), octave3.2-headers (>= 3.2.2),
+Build-Depends: debhelper (>= 7.0.50), octave3.2-headers (>= 3.2.2),
  libboost-graph-dev, texlive, texlive-publishers, texlive-extra-utils,
  texlive-formats-extra, xsltproc, dblatex (>=0.2.12-3), latex-beamer, docbook-xsl,
  quilt, po-debconf, gnuplot-nox
diff --git a/debian/patches/series b/debian/patches/series
index 0eb39d2..6a730d0 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,3 @@
-testsuite-blas-singularity
-testsuite-fs2000
 build-matlab
-extra-addpath  # This patch needs to be on top of stack
-fhs-compliance # This patch needs to be on top of stack
+extra-addpath
+fhs-compliance
diff --git a/debian/patches/testsuite-blas-singularity b/debian/patches/testsuite-blas-singularity
deleted file mode 100644
index d12554b..0000000
--- a/debian/patches/testsuite-blas-singularity
+++ /dev/null
@@ -1,15 +0,0 @@
-Change a test file in order to avoid hitting a singularity when using BLAS from
-Netlib. Under Atlas, this problem does not pop up.
---- a/tests/bvar_a_la_sims/bvar_and_dsge.mod
-+++ b/tests/bvar_a_la_sims/bvar_and_dsge.mod
-@@ -23,8 +23,8 @@
- check;
- 
- estimation(datafile = bvar_sample, mh_replic = 1200, mh_jscale = 1.3,
--           first_obs = 9);
-+           first_obs = 20);
- 
--bvar_density 8;
-+bvar_density(bvar_prior_train = 10) 8;
- 
- bvar_forecast(forecast = 10, bvar_replic = 2000, nobs = 200) 8;
diff --git a/debian/patches/testsuite-fs2000 b/debian/patches/testsuite-fs2000
deleted file mode 100644
index 5a123d3..0000000
--- a/debian/patches/testsuite-fs2000
+++ /dev/null
@@ -1,13 +0,0 @@
-Diminishes the number of Metropolis-Hastings chains in fs2000.mod from 5 to 2.
-This saves computation time when exercising the testsuite. And computing more
-chains does not make the test more stringent.
---- a/tests/fs2000/fs2000.mod
-+++ b/tests/fs2000/fs2000.mod
-@@ -86,4 +86,4 @@
- 
- varobs gp_obs gy_obs;
- 
--estimation(datafile=fsdat,nobs=192,loglinear,mh_replic=2000,mh_nblocks=5,mh_jscale=0.8);
-\ No newline at end of file
-+estimation(datafile=fsdat,nobs=192,loglinear,mh_replic=2000,mh_nblocks=2,mh_jscale=0.8);
-\ No newline at end of file
diff --git a/debian/rules b/debian/rules
index 2853b09..4fc3bf2 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,36 +1,19 @@
 #!/usr/bin/make -f
 
-include /usr/share/quilt/quilt.make
 include /usr/share/octave/debian/defs.make
 
-build: patch build-stamp
-build-stamp:
-	dh_testdir
-	dh_auto_configure
-	dh_auto_build -- all pdf html
-	QUILT_PATCHES=$(QUILT_PATCH_DIR) quilt --quiltrc /dev/null pop -R 2
-	dh_auto_test
-	QUILT_PATCHES=$(QUILT_PATCH_DIR) quilt --quiltrc /dev/null push 2
-	touch build-stamp
+%:
+	dh $@
 
-clean: unpatch
-	dh clean
-	rm -f tests/example2_simul # File forgotten in the build system of version 4.1.0
+override_dh_auto_build:
+	dh_auto_build -- all pdf html
 
-binary-arch: build
-	dh binary-arch
+# Don't run the testsuite
+override_dh_auto_test:
 
-binary-indep: build
-	dh binary-indep --before dh_link
+override_dh_link:
 	dh_link --package=dynare-common /usr/share/dynare/matlab/dynare.m $(MDIR)/dynare.m
-	dh binary-indep --after dh_link
-
-binary: binary-arch binary-indep
-
-VERSION = $(shell dpkg-parsechangelog \
-                  | sed -ne 's/^Version: \([0-9.]\+\).*/\1/p')
 
 get-orig-source:
-	wget -O dynare_$(VERSION).orig.tar.gz http://www.dynare.org/download/dynare-4.1/source/dynare-$(VERSION).tar.gz/at_download/file
-
-.PHONY: build clean binary-arch binary-indep binary get-orig-source
+	uscan --force-download --rename --destdir .
+.PHONY: get-orig-source

-- 
dynare

