[Pkg-mozext-commits] [video-without-flash] 02/03: skip empty conffile without making broken symlink (Closes: #772819).

[Dmitry Smirnov]

This is an automated email from the git hooks/post-receive script.

onlyjob pushed a commit to branch master
in repository video-without-flash.

commit 3d35fe6
Author: Dmitry Smirnov <onlyjob at member.fsf.org>
Date:   Thu Jan 1 06:54:07 2015

    skip empty conffile without making broken symlink (Closes: #772819).
---
 debian/lintian-overrides | 3 ---
 debian/rules             | 8 +++-----
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/debian/lintian-overrides b/debian/lintian-overrides
index 72b5875..0ebae13 100644
--- a/debian/lintian-overrides
+++ b/debian/lintian-overrides
@@ -1,5 +1,2 @@
 ## Lintian false-positive, link destination not in this package.
 package-contains-broken-symlink usr/share/xul-ext/video-without-flash/LICENSE ../../common-licenses/GPL-3
-
-## Deliberately not install empty conffile:
-package-contains-broken-symlink usr/share/xul-ext/video-without-flash/defaults/preferences/000system.js etc/xul-ext/*.js
diff --git a/debian/rules b/debian/rules
index e437865..fe308ae 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,8 +6,6 @@
 %:
 	dh $@ --with xul-ext --buildsystem=xul_ext --parallel
 
-override_dh_install:
-	## skip conffile(s):
-	$(RM) -v debian/xul-ext-*/etc/*/*.js
-	find $(CURDIR)/debian -type d -empty -delete -print
-	dh_install
+override_dh_auto_install:
+	## Deliberately skip empty conffile.
+	install-xpi --disable-system-prefs -x configure -x Makefile xul-*.xpi

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mozext/video-without-flash.git