[Pkg-ocaml-maint-commits] [otags] 03/03: update packageing for new version

Hendrik Tews hendrik-guest at moszumanska.debian.org
Fri Sep 22 20:50:00 UTC 2017


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

hendrik-guest pushed a commit to branch master
in repository otags.

commit adc0530fd16ccc14fd416655377d2be0c4cadb15
Author: Hendrik Tews <hendrik at askra.de>
Date:   Sat Aug 26 21:20:46 2017 +0200

    update packageing for new version
---
 debian/changelog                           |  15 +++++
 debian/compat                              |   2 +-
 debian/control                             |   9 +--
 debian/copyright                           |   2 +-
 debian/patches/disable-sexplib-tests.patch | 102 -----------------------------
 debian/patches/series                      |   1 -
 debian/rules                               |  27 ++------
 7 files changed, 27 insertions(+), 131 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index e81fb98..191e857 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,18 @@
+otags (4.05.1-1) unstable; urgency=low
+
+  * Team upload.
+  * New upstream version 4.05.1
+  * delete disable-sexplib-tests patch
+  * compat level 10, standards version 4.1.0
+  * drop camlp4 from build dependencies
+  * remove Mike Furr from uploaders (Closes: 873234)
+  * update copyright year
+  * disable creation of /usr/share/otags/hints - parsing hints are
+    currently not supported upstream
+  * delete camlp4-extra dependency and dh_ocaml override - no camlp4 anymore
+
+ -- Hendrik Tews <hendrik at askra.de>  Fri, 22 Sep 2017 22:41:22 +0200
+
 otags (4.02.2-2) unstable; urgency=medium
 
   * drop libsexplib-camlp4-dev from build dependencies (Closes: 843319)
diff --git a/debian/compat b/debian/compat
index ec63514..f599e28 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/debian/control b/debian/control
index 75a0653..bd9561f 100644
--- a/debian/control
+++ b/debian/control
@@ -3,16 +3,14 @@ Section: ocaml
 Priority: optional
 Maintainer: Debian OCaml Maintainers <debian-ocaml-maint at lists.debian.org>
 Uploaders:
- Mike Furr <mfurr at debian.org>,
  Mehdi Dogguy <mehdi at debian.org>,
  Hendrik Tews <hendrik at askra.de>
 Build-Depends:
  ocaml-best-compilers,
- debhelper (>= 9),
- dh-ocaml (>= 0.9~),
- camlp4 (>= 4.02),
+ debhelper (>= 10),
+ dh-ocaml (>= 0.9),
  cppo
-Standards-Version: 3.9.8
+Standards-Version: 4.1.0
 Homepage: http://askra.de/software/otags/
 Vcs-Git: https://anonscm.debian.org/cgit/pkg-ocaml-maint/packages/otags.git
 Vcs-Browser: https://anonscm.debian.org/gitweb/?p=pkg-ocaml-maint/packages/otags.git
@@ -20,7 +18,6 @@ Vcs-Browser: https://anonscm.debian.org/gitweb/?p=pkg-ocaml-maint/packages/otags
 Package: otags
 Architecture: any
 Depends:
- camlp4-extra,
  ${ocaml:Depends},
  ${shlibs:Depends},
  ${misc:Depends}
diff --git a/debian/copyright b/debian/copyright
index fd19107..284c3dc 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -4,7 +4,7 @@ Upstream-Contact: Hendrik Tews <prooftree at askra.de>
 Source: http://askra.de/software/otags
 
 Files: *
-Copyright: 2010-2012 Hendrik Tews
+Copyright: 2010-2017 Hendrik Tews
 License: GPL-3+
  This program is free software: you can redistribute it and/or modify
  it under the terms of the GNU General Public License as published by
diff --git a/debian/patches/disable-sexplib-tests.patch b/debian/patches/disable-sexplib-tests.patch
deleted file mode 100644
index 874c144..0000000
--- a/debian/patches/disable-sexplib-tests.patch
+++ /dev/null
@@ -1,102 +0,0 @@
-Description: disable tests with libsexplib
-Author: Hendrik Tews <hendrik at askra.de>
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -227,9 +227,9 @@
- TESTSOURCES_MLI:= test/c.mli test/e.mli
- TESTSOURCES_NORM:= $(TESTSOURCES_ML) $(TESTSOURCES_MLI) 
- TESTSOURCES_EXT:= test/cpp_i.generated.ml test/cppo_i.generated.ml
--TESTSOURCES_SEXP_ML:= test/f.ml
--TESTSOURCES_SEXP_MLI:= test/g.mli
--TESTSOURCES_SEXP:= $(TESTSOURCES_SEXP_MLI) $(TESTSOURCES_SEXP_ML)
-+#TESTSOURCES_SEXP_ML:= test/f.ml
-+#TESTSOURCES_SEXP_MLI:= test/g.mli
-+#TESTSOURCES_SEXP:= $(TESTSOURCES_SEXP_MLI) $(TESTSOURCES_SEXP_ML)
- TESTSOURCES:= $(TESTSOURCES_NORM) $(TESTSOURCES_SEXP) $(TESTSOURCES_EXT)
- COMPILEDTESTS:= $(TESTSOURCES_MLI:.mli=.cmi) \
- 		$(TESTSOURCES_ML:.ml=.cmo) \
-@@ -240,16 +240,14 @@
- 
- test/test.NEWTAGS: otags-binaries $(TESTSOURCES)
- 	$(MAKE) OCAMLFLAGS="-w a" $(COMPILEDTESTS)
--	./otags -I $(TYPECONVDIR) -I $(SEXPLIBDIR) \
--		-pa pa_type_conv.cma -pa pa_sexp_conv.cma $(TESTSOURCES_SEXP) \
-+	./otags \
- 		-pr $(TESTSOURCES_NORM) \
- 		-extern $(TESTSOURCES_EXT) \
- 		-o test/test.NEWTAGS
- 
- test/test.newtags: otags-binaries $(TESTSOURCES)
- 	$(MAKE) OCAMLFLAGS="-w a" $(COMPILEDTESTS)
--	./otags -vi -I $(TYPECONVDIR) -I $(SEXPLIBDIR) \
--		-pa pa_type_conv.cma -pa pa_sexp_conv.cma $(TESTSOURCES_SEXP) \
-+	./otags -vi \
- 		-pr $(TESTSOURCES_NORM) \
- 		-extern $(TESTSOURCES_EXT) \
- 		-o test/test.newtags
---- a/test/test.TAGS
-+++ b/test/test.TAGS
-@@ -1,19 +1,4 @@
- 

