Make git-annex-standalone.deb include the git-annex html documentation, desktop file, and base completion file, same as the regular git-annex.deb.

It already had a doc-base file relating to the html documentation, and
there's no reason not to include the other stuff.
This commit is contained in:
Joey Hess 2015-11-10 13:18:58 -04:00
parent 54bfbac64f
commit 361d31fde7
Failed to extract signature
4 changed files with 9 additions and 8 deletions

View file

@ -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

2
debian/changelog vendored
View file

@ -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

View file

@ -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*

3
debian/rules vendored
View file

@ -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