[SCM] inkscape/master: use dh_bash-completion to handle the bash completion.

mapreri-guest at users.alioth.debian.org mapreri-guest at users.alioth.debian.org
Sun Sep 13 10:35:18 UTC 2015


The following commit has been merged in the master branch:
commit 94ddfae2d10e3a8b0aa263bf05e016b87877e27b
Author: Mattia Rizzolo <mattia at mapreri.org>
Date:   Sun Sep 13 07:45:26 2015 +0000

    use dh_bash-completion to handle the bash completion.
    
    This also fixes the package-installs-into-obsolete-dir lintian warning when
    using bash-completion >= 1:2.1-4.2 (but no need to force this version in
    d/control)

diff --git a/debian/control b/debian/control
index a63c1e9..0e77294 100644
--- a/debian/control
+++ b/debian/control
@@ -9,6 +9,7 @@ Build-Depends:
  autoconf,
  automake,
  autotools-dev,
+ bash-completion,
  debhelper (>= 9),
  dh-python,
  intltool,
diff --git a/debian/inkscape.bash b/debian/inkscape.bash-completion
similarity index 89%
rename from debian/inkscape.bash
rename to debian/inkscape.bash-completion
index 196367a..a563436 100644
--- a/debian/inkscape.bash
+++ b/debian/inkscape.bash-completion
@@ -1,5 +1,5 @@
-# inkscape(1) completion 
-# put this file in /etc/bash_completion.d/ 
+# inkscape(1) completion
+# put this file in /etc/bash_completion.d/
 # allali at univ-mlv.fr
 
 have inkscape &&
@@ -16,7 +16,7 @@ _inkscape()
 			-e --export-png= -d --export-dpi= -a --export-area= \
 			-w --export-width= -h --export-height= -i --export-id= \
 			-j --export-id-only  -t --export-use-hints -b --export-background= \
-			-y --export-background-opacity= -l --export-plain-svg= -s --slideshow' -- $cur ) ) 
+			-y --export-background-opacity= -l --export-plain-svg= -s --slideshow' -- $cur ) )
         else
                 _filedir '@(ai|ani|bmp|cur|dia|eps|gif|ggr|ico|jpe|jpeg|jpg|pbm|pcx|pdf|pgm|png|ppm|pnm|ps|ras|sk|svg|svgz|targa|tga|tif|tiff|txt|wbmp|wmf|xbm|xpm)'
         fi
diff --git a/debian/rules b/debian/rules
index f64adba..1f64239 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,7 +7,7 @@ CFLAGS += -Wall
 CXXFLAGS += -Wall
 
 %:
-	dh $@ --buildsystem=autoconf --parallel --with autotools_dev,python2
+	dh $@ --buildsystem=autoconf --parallel --with autotools_dev,python2,bash-completion
 
 override_dh_auto_configure:
 	dh_auto_configure \
@@ -16,6 +16,4 @@ override_dh_auto_configure:
 		--enable-lcms
 
 override_dh_install:
-	install -D -o root -g root -m 644 $(CURDIR)/debian/inkscape.bash \
-		$(DESTDIR)/etc/bash_completion.d/inkscape
 	dh_install

-- 
inkscape packaging



More information about the pkg-multimedia-commits mailing list