[Pkg-lyx-devel] [SCM] LyX packaging branch, master, updated. upstream/2.0.0_beta3-486-g3d5b534

[Sven Hoexter]

The following commit has been merged in the master branch:
commit fdf36bbde1183b6b985a507b92d72aea58569089
Author: Sven Hoexter <sven at timegate.de>
Date:   Wed Feb 2 20:21:34 2011 +0100

    Drop our own bash_completion file and instead install the one provided by upstream in the correct location.

diff --git a/debian/bash_completion b/debian/bash_completion
deleted file mode 100644
index 35981ac..0000000
--- a/debian/bash_completion
+++ /dev/null
@@ -1,22 +0,0 @@
-# lyx(1) completion 
-# Modified inkscape template of allali at univ-mlv.fr
-# by cengique at users.sf.net
-
-have lyx &&
-_lyx()
-{
-        local cur
-
-        COMPREPLY=()
-        cur=${COMP_WORDS[COMP_CWORD]}
-
-        if [[ "$cur" == -* ]]; then
-                COMPREPLY=( $( compgen -W '-help -userdir -sysdir \
-				-geometry -dbg -x --execute -e --export \
- 				-i --import -version' -- $cur ) ) 
-        else
-                _filedir '@(lyx)'
-        fi
-
-}
-[ "${have:-}" ] && complete -F _lyx $filenames lyx
diff --git a/debian/changelog b/debian/changelog
index 5e8172a..6a3e5fa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,8 @@ lyx (2.0.0~beta3-1) UNRELEASED; urgency=low
   * Update to Standards-Version: 3.9.1 - no changes required.
   * Recommend evince-gtk instead of evince. (Closes: #597623)
   * Move 'librsvg2-bin | inkscape' down from recommends to suggests.
+  * Drop our own bash_completion file and instead install the one
+    provided by upstream in the correct location.
 
  -- Sven Hoexter <hoexter at debian.org>  Wed, 02 Feb 2011 17:35:52 +0100
 
diff --git a/debian/rules b/debian/rules
index c4d1e76..110701a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -71,9 +71,10 @@ override_dh_auto_install:
 	mv debian/lyx-common/usr/share/lyx/tex \
 		debian/lyx-common/usr/share/texmf/tex/latex/lyx
 
-# install bash completion
+# install bash completion in the correct location
 	mkdir -p debian/lyx-common/etc/bash_completion.d
-	cp debian/bash_completion debian/lyx-common/etc/bash_completion.d/lyx
+	mv debian/lyx-common/usr/share/lyx/scripts/bash_completion \
+		debian/lyx-common/etc/bash_completion.d/lyx
 
 override_dh_installdocs:
 	mkdir -p debian/lyx/usr/share/doc

-- 
LyX packaging