From: Axel Beckert <abe@deuxchevaux.org>
Date: Thu, 17 Jan 2013 01:22:08 +0000 (+0100)
Subject: Debian package: Use sed inline edits in combination with dh_install
X-Git-Tag: debian-1.0--pre-1+git160130-1~193
X-Git-Url: https://repo.or.cz/w/conkeror.git/commitdiff_plain/9fa33a14cccfe0ec33b2d738622555a41a829550

Debian package: Use sed inline edits in combination with dh_install
---

diff --git a/debian/conkeror.install b/debian/conkeror.install
index 787ede8..6665cc9 100644
--- a/debian/conkeror.install
+++ b/debian/conkeror.install
@@ -1,4 +1,4 @@
-branding chrome components content defaults locale modules search-engines help style *.manifest usr/share/conkeror
+application.ini branding chrome components content defaults locale modules search-engines help style *.manifest usr/share/conkeror
 contrib/xrev contrib/art contrib/modules usr/share/conkeror/contrib
 debian/conkeror.desktop usr/share/applications
 debian/bin/conkeror usr/bin
diff --git a/debian/rules b/debian/rules
index 584c650..a649b6d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -41,16 +41,15 @@ install-indep:
 	dh_testroot
 	dh_prep -i
 	dh_installdirs -i
+	dh_install -i
 
 	# Add generated Build ID and Debian version to version output
-	sed -e 's/BuildID=git/BuildID=${BUILDID}/;s/^Version=\(.*\)$$/Version=\1 (Debian-${DEBIAN_VERSION})/' application.ini \
-	       > $(CURDIR)/debian/conkeror/usr/share/conkeror/application.ini
+	sed -e 's/BuildID=git/BuildID=${BUILDID}/;s/^Version=\(.*\)$$/Version=\1 (Debian-${DEBIAN_VERSION})/' \
+	    -i $(CURDIR)/debian/conkeror/usr/share/conkeror/application.ini
 
 	# Use Debian version for M-x version output
-	sed -e 's/Version=\(.*\)/Version=\1 (Debian-${DEBIAN_VERSION})/' components/application.js \
-	       > $(CURDIR)/debian/conkeror/usr/share/conkeror/components/application.js
-
-	dh_install -i
+	sed -e 's/Version=\(.*\)/Version=\1 (Debian-${DEBIAN_VERSION})/' \
+	    -i $(CURDIR)/debian/conkeror/usr/share/conkeror/components/application.js
 
 install-arch:
 	dh_testdir