[Pkg-octave-commit] [SCM] Debian packaging for dynare branch, squeeze-backports, updated. debian/4.3.0-2-9-g98c5791

[Sébastien Villemot]

The following commit has been merged in the squeeze-backports branch:
commit f41a487cf02fc24eeee5a130de2ff6dfed05fa67
Merge: fb59a4a71ce04f14596b82068ee00e4029868cbb 71cbb122c1e241349baea0e2ef03fc72fa3648c3
Author: Sébastien Villemot <sebastien.villemot at ens.fr>
Date:   Thu Jun 21 12:20:52 2012 +0200

    Merge branch 'master' into squeeze-backports

diff --combined debian/control
index 746d3ad,a630a49..0eec0a4
--- a/debian/control
+++ b/debian/control
@@@ -7,10 -7,10 +7,10 @@@ Uploaders: Sébastien Villemot <sebasti
  DM-Upload-Allowed: yes
  Section: math
  Priority: optional
 -Build-Depends: debhelper (>= 9), liboctave-dev, libboost-graph-dev (>= 1.36),
 - texlive, texlive-publishers, texlive-extra-utils, texlive-formats-extra,
 - texlive-generic-recommended, texi2html, latex2html, latex-beamer,
 - texlive-math-extra, libmatio-dev, libgsl0-dev
 +Build-Depends: debhelper (>= 8), octave3.2-headers (>= 3.2.2),
 + libboost-graph-dev (>= 1.36), texlive, texlive-publishers, texlive-extra-utils,
 + texlive-formats-extra, texlive-generic-recommended, texi2html, latex2html,
-  latex-beamer, texlive-math-extra
++ latex-beamer, texlive-math-extra, libmatio-dev, libgsl0-dev
  Standards-Version: 3.9.3
  Homepage: http://www.dynare.org/
  Vcs-Git: git://git.debian.org/git/pkg-octave/dynare.git
@@@ -18,9 -18,10 +18,10 @@@ Vcs-Browser: http://git.debian.org/?p=p
  
  Package: dynare
  Architecture: any
 -Depends: octave, dynare-common, ${shlibs:Depends}, ${misc:Depends}
 +Depends: octave3.2 (>= 3.2.2), dynare-common, ${shlibs:Depends}, ${misc:Depends}
  Suggests: dynare-doc, dynare-matlab
- Recommends: octave3.2-headers (>= 3.2.2), octave-optim, octave-io
 -Recommends: liboctave-dev, octave-optim, octave-io, octave-statistics,
++Recommends: octave3.2-headers (>= 3.2.2), octave-optim, octave-io, octave-statistics,
+  octave-control
  Description: platform for handling a wide class of economic models
   Dynare is a software platform for handling a wide class of economic models, in
   particular dynamic stochastic general equilibrium (DSGE) and overlapping
diff --combined debian/rules
index 3fccdc1,382a88f..e79dc92
--- a/debian/rules
+++ b/debian/rules
@@@ -2,10 -2,6 +2,10 @@@
  
  include /usr/share/octave/debian/defs.make
  
 +# Reminder: remove the next two lines when debhelper compat level will be upgraded to 9
 +DPKG_EXPORT_BUILDFLAGS = 1
 +-include /usr/share/dpkg/buildflags.mk
 +
  %:
  	dh $@ --parallel
  
@@@ -18,6 -14,16 +18,16 @@@ override_dh_auto_test
  override_dh_link:
  	dh_link --package=dynare-common /usr/share/dynare/matlab/dynare.m $(MDIR)/dynare.m
  
+ # Don't ship MacOS directory included in upstream tarball
+ override_dh_install-indep:
+ 	dh_install -i
+ 	rm -r debian/dynare-matlab/usr/src/matlab/dynare-matlab/contrib/ms-sbvar/switch_dw/state_space/.DS_Store
+ 
+ # Fix wrong permissions in upstream tarball
+ override_dh_fixperms-indep:
+ 	dh_fixperms -i
+ 	find debian/dynare-matlab/usr/src/matlab/dynare-matlab/contrib/ms-sbvar -type f -exec chmod -x '{}' ';'
+ 
  get-orig-source:
  	uscan --force-download --rename --destdir .
  .PHONY: get-orig-source

-- 
Debian packaging for dynare