* Simplify debian/rules, adjust versioned build dependencies on debhelper
authorgregor herrmann <gregoa@debian.org>
Sun, 13 Sep 2009 14:09:09 +0000 (14:09 -0000)
committergregor herrmann <gregoa@debian.org>
Sun, 13 Sep 2009 14:09:09 +0000 (14:09 -0000)
  and quilt in debian/control.
* Use dh_bash-completion for installing the completion snippet; adjust
  debian/rules, add a build dependency in bash-completion.

debian/bti.bash-completion [new file with mode: 0644]
debian/changelog
debian/control
debian/install [deleted file]
debian/rules

diff --git a/debian/bti.bash-completion b/debian/bti.bash-completion
new file mode 100644 (file)
index 0000000..077b0d6
--- /dev/null
@@ -0,0 +1 @@
+bti-bashcompletion bti
index e6ab8c4..2fcc9a9 100644 (file)
@@ -4,6 +4,10 @@ bti (023-2) UNRELEASED; urgency=low
     Matthias Klose for the pointer.
   * Set Standards-Version to 3.8.3 (no changes).
   * Add debian/README.source to document quilt usage.
+  * Simplify debian/rules, adjust versioned build dependencies on debhelper
+    and quilt in debian/control.
+  * Use dh_bash-completion for installing the completion snippet; adjust
+    debian/rules, add a build dependency in bash-completion.
 
  -- gregor herrmann <gregoa@debian.org>  Sun, 13 Sep 2009 15:27:49 +0200
 
index 9a537f2..16b7d75 100644 (file)
@@ -3,7 +3,8 @@ Section: net
 Priority: extra
 Maintainer: gregor herrmann <gregoa@debian.org>
 Uploaders: tony mancill <tmancill@debian.org>
-Build-Depends: debhelper (>= 7), quilt (>= 0.40),
+Build-Depends: debhelper (>= 7.0.50), quilt (>= 0.46-7),
+ bash-completion (>= 1:1.0),
  libcurl4-gnutls-dev, libreadline-dev, libxml2-dev, libpcre3-dev,
  xsltproc, docbook-xsl, docbook-xml
 Standards-Version: 3.8.3
diff --git a/debian/install b/debian/install
deleted file mode 100644 (file)
index 66f2fec..0000000
+++ /dev/null
@@ -1 +0,0 @@
-bti-bashcompletion etc/bash_completion.d
index a6c48c2..11cca89 100755 (executable)
@@ -1,26 +1,11 @@
 #!/usr/bin/make -f
 
-include /usr/share/quilt/quilt.make
-
-build: build-stamp
-build-stamp: $(QUILT_STAMPFN)
-       dh build
-       touch $@
-
-clean: unpatch
-       dh $@
-
-install: install-stamp
-install-stamp: build-stamp
-       dh install
-       mv debian/bti/etc/bash_completion.d/bti-bashcompletion debian/bti/etc/bash_completion.d/bti
-       touch $@
-
-binary-arch: install
-       dh $@
-
-binary-indep:
-
-binary: binary-arch binary-indep
-
-.PHONY: binary binary-arch binary-indep install clean build
+%:
+       dh --with quilt $@
+
+# after #535105 is fixed we can use '--with quilt,bash-completion'
+# and need to bump the build dependencies on debhelper and bash-completion;
+# until then, let's simulate the behaviour
+override_dh_installman:
+       dh_installman
+       dh_bash-completion