From 8dda8b8cba7e0c8bf8619a889b1c17bb656a751a Mon Sep 17 00:00:00 2001
From: Axel Beckert <abe@deuxchevaux.org>
Date: Thu, 17 Jan 2013 01:53:42 +0100
Subject: [PATCH] Debian package: clean up rules file

Remove unnecessary comments and blank lines. Also add some blank lines
to gather related lines together in blocks.
---
 debian/changelog |  3 +++
 debian/rules     | 20 ++------------------
 2 files changed, 5 insertions(+), 18 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index cba588d..2ebdb46 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,9 @@ conkeror (1.0~~pre+git130117-1) UNRELEASED; urgency=low
   * Use dh_auto_build and dh_auto_clean.
   * Don't clean up stamp files manually; this is already done by dh_clean
     plus debhelper compatibility level 7.
+  * Clean up debian/rules:
+    - Remove unnecessary comments and blank lines.
+    - Add some blank lines to gather related lines together in blocks.
 
  -- Axel Beckert <abe@debian.org>  Thu, 17 Jan 2013 01:42:48 +0100
 
diff --git a/debian/rules b/debian/rules
index 30c254a..39c93e1 100755
--- a/debian/rules
+++ b/debian/rules
@@ -17,34 +17,22 @@ include /usr/share/dpkg/buildflags.mk
 configure: configure-stamp
 configure-stamp:
 	dh_testdir
-	# Add here commands to configure the package.
-
 	touch $@
 
-# Architecture
 build: build-arch build-indep
-
 build-arch: build-arch-stamp 
 build-arch-stamp: configure-stamp
-	# Add here commands to compile the arch part of the package.
 	dh_auto_build
-
 	touch $@
 
 build-indep: build-indep-stamp
 build-indep-stamp: configure-stamp
-	# Add here commands to compile the indep part of the package.
-	#$(MAKE) doc
-
 	touch $@
 
 clean:
 	dh_testdir
 	dh_testroot
-
-	# Add here commands to clean up after the build process.
 	dh_auto_clean
-
 	dh_clean
 
 install: install-indep install-arch
@@ -54,8 +42,6 @@ install-indep:
 	dh_prep -i
 	dh_installdirs -i
 
-	# Add here commands to install the indep part of the package into
-	# debian/<package>
 	cp -pr branding chrome components content defaults	\
 	       locale modules search-engines help style	       	\
 	       *.manifest					\
@@ -63,9 +49,11 @@ install-indep:
 	mkdir -p $(CURDIR)/debian/conkeror/usr/share/conkeror/contrib/
 	cp -pr contrib/xrev contrib/art contrib/modules	\
 	       $(CURDIR)/debian/conkeror/usr/share/conkeror/contrib/
+
 	# 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
+
 	# 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
@@ -79,12 +67,8 @@ install-arch:
 	dh_testroot
 	dh_prep -s
 	dh_installdirs -s
-
-	# Add here commands to install the arch part of the package into
-	# debian/tmp.
 	cp -p conkeror-spawn-helper $(CURDIR)/debian/conkeror-spawn-process-helper/usr/lib/conkeror/
 	ln -s /usr/lib/conkeror/conkeror-spawn-helper $(CURDIR)/debian/conkeror-spawn-process-helper/usr/share/conkeror/
-
 	dh_install -s
 
 # Must not depend on anything. This is to be called by
-- 
2.11.4.GIT