Patchwork D883: deb: build and install chg

login
register
mail settings
Submitter phabricator
Date Oct. 1, 2017, 2:04 p.m.
Message ID <90f45af12e97855151df748e2ef5c958@localhost.localdomain>
Download mbox | patch
Permalink /patch/24354/
State Not Applicable
Headers show

Comments

phabricator - Oct. 1, 2017, 2:04 p.m.
This revision was automatically updated to reflect the committed changes.
Closed by commit rHG0133ca39c688: deb: build and install chg (authored by spectral, committed by ).

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D883?vs=2281&id=2291

REVISION DETAIL
  https://phab.mercurial-scm.org/D883

AFFECTED FILES
  contrib/debian/rules
  tests/test-debian-packages.t

CHANGE DETAILS




To: spectral, #hg-reviewers, simpkins, yuja
Cc: yuja, mercurial-devel

Patch

diff --git a/tests/test-debian-packages.t b/tests/test-debian-packages.t
--- a/tests/test-debian-packages.t
+++ b/tests/test-debian-packages.t
@@ -24,3 +24,9 @@ 
 zsh completions should be in the common package
   $ dpkg --contents mercurial-common_*.deb | egrep 'zsh.*[^/]$'
   * ./usr/share/zsh/vendor-completions/_hg (glob)
+chg should be installed alongside hg, in the 'mercurial' package
+  $ dpkg --contents mercurial_*.deb | egrep 'chg$'
+  * ./usr/bin/chg (glob)
+chg should come with a man page
+  $ dpkg --contents mercurial_*.deb | egrep 'man.*chg'
+  * ./usr/share/man/man1/chg.1.gz (glob)
diff --git a/contrib/debian/rules b/contrib/debian/rules
--- a/contrib/debian/rules
+++ b/contrib/debian/rules
@@ -16,6 +16,11 @@ 
 
 override_dh_install:
 	python$(PYVERS) setup.py install --root $(CURDIR)/debian/mercurial --install-layout=deb
+	# chg
+	make -C contrib/chg \
+		DESTDIR=$(CURDIR)/debian/mercurial \
+		PREFIX=/usr \
+		clean install
 	# remove arch-independent python stuff
 	find $(CURDIR)/debian/mercurial/usr/lib \
 		! -name '*.so' ! -type d -delete , \
@@ -31,6 +36,7 @@ 
 	cp contrib/hgk $(CURDIR)/debian/mercurial-common/usr/share/mercurial
 	mkdir -p $(CURDIR)/debian/mercurial-common/etc/mercurial/hgrc.d/
 	cp contrib/debian/*.rc $(CURDIR)/debian/mercurial-common/etc/mercurial/hgrc.d/
+	# completions
 	mkdir -p $(CURDIR)/debian/mercurial-common/usr/share/bash-completion/completions
 	cp contrib/bash_completion $(CURDIR)/debian/mercurial-common/usr/share/bash-completion/completions/hg
 	mkdir -p $(CURDIR)/debian/mercurial-common/usr/share/zsh/vendor-completions