[Pkg-ocaml-maint-commits] [cmdliner] 03/03: update packaging using the upstream Makefile
Hendrik Tews
hendrik-guest at moszumanska.debian.org
Fri Aug 11 21:21:51 UTC 2017
This is an automated email from the git hooks/post-receive script.
hendrik-guest pushed a commit to branch master
in repository cmdliner.
commit 5edcd7db01614e511b6182745a4b60ab3f1a1948
Author: Hendrik Tews <hendrik at askra.de>
Date: Fri Aug 11 23:07:55 2017 +0200
update packaging using the upstream Makefile
* New upstream version 1.0.2
* compat level 10, standards version 4.0.0
* add build dependency libresult-ocaml-dev
* update VCS fields
* add myself to uploaders
* updated copyright
* update rules: remove most of the overrides, build sequential because
ocamlbuild would otherwise fail
* remove .doc-base file: there is no documentation any more
* fix .docs file
* add patch install-x for removing x-permission in make install
* add README.Debian to point to the online documentation
---
debian/README.Debian | 10 +++++++++
debian/changelog | 18 +++++++++++++++
debian/compat | 2 +-
debian/control | 14 +++++++-----
debian/copyright | 42 +++++++++++------------------------
debian/libcmdliner-ocaml-dev.doc-base | 9 --------
debian/libcmdliner-ocaml-dev.docs | 2 --
debian/patches/install-x.patch | 34 ++++++++++++++++++++++++++++
debian/patches/series | 1 +
debian/rules | 32 ++++----------------------
10 files changed, 89 insertions(+), 75 deletions(-)
diff --git a/debian/README.Debian b/debian/README.Debian
new file mode 100644
index 0000000..c8ea067
--- /dev/null
+++ b/debian/README.Debian
@@ -0,0 +1,10 @@
+For documentation, please visit
+http://erratique.ch/software/cmdliner/doc/Cmdliner
+
+Upstream does not distribute the documentation in html format any
+more. The documentation could be build with topkg-care, but this is
+not yet packaged for Debian but even it were, it would introduce a
+circular build dependency. Maybe we have a separate documentation
+package for cmdliner at some day...
+
+ -- Hendrik Tews <hendrik at askra.de>, Fri, 11 Aug 2017 22:54:05 +0200
diff --git a/debian/changelog b/debian/changelog
index f38d01b..cd64079 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,21 @@
+cmdliner (1.0.2-1) unstable; urgency=medium
+
+ * Team upload.
+ * New upstream version 1.0.2
+ * compat level 10, standards version 4.0.0
+ * add build dependency libresult-ocaml-dev
+ * update VCS fields
+ * add myself to uploaders
+ * updated copyright
+ * update rules: remove most of the overrides, build sequential because
+ ocamlbuild would otherwise fail
+ * remove .doc-base file: there is no documentation any more
+ * fix .docs file
+ * add patch install-x for removing x-permission in make install
+ * add README.Debian to point to the online documentation
+
+ -- Hendrik Tews <hendrik at askra.de> Fri, 11 Aug 2017 23:07:14 +0200
+
cmdliner (0.9.8-2) unstable; urgency=medium
* Team upload
diff --git a/debian/compat b/debian/compat
index 45a4fb7..f599e28 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-8
+10
diff --git a/debian/control b/debian/control
index 4170b0b..33c316d 100644
--- a/debian/control
+++ b/debian/control
@@ -3,17 +3,19 @@ Section: ocaml
Priority: optional
Maintainer: Debian OCaml Maintainers <debian-ocaml-maint at lists.debian.org>
Uploaders:
- Mehdi Dogguy <mehdi at debian.org>
+ Mehdi Dogguy <mehdi at debian.org>,
+ Hendrik Tews <hendrik at askra.de>
Build-Depends:
- debhelper (>= 8),
+ debhelper (>= 10),
ocaml-nox,
ocaml-findlib (>= 1.2.4),
ocamlbuild,
- dh-ocaml (>= 0.9)
-Standards-Version: 3.9.6
+ dh-ocaml (>= 0.9),
+ libresult-ocaml-dev
+Standards-Version: 4.0.0
Homepage: http://erratique.ch/software/cmdliner
-Vcs-Git: git://anonscm.debian.org/pkg-ocaml-maint/packages/cmdliner.git
-Vcs-Browser: https://anonscm.debian.org/cgit/pkg-ocaml-maint/packages/cmdliner.git
+Vcs-Git: https://anonscm.debian.org/cgit/pkg-ocaml-maint/packages/cmdliner.git
+Vcs-Browser: https://anonscm.debian.org/gitweb/?p=pkg-ocaml-maint/packages/cmdliner.git
Package: libcmdliner-ocaml-dev
Architecture: any
diff --git a/debian/copyright b/debian/copyright
index feca512..11d1db1 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,36 +1,20 @@
-Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Source: http://erratique.ch/logiciel/cmdliner
Files: *
-Copyright: © 2011-2012 Daniel C. Bünzli
-License: BSD-3-clause
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions are
- met:
+Copyright: (c) 2011 Daniel C. Bünzli
+License: ISC
+ Permission to use, copy, modify, and/or distribute this software for any
+ purpose with or without fee is hereby granted, provided that the above
+ copyright notice and this permission notice appear in all copies.
.
- 1. Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.
- .
- 2. Redistributions in binary form must reproduce the above copyright
- notice, this list of conditions and the following disclaimer in the
- documentation and/or other materials provided with the
- distribution.
- .
- 3. Neither the name of the Daniel C. Bünzli nor the names of
- contributors may be used to endorse or promote products derived
- from this software without specific prior written permission.
- .
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
Files: debian/*
Copyright: © 2013 Mehdi Dogguy <mehdi at debian.org>
diff --git a/debian/libcmdliner-ocaml-dev.doc-base b/debian/libcmdliner-ocaml-dev.doc-base
deleted file mode 100644
index d10044b..0000000
--- a/debian/libcmdliner-ocaml-dev.doc-base
+++ /dev/null
@@ -1,9 +0,0 @@
-Document: libcmdliner-ocaml-dev
-Title: command line interface handler
-Author: Daniel C. Bünzli
-Abstract: Documentation of the OCaml Cmdliner module
-Section: Programming/OCaml
-
-Format: HTML
-Index: /usr/share/doc/libcmdliner-ocaml-dev/doc/index.html
-Files: /usr/share/doc/libcmdliner-ocaml-dev/doc/*
diff --git a/debian/libcmdliner-ocaml-dev.docs b/debian/libcmdliner-ocaml-dev.docs
index 9a2569e..b43bf86 100644
--- a/debian/libcmdliner-ocaml-dev.docs
+++ b/debian/libcmdliner-ocaml-dev.docs
@@ -1,3 +1 @@
README.md
-CHANGES.md
-doc
diff --git a/debian/patches/install-x.patch b/debian/patches/install-x.patch
new file mode 100644
index 0000000..fca70df
--- /dev/null
+++ b/debian/patches/install-x.patch
@@ -0,0 +1,34 @@
+Description: install without adding execute permissions
+Author: Hendrik Tews <hendrik at askra.de>
+--- a/Makefile
++++ b/Makefile
+@@ -35,7 +35,7 @@
+
+ install-doc:
+ $(INSTALL) -d $(DOCDIR)
+- $(INSTALL) CHANGES.md LICENSE.md README.md $(DOCDIR)
++ $(INSTALL) -m 644 CHANGES.md LICENSE.md README.md $(DOCDIR)
+
+ clean:
+ $(OCAMLBUILD) -clean
+@@ -53,16 +53,16 @@
+ $(INSTALL) -d $(LIBDIR)
+
+ install-common: create-libdir
+- $(INSTALL) pkg/META opam $(BASE).mli $(BASE).cmi $(BASE).cmti $(LIBDIR)
++ $(INSTALL) -m 644 pkg/META opam $(BASE).mli $(BASE).cmi $(BASE).cmti $(LIBDIR)
+
+ install-byte: create-libdir
+- $(INSTALL) $(BASE).cma $(LIBDIR)
++ $(INSTALL) -m 644 $(BASE).cma $(LIBDIR)
+
+ install-native: create-libdir
+- $(INSTALL) $(BASE).cmxa $(BASE).a $(wildcard $(B)/cmdliner*.cmx) $(LIBDIR)
++ $(INSTALL) -m 644 $(BASE).cmxa $(BASE).a $(wildcard $(B)/cmdliner*.cmx) $(LIBDIR)
+
+ install-native-dynlink: create-libdir
+- $(INSTALL) $(BASE).cmxs $(LIBDIR)
++ $(INSTALL) -m 644 $(BASE).cmxs $(LIBDIR)
+
+ .PHONY: all install install-doc clean build-byte build-native \
+ build-native-dynlink create-libdir install-common install-byte \
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..c476b32
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+install-x.patch
diff --git a/debian/rules b/debian/rules
index f2833c1..e569cfb 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,39 +2,15 @@
# -*- makefile -*-
DESTDIR=$(CURDIR)/debian/tmp
-include /usr/share/ocaml/ocamlvars.mk
-OCAMLFIND_DESTDIR=$(DESTDIR)/$(OCAML_STDLIB_DIR)/cmdliner
-export OCAMLFIND_DESTDIR
-
-TARGETS=cmdliner.cmi cmdliner.cma
-ifeq ($(OCAML_BEST),opt)
-TARGETS+=cmdliner.a cmdliner.cmx cmdliner.cmxa cmdliner.cmxs
-endif
-
-TO_INSTALL=$(addprefix _build/src/,$(TARGETS)) pkg/META src/cmdliner.mli
%:
- dh $@ --with ocaml
-
-.PHONY: override_dh_auto_configure
-override_dh_auto_configure:
-
-.PHONY: override_dh_auto_build
-override_dh_auto_build:
- ocamlbuild -classic-display $(TARGETS)
-
-.PHONY: override_dh_auto_test
-override_dh_auto_test:
+ dh $@ --with ocaml --no-parallel
.PHONY: override_dh_auto_install
override_dh_auto_install:
- mkdir -p '$(OCAMLFIND_DESTDIR)'
- cp $(TO_INSTALL) '$(OCAMLFIND_DESTDIR)'
+ make DESTDIR=$(DESTDIR) install
.PHONY: override_dh_install
override_dh_install:
- dh_install --fail-missing
-
-.PHONY: override_dh_auto_clean
-override_dh_auto_clean:
- ocamlbuild -classic-display -clean
+ dh_install --exclude=opam
+ dh_missing --fail-missing
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/cmdliner.git
More information about the Pkg-ocaml-maint-commits
mailing list