[Pkg-ocaml-maint-commits] [opam] 02/03: Only install "opam" and "opam-admin" binaries, as upstream does.

[Mehdi Dogguy]

This is an automated email from the git hooks/post-receive script.

mehdi pushed a commit to branch master
in repository opam.

commit 5b1297cd913a04aeade64b5ec33e26a90ba452c9
Author: Mehdi Dogguy <mehdi at debian.org>
Date:   Sat Nov 23 16:47:39 2013 +0100

    Only install "opam" and "opam-admin" binaries, as upstream does.
---
 debian/buildsys/byte.itarget | 3 +--
 debian/buildsys/opt.itarget  | 3 +--
 debian/changelog             | 1 +
 debian/rules                 | 5 ++---
 4 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/debian/buildsys/byte.itarget b/debian/buildsys/byte.itarget
index 7634908..ee8177c 100644
--- a/debian/buildsys/byte.itarget
+++ b/debian/buildsys/byte.itarget
@@ -1,3 +1,2 @@
 src/client/opamMain.byte
-src/scripts/opam_mk_repo.byte
-src/scripts/opam_repo_check.byte
+src/scripts/opam_admin.byte
diff --git a/debian/buildsys/opt.itarget b/debian/buildsys/opt.itarget
index 8aa35da..e7f6357 100644
--- a/debian/buildsys/opt.itarget
+++ b/debian/buildsys/opt.itarget
@@ -1,3 +1,2 @@
 src/client/opamMain.native
-src/scripts/opam_mk_repo.native
-src/scripts/opam_repo_check.native
+src/scripts/opam_admin.native
diff --git a/debian/changelog b/debian/changelog
index 673e416..4cd45f4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ opam (1.1.0-1) UNRELEASED; urgency=low
   * New upstream release.
     + Update patch (fix spelling errors).
   * Link against "re.str", added in debian/buildsys/myocamlbuild.ml.
+  * Only install "opam" and "opam-admin" binaries, as upstream does.
 
  -- Mehdi Dogguy <mehdi at debian.org>  Sat, 23 Nov 2013 11:11:32 +0100
 
diff --git a/debian/rules b/debian/rules
index 245cba9..ef08072 100755
--- a/debian/rules
+++ b/debian/rules
@@ -21,7 +21,7 @@ override_dh_auto_configure:
 override_dh_auto_build:
 	ocamlbuild $(OCAML_BEST).otarget
 ifneq (,$(findstring opam-docs, $(shell dh_listpackages)))
-	$(MAKE) -C doc OPAM=../opamMain.$(BINEXT) man
+	$(MAKE) -C doc OPAM=../opamMain.$(BINEXT) OPAM_ADMIN=../opam_admin.$(BINEXT) man
 	$(RM) -f doc/dev-manual/dev-manual.pdf
 	$(MAKE) -C doc/dev-manual
 endif
@@ -34,8 +34,7 @@ override_dh_auto_test:
 override_dh_auto_install:
 	mkdir -p $(DESTDIR)/usr/bin
 	cp _build/src/client/opamMain.$(BINEXT)			$(DESTDIR)/usr/bin/opam
-	cp _build/src/scripts/opam_mk_repo.$(BINEXT) 		$(DESTDIR)/usr/bin/opam-mk-repo
-	cp _build/src/scripts/opam_repo_check.$(BINEXT) 	$(DESTDIR)/usr/bin/opam-repo-check
+	cp _build/src/scripts/opam_admin.$(BINEXT)		$(DESTDIR)/usr/bin/opam-admin
 
 .PHONY: override_dh_install
 override_dh_install:

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/opam.git