[Pkg-octave-commit] [SCM] Debian packaging for octave branch, master, updated. debian/3.4.3-4-13-g443dd48

[Sébastien Villemot]

The following commit has been merged in the master branch:
commit 1efcb6ed3428308f5f4f43d8244f250b36f9316f
Author: Sébastien Villemot <sebastien.villemot at ens.fr>
Date:   Wed Feb 29 11:29:58 2012 +0100

    debian/octave-common.links: no longer hardcode upstream version number

diff --git a/debian/control b/debian/control
index 5092f87..d20681e 100644
--- a/debian/control
+++ b/debian/control
@@ -13,7 +13,8 @@ Build-Depends: gfortran, debhelper (>= 9), automake, dh-autoreconf, texinfo,
  libsuitesparse-dev (>= 1:3.2.0), gawk, ghostscript, libcurl4-gnutls-dev | libcurl4-dev,
  libqhull-dev, desktop-file-utils, libfltk1.1-dev, libgl2ps-dev,
  libgraphicsmagick++1-dev, libftgl-dev, libfontconfig1-dev,
- libqrupdate-dev, libarpack2-dev (>= 2.1+parpack96.dfsg-2), dh-exec
+ libqrupdate-dev, libarpack2-dev (>= 2.1+parpack96.dfsg-2), dh-exec,
+ dpkg-dev (>= 1.16.1)
 Standards-Version: 3.8.4
 Homepage: http://www.octave.org/
 Vcs-Git: git://git.debian.org/git/pkg-octave/octave.git
diff --git a/debian/octave-common.links b/debian/octave-common.links
old mode 100644
new mode 100755
index b9aa1ad..069fae4
--- a/debian/octave-common.links
+++ b/debian/octave-common.links
@@ -1,3 +1,4 @@
+#!/usr/bin/dh-exec
 # Delete the original octaverc file from the installation and replace it with a
 # symlink to /etc/octave.conf
-/etc/octave.conf /usr/share/octave/3.6.1/m/startup/octaverc
+/etc/octave.conf /usr/share/octave/${DEB_VERSION_UPSTREAM}/m/startup/octaverc
diff --git a/debian/rules b/debian/rules
index 5247434..a3a5b69 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,6 +7,10 @@ export DH_VERBOSE=1
 # This has to be exported to make some magic below work.
 export DH_OPTIONS
 
+# Needed by octave-common.links
+include /usr/share/dpkg/pkg-info.mk
+export DEB_VERSION_UPSTREAM
+
 %:
 	dh $@ --with autoreconf --parallel
 

-- 
Debian packaging for octave