Make git-annex-standalone.deb include the git-annex html documentation, desktop file...

It already had a doc-base file relating to the html documentation, and
there's no reason not to include the other stuff.

diff --git a/Makefile b/Makefile
index dae2d5d5bd085fdf5ae6be039abc4a3a595514b0..523632edc67860be44c6d1b47f7fa37a7f094e22 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -41,14 +41,18 @@ install-docs: docs install-mans
                rsync -a --delete html/ $(DESTDIR)$(PREFIX)/$(SHAREDIR)/doc/git-annex/html/; \
        fi
 
-install: build install-docs Build/InstallDesktopFile
+install-bins: build
        install -d $(DESTDIR)$(PREFIX)/bin
        install git-annex $(DESTDIR)$(PREFIX)/bin
        ln -sf git-annex $(DESTDIR)$(PREFIX)/bin/git-annex-shell
+
+install-misc: Build/InstallDesktopFile
        ./Build/InstallDesktopFile $(PREFIX)/bin/git-annex || true
        install -d $(DESTDIR)$(PREFIX)/share/bash-completion/completions
        install -m 0644 bash-completion.bash $(DESTDIR)$(PREFIX)/share/bash-completion/completions/git-annex
 
+install: install-bins install-docs install-misc
+
 test: git-annex
        ./git-annex test
 

diff --git a/debian/changelog b/debian/changelog
index 739579f17ef2a34d3874687be70a3e823353cbb9..83ccc8df52167aceb644a1392f79e9586d385084 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -20,6 +20,8 @@ git-annex (5.20151102.2) UNRELEASED; urgency=medium
     created.
   * Make the git-annex-standalone.deb prevent runshell from installing
     wrappers into $HOME/.ssh
+  * Make git-annex-standalone.deb include the git-annex html documentation,
+    desktop file, and base completion file, same as the regular git-annex.deb.
 
  -- Joey Hess <id@joeyh.name>  Wed, 04 Nov 2015 12:50:20 -0400
 

diff --git a/debian/patches/standalone-build b/debian/patches/standalone-build
index 9bea9b30f765a778cbde102c1f62134e74336cf9..801bfbbb2dddcc2ff2b467a16923791d80942b69 100644 (file)
--- a/debian/patches/standalone-build
+++ b/debian/patches/standalone-build
@@ -60,9 +60,3 @@ Index: git-annex/debian/links
 @@ -0,0 +1,2 @@
 +/usr/lib/git-annex.linux/git-annex /usr/bin/git-annex
 +/usr/lib/git-annex.linux/git-annex-shell /usr/bin/git-annex-shell
-Index: git-annex/debian/manpages
-===================================================================
---- /dev/null
-+++ git-annex/debian/manpages
-@@ -0,0 +1 @@
-+debian/git-annex-standalone/usr/lib/git-annex.linux/usr/share/man/man1/git-annex*

diff --git a/debian/rules b/debian/rules
index 294cb302836a8369d6de81b815522f123bee5e23..3fcaccb869d64654e3e0621bad9ef5e3b0bc6e79 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -19,7 +19,8 @@ override_dh_auto_build:
        make linuxstandalone GIT_ANNEX_PACKAGE_INSTALL=1
 
 override_dh_auto_install:
-       : # nothing to do, we just need to copy the beast, as instructed in debian/install
+       make install-misc install-docs DESTDIR=debian/git-annex-standalone
+       # bins are linked into place, as instructed in debian/install and debian/links
 
 override_dh_fixperms:
        dh_fixperms -Xld-linux