summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorGravatar Joey Hess <joeyh@joeyh.name>2015-11-10 13:18:58 -0400
committerGravatar Joey Hess <joeyh@joeyh.name>2015-11-10 13:21:05 -0400
commita216b94c949cd363e9888aec4e8bfb2c5de7c8f0 (patch)
tree307515a210ef4ef7c2c2c667104dd9b1f29f4424 /debian
parent071ad29c5e72226de2e0fb12beafc2b1c5f6ef0c (diff)
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.
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog2
-rw-r--r--debian/patches/standalone-build6
-rwxr-xr-xdebian/rules3
3 files changed, 4 insertions, 7 deletions
diff --git a/debian/changelog b/debian/changelog
index 739579f17..83ccc8df5 100644
--- 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 9bea9b30f..801bfbbb2 100644
--- 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 294cb3028..3fcaccb86 100755
--- 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