[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 3bff051b364a9a3f2b2688f1fa27478b688614a5
Author: José Manuel Santamaría Lema <panfaust at gmail.com>
Date:   Tue May 29 15:38:22 2012 +0200

    /etc/virtuoso-opensource-6.1/virtuoso.ini isn't a conffile anymore.

diff --git a/debian/changelog b/debian/changelog
index 7f4058d..e783216 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -19,6 +19,8 @@ virtuoso-opensource (6.1.5+dfsg2-0r0) UNRELEASED; urgency=low
     this makes the script work when you are running it under Plasma (the KDE
     workspace) with Nepomuk, which may already execute a /usr/bin/virtuoso-t
     process making start-stop-daemon fail.
+  * /etc/virtuoso-opensource-6.1/virtuoso.ini isn't a conffile anymore, it's
+    just handled by maintainer scripts (Closes: #656087).
   * Add new packages:
     - virtuoso-vad-dbpedia
     - virtuoso-vad-facetedbrowser
diff --git a/debian/rules b/debian/rules
index a1f9190..26edaa4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -19,9 +19,8 @@ ifeq ($(DEB_BUILD_ARCH),alpha)
 		EXTRA_LDFLAGS += -Wl,--no-relax
 endif
 
-DEB_LDFLAGS_MAINT_APPEND="-Wl,-z,defs -Wl,--no-undefined -Wl,--as-needed $(EXTRA_LDFLAGS)"
-
 DEB_CONFIGURE_SCRIPT_ENV += \
+		LDFLAGS="-Wl,-z,defs -Wl,--no-undefined -Wl,--as-needed $(EXTRA_LDFLAGS)" \
 		MONO_DISABLE_SHM=1 \
         DEBIANPKG=virtuoso-opensource-6.1
 
diff --git a/debian/virtuoso-opensource-6.1.install b/debian/virtuoso-opensource-6.1.install
index ddd833c..8345ced 100644
--- a/debian/virtuoso-opensource-6.1.install
+++ b/debian/virtuoso-opensource-6.1.install
@@ -1,3 +1,3 @@
 usr/lib/virtuoso-opensource-6.1/hosting/*.so
-var/lib/virtuoso-opensource-6.1/db/virtuoso.ini etc/virtuoso-opensource-6.1/
+var/lib/virtuoso-opensource-6.1/db/virtuoso.ini usr/share/virtuoso-opensource-6.1/
 ../odbc.ini usr/share/virtuoso-opensource-6.1/
diff --git a/debian/virtuoso-opensource-6.1.postinst b/debian/virtuoso-opensource-6.1.postinst
index 4d3e559..aac8e00 100644
--- a/debian/virtuoso-opensource-6.1.postinst
+++ b/debian/virtuoso-opensource-6.1.postinst
@@ -15,6 +15,11 @@ if [ -f /etc/default/virtuoso-opensource-6.1 ] ; then
 	. /etc/default/virtuoso-opensource-6.1
 fi
 
+# create ini file if it doesn't exit
+if [ ! -f $FILE_INI]; then
+	cp /usr/share/virtuoso-opensource-6.1/virtuoso.ini $FILE_INI
+fi
+
 # are we changing the web server port?
 db_get virtuoso-opensource-6.1/db-server-port && DB_PORT="$RET"
 if DB_PORT=$(printf "%d" $DB_PORT 2> /dev/null); then

-- 
Git repository for pkg-virtuoso