[Pkg-ocaml-maint-commits] [SCM] headache packaging branch, master, updated. debian/1.03-17

[Sylvain Le Gall]

The following commit has been merged in the master branch:
commit 5970eefe2c92844e4f53dba6ff4a66b1cddfda82
Author: Sylvain Le Gall <gildor at debian.org>
Date:   Tue Jun 30 12:58:48 2009 +0000

    Prepare upload for OCaml 3.11.1
    
    * Rebuild for OCaml 3.11.1
    * Remove useless CDBS depends substitution in debian/rules
    * Update debian/copyright (http://wiki.debian.org/Proposals/CopyrightFormat)
    * Upgrade Standards-Version to 3.8.2 (No change)

diff --git a/debian/changelog b/debian/changelog
index 861f254..6670b7a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,12 @@
-headache (1.03-16) UNRELEASED; urgency=low
+headache (1.03-17) unstable; urgency=low
 
   * Switch packaging to git
+  * Rebuild for OCaml 3.11.1
+  * Remove useless CDBS depends substitution in debian/rules
+  * Update debian/copyright (http://wiki.debian.org/Proposals/CopyrightFormat)
+  * Upgrade Standards-Version to 3.8.2 (No change)
 
- -- Sylvain Le Gall <gildor at debian.org>  Thu, 05 Mar 2009 00:30:39 +0100
+ -- Sylvain Le Gall <gildor at debian.org>  Mon, 29 Jun 2009 10:45:40 +0000
 
 headache (1.03-15) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 6325463..cd1f1e3 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,7 @@ Uploaders: Stefano Zacchiroli <zack at debian.org>,
  Sylvain Le Gall <gildor at debian.org>
 Build-Depends-Indep: po-debconf, xsltproc, libxml2-utils, docbook-xsl, docbook-xml
 Build-Depends: cdbs (>= 0.4.23-1.1), debhelper (>= 5), dpatch, ocaml-nox (>= 3.10.0-8), dh-ocaml
-Standards-Version: 3.8.0
+Standards-Version: 3.8.2
 Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/headache.git
 Vcs-Browser: http://git.debian.org/?p=pkg-ocaml-maint/packages/headache.git
 Homepage: http://cristal.inria.fr/~simonet/soft/
diff --git a/debian/copyright b/debian/copyright
index 1553a1f..7da96a8 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,14 +1,13 @@
-This package was debianized by Sylvain Le Gall <gildor at debian.org> on
-Sun, 15 Feb 2004 21:54:24 +0100.
+Format-Specification: http://wiki.debian.org/Proposals/CopyrightFormat
+Upstream-Author: Vincent Simonet <Vincent.Simonet at vtst.fr>
+Packaged-By: Sylvain Le Gall <gildor at debian.org>
+Packaged-Date: Sun, 15 Feb 2004 21:54:24 +0100.
+Original-Source-Location: http://pauillac.inria.fr/~simonet/soft/headache/
 
-It was downloaded from :
-http://pauillac.inria.fr/~simonet/soft/headache/
 
-Upstream Author:
-   Vincent Simonet <Vincent.Simonet at vtst.fr>
-
-Copyright:
-   Copyright 2002,2003 Vincent Simonet
+Files: *
+Copyright: (C) 2002-2003 Vincent Simonet
+License: LGPL-2+
 
    This package is free software; you can redistribute it and/or modify
    it under the terms of the GNU Library General Public License as published by
@@ -25,3 +24,10 @@ Copyright:
 
 On Debian GNU/Linux systems, the complete text of the GNU General
 Public License can be found in `/usr/share/common-licenses/LGPL-2'
+
+Files: debian/*
+Copyright: (C) 2006-2009 Sylvain Le Gall
+License: GPL-2+
+
+On Debian GNU/Linux systems, the complete text of the GNU General
+Public License can be found in `/usr/share/common-licenses/GPL-2'
diff --git a/debian/patches/02_skip_begin.dpatch b/debian/patches/02_skip_begin.dpatch
index 4a706ad..8a3b15f 100755
--- a/debian/patches/02_skip_begin.dpatch
+++ b/debian/patches/02_skip_begin.dpatch
@@ -2,7 +2,7 @@
 ## 02_skip_begin.dpatch by Sylvain Le Gall <gildor at debian.org>
 ##
 ## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
+## DP: Allow to add pattern to skip begin of file (e.g. for XML files)
 
 @DPATCH@
 diff -urNad headache-1.03~/Depend headache-1.03/Depend
diff --git a/debian/patches/03_header_width.dpatch b/debian/patches/03_header_width.dpatch
index 2ff9c09..c3a363c 100755
--- a/debian/patches/03_header_width.dpatch
+++ b/debian/patches/03_header_width.dpatch
@@ -2,7 +2,7 @@
 ## 03_header_width.dpatch by Sylvain Le Gall <gildor at debian.org>
 ##
 ## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
+## DP: Compute header width based on header file content.
 
 @DPATCH@
 diff -urNad trunk~/main.ml trunk/main.ml
diff --git a/debian/rules b/debian/rules
index f62cd05..d56775e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,6 +1,6 @@
 #!/usr/bin/make -f
 # debian/rules for headache package
-# Copyright (C) 2006 Sylvain Le Gall <gildor at debian.org>
+# Copyright (C) 2006-2009 Sylvain Le Gall <gildor at debian.org>
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License as
@@ -26,8 +26,6 @@ DEB_MAKE_CLEAN_TARGET    := clean
 DEB_MAKE_BUILD_TARGET    := 
 DEB_MAKE_INSTALL_TARGET  := install INSTALLDIR="$(DEB_DESTDIR)/usr/bin"
 
-CDBS_BUILD_DEPENDS := $(subst ocaml-nox,ocaml-nox (>= 3.10.0-8),$(CDBS_BUILD_DEPENDS))
-
 clean::
 	-$(DEB_MAKE_ENVVARS) $(MAKE) -C $(CURDIR)/debian/xml-man clean
 

-- 
headache packaging