The following commit has been merged in the master branch:
commit b5275ee3a6894151edabca67f668017d4c594a51
Author: Hendrik Tews <hend...@askra.de>
Date: Fri May 31 22:23:07 2013 +0200
adjust packaging
diff --git a/debian/README.Debian b/debian/README.Debian
new file mode 100644
index 0000000..b0c3b24
--- /dev/null
+++ b/debian/README.Debian
@@ -0,0 +1,8 @@
+Documentation can be found at
+- http://mjambon.com/easy-format.html
+- /usr/share/doc/libeasy-format-ocaml-dev/ocamldoc/index.html
+ (from package libeasy-format-ocaml-dev)
+- the examples in /usr/share/doc/libeasy-format-ocaml-dev/examples
+ (also from package libeasy-format-ocaml-dev)
+
+ -- Hendrik Tews <hend...@askra.de>, Fri, 31 May 2013 22:22:24 +0200
diff --git a/debian/changelog b/debian/changelog
index 5853d69..162a2ed 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-easy-format (1.0.0-2) UNRELEASED; urgency=low
+easy-format (1.0.1-1) unstable; urgency=low
[ Sylvain Le Gall ]
* Remove Sylvain Le Gall from uploaders
@@ -6,8 +6,16 @@ easy-format (1.0.0-2) UNRELEASED; urgency=low
[ Hendrik Tews ]
* fix watch file (thanks to Bart Martens)
* unapply debian changes patch in master
+ * add myself as uploader
+ * bump debhelper compat level and standards version
+ * adjust dependencies
+ * remove debian-changes patch; create ocamldoc subdir in rules
+ * update home page
+ * update copyright file
+ * add README.Debian with documentation hints
+ * fix lintian Vcs-* warning
- -- Hendrik Tews <hend...@askra.de> Fri, 31 May 2013 16:38:34 +0200
+ -- Hendrik Tews <hend...@askra.de> Fri, 31 May 2013 22:16:56 +0200
easy-format (1.0.0-1) 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 5052ceb..f0271cf 100644
--- a/debian/control
+++ b/debian/control
@@ -2,39 +2,49 @@ Source: easy-format
Section: ocaml
Priority: optional
Maintainer: Debian OCaml Maintainers <debian-ocaml-ma...@lists.debian.org>
+Uploaders: Hendrik Tews <hend...@askra.de>
Build-Depends:
ocaml-nox (>= 3.11.1-3~),
ocaml-findlib,
dh-ocaml (>= 0.9~),
- debhelper (>= 7.0.50~),
+ debhelper (>= 9),
caml2html
-Standards-Version: 3.9.1
-Homepage: http://martin.jambon.free.fr/easy-format.html
-Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/easy-format.git
-Vcs-Browser: http://git.debian.org/?p=pkg-ocaml-maint/packages/easy-format.git
+Standards-Version: 3.9.4
+Homepage: http://mjambon.com/easy-format.html
+Vcs-Git: git://anonscm.debian.org/pkg-ocaml-maint/packages/easy-format.git
+Vcs-Browser:
http://anonscm.debian.org/gitweb/?p=pkg-ocaml-maint/packages/easy-format.git
Package: libeasy-format-ocaml-dev
Architecture: any
-Depends: ${ocaml:Depends}, ${misc:Depends}
+Depends:
+ ${ocaml:Depends},
+ ${shlibs:Depends},
+ ${misc:Depends}
Provides: ${ocaml:Provides}
Recommends: ocaml-findlib
-Description: text generation with indentation made easy(ier) for OCaml
+Description: easy(ier) pretty printing for OCaml - development files
This module offers a simplified interface to the Format module of the
- standard library. Input data must be converted into a tree using 3 kinds
- of nodes: atoms, lists and labelled nodes. Each node is bound to its own
- formatting parameters and a single function call produces the formatted
- output.
+ OCaml standard library. Input data must be converted into a tree
+ using 3 kinds of nodes: atoms, lists and labelled nodes. Each node is
+ bound to its own formatting parameters and a single function call
+ produces the formatted output.
+ .
+ This package contains the development files for programming with the
+ library.
Package: libeasy-format-ocaml
Architecture: any
-Depends: ${ocaml:Depends}, ${misc:Depends}
+Depends:
+ ${ocaml:Depends},
+ ${shlibs:Depends},
+ ${misc:Depends}
Provides: ${ocaml:Provides}
Recommends: ocaml-findlib
-Description: text generation with indentation made easy(ier) for OCaml
+Description: easy(ier) pretty printing for OCaml - plugins
This module offers a simplified interface to the Format module of the
- standard library. Input data must be converted into a tree using 3 kinds
- of nodes: atoms, lists and labelled nodes. Each node is bound to its own
- formatting parameters and a single function call produces the formatted
- output.
+ OCaml standard library. Input data must be converted into a tree
+ using 3 kinds of nodes: atoms, lists and labelled nodes. Each node is
+ bound to its own formatting parameters and a single function call
+ produces the formatted output.
.
This package contains the shared runtime libraries.
diff --git a/debian/copyright b/debian/copyright
index ffe9e94..dfc76e6 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,11 +1,11 @@
-Format-Specification:
http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=135
-Name: easy-format
-Maintainer: Sylvain Le Gall <gil...@debian.org>
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: Easy-format
+Upstream-Contact: Martin Jambon <mar...@mjambon.com>
+Source: http://mjambon.com/easy-format.html
Files: *
-Copyright: Copyright (c) 2008 Martin Jambon
-License: BSD3
-
+Copyright: 2008 Martin Jambon
+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:
@@ -16,7 +16,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.
@@ -28,8 +28,24 @@ License: BSD3
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
Files: debian/*
-Copyright: (C) 2010 Sylvain Le Gall <gil...@debian.org>
+Copyright: 2010 Sylvain Le Gall <gil...@debian.org>
+ 2013 Hendrik Tews <hend...@askra.de>
License: GPL-3+
-
- See '/usr/share/common-licenses/GPL-3' for the 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/debian-changes-1.0.0-1
b/debian/patches/debian-changes-1.0.0-1
deleted file mode 100644
index 7cea828..0000000
--- a/debian/patches/debian-changes-1.0.0-1
+++ /dev/null
@@ -1,44 +0,0 @@
-Description: Upstream changes introduced in version 1.0.0-1
- This patch has been created by dpkg-source during the package build.
- Here's the last changelog entry, hopefully it gives details on why
- those changes were made:
- .
- easy-format (1.0.0-1) unstable; urgency=low
- .
- * Initial release. (Closes: #605680)
- .
- The person named in the Author field signed this changelog entry.
-Author: Sylvain Le Gall <gil...@debian.org>
-Bug-Debian: http://bugs.debian.org/605680
-
----
-The information above should follow the Patch Tagging Guidelines, please
-checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
-are templates for supplementary fields that you might want to add:
-
-Origin: <vendor|upstream|other>, <url of original patch>
-Bug: <url in upstream bugtracker>
-Bug-Debian: http://bugs.debian.org/<bugnumber>
-Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
-Forwarded: <no|not-needed|url proving that it has been forwarded>
-Reviewed-By: <name and email of someone who approved the patch>
-Last-Update: <YYYY-MM-DD>
-
---- easy-format-1.0.0.orig/Makefile
-+++ easy-format-1.0.0/Makefile
-@@ -24,6 +24,7 @@ simple_example.out: simple_example
-
- doc: ocamldoc/index.html easy_format_example.html
- ocamldoc/index.html: easy_format.mli
-+ -mkdir ocamldoc
- ocamldoc -d ocamldoc -html $<
- easy_format_example.html: simple_example.out simple_example.ml
- cat simple_example.ml > easy_format_example.ml
-@@ -37,6 +38,7 @@ soft-clean:
- rm -f *.cm[iox] *.o *.annot \
- test_easy_format lambda_example simple_example \
- bytecode nativecode
-+ -$(RM) -r ocamldoc
-
- clean: soft-clean
- rm -f *.out ocamldoc/* \
diff --git a/debian/patches/series b/debian/patches/series
index f9b6479..e69de29 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +0,0 @@
-debian-changes-1.0.0-1
diff --git a/debian/rules b/debian/rules
index 01c8696..706088a 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/tmp
@@ -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:
@@ -23,6 +24,7 @@ ifeq ($(OCAML_HAVE_OCAMLOPT),yes)
else
$(MAKE) all
endif
+ mkdir ocamldoc
$(MAKE) doc
.PHONY: override_dh_auto_install
@@ -33,7 +35,3 @@ override_dh_auto_install:
.PHONY: override_dh_install
override_dh_install:
dh_install --fail-missing
-
-.PHONY: override_dh_auto_clean
-override_dh_auto_clean:
- $(MAKE) clean
--
easy-format packaging
_______________________________________________
Pkg-ocaml-maint-commits mailing list
Pkg-ocaml-maint-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-ocaml-maint-commits
