[Pkg-ocaml-maint-commits] [SCM] tophide packaging branch, master, updated. debian/1.0.0-3-5-g18762a4

Hendrik Tews hendrik at askra.de
Fri Jun 21 10:07:49 UTC 2013


The following commit has been merged in the master branch:
commit 18762a4c268a5809646169fd4b88b34d189b4e87
Author: Hendrik Tews <hendrik at askra.de>
Date:   Fri Jun 21 11:59:21 2013 +0200

    update packaging and prepare for OCaml 4.00

diff --git a/debian/changelog b/debian/changelog
index 02b07de..3dce45f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,12 +1,19 @@
-tophide (1.0.0-4) UNRELEASED; urgency=low
+tophide (1.0.1-1) unstable; urgency=low
 
   [ Sylvain Le Gall ]
   * Remove Sylvain Le Gall from uploaders
 
   [ Hendrik Tews ]
   * add watch file
-
- -- Hendrik Tews <hendrik at askra.de>  Fri, 21 Jun 2013 09:00:05 +0200
+  * new upstream version
+  * bump debhelper compat level and standards version
+  * add myself as uploader
+  * update hompage, Vcs fields, dependencies, copyright
+  * add new makefile patch for
+    - install ml file (lintian dangling-cmi)
+    - OCaml 4.00 compatibility
+
+ -- Hendrik Tews <hendrik at askra.de>  Fri, 21 Jun 2013 09:22:20 +0200
 
 tophide (1.0.0-3) unstable; urgency=low
 
diff --git a/debian/compat b/debian/compat
index 7f8f011..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-7
+9
diff --git a/debian/control b/debian/control
index 66d94a0..71b1104 100644
--- a/debian/control
+++ b/debian/control
@@ -2,20 +2,23 @@ Source: tophide
 Section: ocaml
 Priority: optional
 Maintainer: Debian OCaml Maintainers <debian-ocaml-maint at lists.debian.org>
+Uploaders: Hendrik Tews <hendrik at askra.de>
 Build-Depends:
   ocaml-nox (>= 3.11.1-3~),
   ocaml-findlib,
-  ocaml-base-nox,
   dh-ocaml (>= 0.9~),
-  debhelper (>= 7.0.50~)
-Standards-Version: 3.9.1
-Homepage: http://martin.jambon.free.fr/ocaml.html#tophide
-Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/tophide.git
-Vcs-Browser: http://git.debian.org/?p=pkg-ocaml-maint/packages/tophide.git
+  debhelper (>= 9)
+Standards-Version: 3.9.4
+Homepage: http://mjambon.com/ocaml.html#tophide
+Vcs-Git: git://anonvcs.debian.org/pkg-ocaml-maint/packages/tophide.git
+Vcs-Browser: http://anonvcs.debian.org/gitweb/?p=pkg-ocaml-maint/packages/tophide.git
 
 Package: libtophide-ocaml-dev
 Architecture: all
-Depends: ${ocaml:Depends}, ${misc:Depends}
+Depends:
+ ${ocaml:Depends},
+ ${shlibs:Depends},
+ ${misc:Depends}
 Provides: ${ocaml:Provides}
 Recommends: ocaml-findlib
 Description: hide values that start with '_' in OCaml toplevel
diff --git a/debian/copyright b/debian/copyright
index 9134be5..0fa2722 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,11 +1,13 @@
-Format-Specification: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=135
-Name: tophide
-Maintainer: Sylvain Le Gall <gildor at debian.org>
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: Tophide
+Upstream-Contact: Martin Jambon <martin at mjambon.com> 
+Source: http://mjambon.com/ocaml.html#tophide
 
 Files: *
-Copyright: (C) 2008 Martin Jambon
-License: BSD3
-
+Copyright: 2008 Martin Jambon <martin at mjambon.com>
+License: BSD-3-clause
+ All rights reserved.
+ .
  Redistribution and use in source and binary forms, with or without
  modification, are permitted provided that the following conditions
  are met:
@@ -16,7 +18,7 @@ License: BSD3
     documentation and/or other materials provided with the distribution.
  3. The name of the author may not be used to endorse or promote products
     derived from this software without specific prior written permission.
- 
+ .
  THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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.
@@ -29,8 +31,22 @@ License: BSD3
  THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 Files: debian/*
-Copyright: (C) 2010 Sylvain Le Gall <gildor at debian.org>
+Copyright: 2010 Sylvain Le Gall <gildor at debian.org>
+           2013 Hendrik Tews <hendrik at askra.de>
 License: GPL-3+
-                
- See '/usr/share/common-licenses/GPL-3' for full text.
-
+ 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
+ the Free Software Foundation, either version 3 of the License, or (at
+ your option) any later version.
+ .
+ This program is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ General Public License for more details.
+ .
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+ .
+ On Debian systems, the full text of the GNU General Public
+ License version 3 can be found in the file
+ `/usr/share/common-licenses/GPL-3'.
diff --git a/debian/patches/makefile.patch b/debian/patches/makefile.patch
new file mode 100644
index 0000000..09d266b
--- /dev/null
+++ b/debian/patches/makefile.patch
@@ -0,0 +1,17 @@
+Description: minor changes for OCaml 4.00 and lintian
+Author: Hendrik Tews <hendrik at askra.de>
+--- a/Makefile
++++ b/Makefile
+@@ -8,10 +8,10 @@
+ 
+ all: META tophide.cmo
+ tophide.cmo: tophide.ml
+-	ocamlc -c tophide.ml
++	ocamlc -c -I +compiler-libs tophide.ml
+ 
+ install:
+-	ocamlfind install tophide META tophide.cmi tophide.cmo
++	ocamlfind install tophide META tophide.cmi tophide.cmo tophide.ml
+ 
+ uninstall:
+ 	ocamlfind remove tophide
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..82374e5
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+makefile.patch
diff --git a/debian/rules b/debian/rules
index 2f39bba..4b7b786 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,6 +3,7 @@
 
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
+#export DH_OPTIONS=-v
 
 DESTDIR=$(CURDIR)/debian/libtophide-ocaml-dev
 
@@ -14,7 +15,7 @@ OCAMLFIND_LDCONF=ignore
 export OCAMLFIND_LDCONF
 
 %:
-	dh --with ocaml $@
+	dh $@ --with ocaml
 
 .PHONY: override_dh_auto_build
 override_dh_auto_build:

-- 
tophide packaging



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