Debian package: Use more debhelper magic
authorAxel Beckert <abe@deuxchevaux.org>
Thu, 17 Jan 2013 01:17:22 +0000 (17 02:17 +0100)
committerAxel Beckert <abe@deuxchevaux.org>
Thu, 17 Jan 2013 01:17:22 +0000 (17 02:17 +0100)
No more manual copying, symlinking or directory creating.

debian/bin/conkeror [moved from debian/conkeror.bin with 100% similarity]
debian/changelog
debian/conkeror-spawn-process-helper.install [new file with mode: 0644]
debian/conkeror-spawn-process-helper.links [new file with mode: 0644]
debian/conkeror.dirs
debian/conkeror.install [new file with mode: 0644]
debian/rules

similarity index 100%
rename from debian/conkeror.bin
rename to debian/bin/conkeror
index 2ebdb46..4eba48e 100644 (file)
@@ -7,6 +7,7 @@ conkeror (1.0~~pre+git130117-1) UNRELEASED; urgency=low
   * Don't clean up stamp files manually; this is already done by dh_clean
     plus debhelper compatibility level 7.
   * Clean up debian/rules:
+    - Use more debhelper magic, no more manual cp, ln, or mkdir.
     - Remove unnecessary comments and blank lines.
     - Add some blank lines to gather related lines together in blocks.
 
diff --git a/debian/conkeror-spawn-process-helper.install b/debian/conkeror-spawn-process-helper.install
new file mode 100644 (file)
index 0000000..a0a29fb
--- /dev/null
@@ -0,0 +1 @@
+conkeror-spawn-helper usr/lib/conkeror
diff --git a/debian/conkeror-spawn-process-helper.links b/debian/conkeror-spawn-process-helper.links
new file mode 100644 (file)
index 0000000..86064e3
--- /dev/null
@@ -0,0 +1 @@
+usr/lib/conkeror/conkeror-spawn-helper usr/share/conkeror/conkeror-spawn-helper
\ No newline at end of file
index 2ded412..fbee064 100644 (file)
@@ -1,4 +1,6 @@
 usr/bin
 usr/share/conkeror
+usr/share/conkeror/contrib
+usr/share/conkeror/components
 usr/share/applications
 usr/share/man/man1
diff --git a/debian/conkeror.install b/debian/conkeror.install
new file mode 100644 (file)
index 0000000..787ede8
--- /dev/null
@@ -0,0 +1,4 @@
+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
index 39c93e1..584c650 100755 (executable)
@@ -42,14 +42,6 @@ install-indep:
        dh_prep -i
        dh_installdirs -i
 
-       cp -pr branding chrome components content defaults      \
-              locale modules search-engines help style         \
-              *.manifest                                       \
-              $(CURDIR)/debian/conkeror/usr/share/conkeror/
-       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
@@ -57,8 +49,6 @@ install-indep:
        # 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
-       cp -p debian/conkeror.bin $(CURDIR)/debian/conkeror/usr/bin/conkeror
-       cp -p debian/conkeror.desktop $(CURDIR)/debian/conkeror/usr/share/applications/
 
        dh_install -i
 
@@ -67,8 +57,7 @@ install-arch:
        dh_testroot
        dh_prep -s
        dh_installdirs -s
-       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_link -s
        dh_install -s
 
 # Must not depend on anything. This is to be called by