[SCM] Git repository for pkg-virtuoso branch, master, updated. debian/6.1.3+dfsg1-2.1-31-gc6d25e1

[José Manuel Santamar?==?UTF-8?Q?ía Lema]

The following commit has been merged in the master branch:
commit c6d25e123d62056ae06724de58982789914d208a
Author: José Manuel Santamaría Lema <panfaust at gmail.com>
Date:   Tue May 29 19:23:17 2012 +0200

    Fix virtuoso.ini handling.
    
    It shouldn't be marked as an obsoltete conffile after upgrading.

diff --git a/debian/virtuoso-opensource-6.1.postinst b/debian/virtuoso-opensource-6.1.postinst
index 6da79ce..d72d872 100644
--- a/debian/virtuoso-opensource-6.1.postinst
+++ b/debian/virtuoso-opensource-6.1.postinst
@@ -10,6 +10,16 @@ ${DEBIAN_SCRIPT_TRACE:+ echo "#42#DEBUG# RUNNING $0 $*" 1>&2 }
 FILE_INI="/etc/virtuoso-opensource-6.1/virtuoso.ini"
 FILE_ODBC_DSN="/usr/share/virtuoso-opensource-6.1/odbc.ini"
 
+# /etc/virtuoso-opensource-6.1/virtuoso.ini was a conffile in older
+# versions of this package
+dpkg-maintscript-helper rm_conffile \
+	$FILE_INI '6.1.5+dfsg2-1~' 'virtuoso-opensource-6.1' -- "$@"
+
+# restore the virtuoso.ini backup in order to keep user changes
+if [ -f $FILE_INI.dpkg-bak ]; then
+	mv $FILE_INI.dpkg-bak $FILE_INI
+fi
+
 # import existing defaults if we have them (to check run state)
 if [ -f /etc/default/virtuoso-opensource-6.1 ] ; then
 	. /etc/default/virtuoso-opensource-6.1
diff --git a/debian/virtuoso-opensource-6.1.postrm b/debian/virtuoso-opensource-6.1.postrm
index 4bcd610..60e4e11 100644
--- a/debian/virtuoso-opensource-6.1.postrm
+++ b/debian/virtuoso-opensource-6.1.postrm
@@ -10,6 +10,11 @@ ${DEBIAN_SCRIPT_TRACE:+ echo "#42#DEBUG# RUNNING $0 $*" 1>&2 }
 FILE_INI="/etc/virtuoso-opensource-6.1/virtuoso.ini"
 FILE_ODBC_DSN="/usr/share/virtuoso-opensource-6.1/odbc.ini"
 
+# /etc/virtuoso-opensource-6.1/virtuoso.ini was a conffile in older
+# versions of this package
+dpkg-maintscript-helper rm_conffile \
+	$FILE_INI '6.1.5+dfsg2-1~' 'virtuoso-opensource-6.1' -- "$@"
+
 if [ "$1" == "purge" ]; then
 	# log files can go without warning...
 	rm -rf /var/log/virtuoso-opensource-6.1
diff --git a/debian/virtuoso-opensource-6.1.preinst b/debian/virtuoso-opensource-6.1.preinst
new file mode 100644
index 0000000..d8b4e78
--- /dev/null
+++ b/debian/virtuoso-opensource-6.1.preinst
@@ -0,0 +1,10 @@
+#!/bin/bash
+
+FILE_INI="/etc/virtuoso-opensource-6.1/virtuoso.ini"
+
+# /etc/virtuoso-opensource-6.1/virtuoso.ini was a conffile in older
+# versions of this package
+dpkg-maintscript-helper rm_conffile \
+	$FILE_INI '6.1.5+dfsg2-1~' 'virtuoso-opensource-6.1' -- "$@"
+
+#DEBHELPER#

-- 
Git repository for pkg-virtuoso