[Pkg-lyx-devel] [SCM] LyX packaging branch, master, updated. debian/2.0.1-1-21-g69054ee

[Per Olofsson]

The following commit has been merged in the master branch:
commit 69054eef90d8c89053e739f07513273d1e33ebe1
Author: Per Olofsson <pelle at dsv.su.se>
Date:   Sun Mar 4 16:43:38 2012 +0100

    Make a symlink from /usr/share/bash-completion/completions/lyx to the installed completion file and remove /etc/bash_completion.d/lyx.

diff --git a/debian/changelog b/debian/changelog
index a368e6b..aac60a6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,8 @@ lyx (2.0.3-1) UNRELEASED; urgency=low
   * Make /usr/share/lyx/scripts/listerrors executable.
   * Rename ttf-lyx to fonts-lyx.
   * Bump Standards-Version to 3.9.3. No changes.
+  * Make a symlink from /usr/share/bash-completion/completions/lyx to
+    the installed completion file and remove /etc/bash_completion.d/lyx.
 
  -- Per Olofsson <pelle at debian.org>  Tue, 14 Feb 2012 17:18:00 +0100
 
diff --git a/debian/lyx-common.links b/debian/lyx-common.links
index 134c6ab..07acb72 100644
--- a/debian/lyx-common.links
+++ b/debian/lyx-common.links
@@ -1,2 +1,3 @@
 usr/share/lyx/images/lyx.png usr/share/icons/hicolor/48x48/apps/lyx.png
 usr/share/mythes usr/share/lyx/thes
+usr/share/lyx/scripts/bash_completion usr/share/bash-completion/completions/lyx
diff --git a/debian/lyx-common.maintscript b/debian/lyx-common.maintscript
new file mode 100644
index 0000000..e8934fd
--- /dev/null
+++ b/debian/lyx-common.maintscript
@@ -0,0 +1 @@
+rm_conffile /etc/bash_completion.d/lyx 2.0.2-1
diff --git a/debian/rules b/debian/rules
index 34dba6e..3e89470 100755
--- a/debian/rules
+++ b/debian/rules
@@ -40,11 +40,6 @@ override_dh_auto_install:
 	mv debian/lyx-common/usr/share/lyx/tex \
 		debian/lyx-common/usr/share/texmf/tex/latex/lyx
 
-# install bash completion in the correct location
-	mkdir -p debian/lyx-common/etc/bash_completion.d
-	mv debian/lyx-common/usr/share/lyx/scripts/bash_completion \
-		debian/lyx-common/etc/bash_completion.d/lyx
-
 # make script executable
 	chmod 755 debian/lyx-common/usr/share/lyx/scripts/listerrors
 

-- 
LyX packaging