--test/g.mli,62
--G1,0
--type tt1,0
--type tt_of_sexp1,0
--type tsexp_of_t1,0
--

--test/f.ml,149
--F1,0
--type tt1,0
--type t = AA1,0
--type t = A | BB1,0
--type t = A | B__t_of_sexp__1,0
--type t = A | Bt_of_sexp1,0
--type t = A | Bsexp_of_t1,0
--

- test/a.ml,2834
- A1,0
- let a0a02,1
---- a/test/test.tags
-+++ b/test/test.tags
-@@ -8,7 +8,6 @@
- @@	test/c.mli	/^val (@@) : 'a -> 'b -> 'c$/;
- A	test/a.ml	1;
- A	test/d.ml	/^  | A of int$/;
--A	test/f.ml	/^type t = A | B with sexp$/;
- A1	test/d.ml	/^  | A1 of b_type$/;
- A10	test/a.ml	/^exception A10 of int * string$/;
- A12	test/a.ml	/^module A12 = Int32$/;
-@@ -46,7 +45,6 @@
- App	test/a.ml	/^  | App : ('b -> 'a) a87_term * 'b a87_term -> 'a a87_term$/;
- B	test/b.ml	1;
- B	test/d.ml	/^  | B  | C$/;
--B	test/f.ml	/^type t = A | B with sexp$/;
- B1	test/d.ml	/^  | B1 of b_type$/;
- B2	test/d.ml	/^  | B2 of a_type$/;
- C	test/c.mli	1;
-@@ -67,12 +65,9 @@
- E	test/e.mli	1;
- END	test/d.ml	/^module type END = sig $/;
- END	test/e.mli	/^module type END = sig $/;
--F	test/f.ml	1;
--G	test/g.mli	1;
- Int	test/a.ml	/^  | Int : int -> int a87_term$/;
- Modu	test/d.ml	/^module Modu =$/;
- No_value	test/d.ml	/^exception No_value$/;
--__t_of_sexp__	test/f.ml	/^type t = A | B with sexp$/;
- _a69	test/a.ml	/^let _a69 = 5$/;
- _a70	test/a.ml	/^type _a70 = int$/;
- a	test/d.ml	/^type a =$/;
-@@ -216,12 +211,6 @@
- set	test/e.mli	/^  method set : 'a -> unit$/;
- set	test/e.mli	/^  method set : 'a -> unit$/;
- set	test/e.mli	/^  method set : 'a -> unit$/;
--sexp_of_t	test/f.ml	/^type t = A | B with sexp$/;
--sexp_of_t	test/g.mli	/^type t with sexp$/;
--t	test/f.ml	/^type t = A | B with sexp$/;
--t	test/g.mli	/^type t with sexp$/;
--t_of_sexp	test/f.ml	/^type t = A | B with sexp$/;
--t_of_sexp	test/g.mli	/^type t with sexp$/;
- tx	test/a.ml	/^  type tx$/;
- tx	test/a.ml	/^    type tx = int$/;
- tx	test/a.ml	/^  type tx = int$/;
diff --git a/debian/patches/series b/debian/patches/series
index ff18984..e69de29 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +0,0 @@
-disable-sexplib-tests.patch
diff --git a/debian/rules b/debian/rules
index 4010059..94ee111 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,14 +1,5 @@
 #!/usr/bin/make -f
 # -*- makefile -*-
-# Sample debian/rules that uses debhelper.
-# This file was originally written by Joey Hess and Craig Small.
-# As a special exception, when this file is copied by dh-make into a
-# dh-make output file, you may use that output file without restriction.
-# This special exception was added by Craig Small in version 0.37 of dh-make.
-
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
-#export DH_OPTIONS=-v
 
 # This has to be exported to make some magic below work.
 export DH_OPTIONS
@@ -25,14 +16,10 @@ override_dh_auto_clean:
 	dh_auto_clean
 	rm -f Makefile conf.ml
 
-.PHONY: override_dh_ocaml
-override_dh_ocaml:
-	dh_ocaml --runtime-map otags
-
-INSTDIR:=debian/otags
-HINTSDIR:=$(INSTDIR)/usr/share/otags/hints
-.PHONY: override_dh_auto_install
-override_dh_auto_install:
-	dh_auto_install
-	install -d $(HINTSDIR)
-	install -m 644 debian/README.hints $(HINTSDIR)/README
+# INSTDIR:=debian/otags
+# HINTSDIR:=$(INSTDIR)/usr/share/otags/hints
+# .PHONY: override_dh_auto_install
+# override_dh_auto_install:
+# 	dh_auto_install
+# 	install -d $(HINTSDIR)
+# 	install -m 644 debian/README.hints $(HINTSDIR)/README

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



More information about the Pkg-ocaml-maint-commits mailing list