[Pkg-octave-commit] [SCM] Debian packaging for octave branch, master, updated. 3.2.2-2-102-g2b393c2

[Thomas Weber]

The following commit has been merged in the master branch:
commit 95aed71c6f8c9e59017fbdf143e46fffb1dcb60c
Author: Thomas Weber <tweber at debian.org>
Date:   Sat Dec 3 17:10:28 2011 +0100

    Smuggle a debian.conf file into the octave source tree
    
    The conffile is linked to by the octaverc file in Octave's tree.
    
    Git-Dch: Ignore

diff --git a/debian/octave-common.install b/debian/octave-common.install
index 773725f..e02e3bc 100644
--- a/debian/octave-common.install
+++ b/debian/octave-common.install
@@ -1 +1,4 @@
 usr/share/octave /usr/share/
+
+# install the configuration file we copied into the built tmp tree
+/etc/octave.conf /etc
diff --git a/debian/octave-common.links b/debian/octave-common.links
new file mode 100644
index 0000000..3c4adb9
--- /dev/null
+++ b/debian/octave-common.links
@@ -0,0 +1,3 @@
+# 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.4.3/m/startup/octaverc
diff --git a/debian/rules b/debian/rules
index c088c64..2486b01 100755
--- a/debian/rules
+++ b/debian/rules
@@ -25,6 +25,8 @@ override_dh_compress:
 # override this call, so we do not pass the --parallel option to it; 
 # "make -j2 install" does not work as of now
 override_dh_auto_install:
+	# Smuggle our configuration file into the installed files
+	mkdir -p debian/tmp/etc && cp debian/octave.conf debian/tmp/etc/
 	dh_auto_install --max-parallel=1
 
 # save debug information into the debug package and strip the executable bit

-- 
Debian packaging for octave