[Pkg-ocaml-maint-commits] [SCM] unison packaging branch, master, updated. debian/2.27.57-2

Thu Mar 19 16:03:18 UTC 2009

The following commit has been merged in the master branch:
commit 665cc4a23f1aec611d8b8ba5de6102713e2941a3
Author: Sylvain Le Gall <gildor at debian.org>
Date:   Thu Mar 19 17:02:01 2009 +0100

    Prepare OCaml 3.11 migration
    
    * Set maintainer to Debian OCaml Maintainers
    * Add dh-ocaml build-dependency (rules/ocaml.mk)
    * Upgrade debian/compat to 7
    * Upgrade Standards-Version to 3.8.0 (debian/README.source)
    * Add ${misc:Depends} to dependencies
    * Update debian/copyright file to use
      http://wiki.debian.org/Proposals/CopyrightFormat
    * Remove obsolete debian/control.in related variables and files

diff --git a/debian/README.Debian b/debian/README.Debian
index 5f09ee2..ad13551 100644
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -27,7 +27,7 @@ the unison-gtk package.
 #----------------------------#
 
 This package has been split when Unison 2.10.2 was released. 
-There now exist versions of the package : 
+There now exist 3 versions of the package : 
 - unison, unison-gtk (version 2.27)
 - unison2.13.16, unison2.13.16 (version 2.13.16)
 - unison2.9.1, unison2.9.1-gtk (version 2.9.1)
@@ -52,7 +52,8 @@ system using unison (the good version of unison).
 This scheme continue to apply further (unison 2.13.16 was released in unison
 package and unison2.9.1 was keep in Etch/Sid while Sarge was stable). 
 
-Etch is now released with unison 2.13.16, so unison2.9.1 will be removed.
+Etch has been released with unison 2.13.16, so unison2.9.1 has been removed.
+Lenny has been released with unison 2.27.57, so unison2.13.16 has been removed.
 
  -- Sylvain Le Gall <gildor at debian.org>  Mon, 25 Apr 2005 23:06:44 +0200  
 
diff --git a/debian/README.source b/debian/README.source
new file mode 100644
index 0000000..62605d2
--- /dev/null
+++ b/debian/README.source
@@ -0,0 +1,5 @@
+This package use dpatch for patching the source. 
+
+Please consider reading dpatch manpage to patch the source.
+
+ -- Sylvain Le Gall <gildor at debian.org>  Sun, 22 Jun 2008 23:26:52 +0200
diff --git a/debian/changelog b/debian/changelog
index 12051f2..46a3945 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,16 @@
-unison (2.27.57-2) UNRELEASED; urgency=low
+unison (2.27.57-2) unstable; urgency=low
 
   * Correct typo in documentation, thanks to Lucas B. Cohen 
     (Closes: #137960, #129478, #466173)
   * Switch packaging to git
+  * Set maintainer to Debian OCaml Maintainers
+  * Add dh-ocaml build-dependency (rules/ocaml.mk)
+  * Upgrade debian/compat to 7
+  * Upgrade Standards-Version to 3.8.0 (debian/README.source)
+  * Add ${misc:Depends} to dependencies
+  * Update debian/copyright file to use
+    http://wiki.debian.org/Proposals/CopyrightFormat
+  * Remove obsolete debian/control.in related variables and files
 
  -- Sylvain Le Gall <gildor at debian.org>  Thu, 05 Mar 2009 12:10:11 +0100
 
diff --git a/debian/compat b/debian/compat
index 7ed6ff8..7f8f011 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-5
+7
diff --git a/debian/control b/debian/control
index 2d6b1b4..66d7681 100644
--- a/debian/control
+++ b/debian/control
@@ -1,16 +1,25 @@
 Source: unison
 Section: utils
 Priority: optional
-Maintainer: Sylvain Le Gall <gildor at debian.org>
-Build-Depends: cdbs (>= 0.4.23), debhelper (>= 5), dpatch, ocaml-nox (>= 3.10.0-8), liblablgtk2-ocaml-dev (>= 2.6.0-13), chrpath, librsvg2-bin (>= 2.18.2), imagemagick
-Standards-Version: 3.7.3
+Maintainer: Debian OCaml Maintainers <debian-ocaml-maint at lists.debian.org>
+Uploaders: Sylvain Le Gall <gildor at debian.org>
+Build-Depends: cdbs (>= 0.4.23), 
+ debhelper (>= 7), 
+ dpatch, 
+ ocaml-nox (>= 3.10.0-8), 
+ liblablgtk2-ocaml-dev (>= 2.12.0-2), 
+ chrpath, 
+ librsvg2-bin (>= 2.18.2), 
+ imagemagick,
+ dh-ocaml (>= 0.4.1)
+Standards-Version: 3.8.0
 Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/unison.git
 Vcs-Browser: http://git.debian.org/?p=pkg-ocaml-maint/packages/unison.git
 Homepage: http://www.cis.upenn.edu/~bcpierce/unison/
 
 Package: unison
 Architecture: any
-Depends: ${shlibs:Depends}, ${F:OCamlInterpreter}
+Depends: ${shlibs:Depends}, ${F:OCamlInterpreter}, ${misc:Depends}
 Recommends: ssh-client | openssh-client
 Conflicts: unison (<< 2.9.1-3)
 Description: A file-synchronization tool for Unix and Windows
@@ -35,7 +44,7 @@ Description: A file-synchronization tool for Unix and Windows
 
 Package: unison-gtk
 Architecture: any
-Depends: ${shlibs:Depends}, ${F:OCamlInterpreter}
+Depends: ${shlibs:Depends}, ${F:OCamlInterpreter}, ${misc:Depends}
 Conflicts: unison-gtk (<< 2.9.1-3)
 Recommends: ssh-askpass, ssh-client | openssh-client
 Description: A file-synchronization tool for Unix and Windows with GTK+ interface
diff --git a/debian/copyright b/debian/copyright
index bb47103..d85ed23 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,12 +1,12 @@
-Unison was packaged for Debian
-by Robert McQueen <robot101 at debian.org>
-on Fri, 10 Nov 2000 23:12:02 +0000.
+Format-Specification: http://wiki.debian.org/Proposals/CopyrightFormat
+Upstream-Author: Benjamin Pierce <bcpierce at cis.upenn.edu>
+Packaged-By: Robert McQueen <robot101 at debian.org>
+Packaged-Date: Fri, 10 Nov 2000 23:12:02 +0000
+Original-Source-Location: http://www.cis.upenn.edu/~bcpierce/unison/download/stable/
 
-It was downloaded from:
- http://www.cis.upenn.edu/~bcpierce/unison/download/stable/
-
-Benjamin Pierce <bcpierce at cis.upenn.edu> is the Unison project
-leader.
+Files: *
+Copyright: (C) 200-2009 Benjamin Pierce et al
+License: GPL-2+
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License as
@@ -21,23 +21,11 @@ GNU General Public License for more details.
 On Debian systems, the complete text of the GNU General Public
 License can be found in /usr/share/common-licenses/GPL file.
 
+Files: debian/*
+Copyright: (C) 2006-2009 Sylvain Le Gall 
+License: GPL-2+
 
-debian/unison-gtk.svg:
-Copyright (c) 2007 Eric Lavarde
-
-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 2 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.
-
-On Debian systems, the complete text of the GNU General Public
-License can be found in /usr/share/common-licenses/GPL file.
-
-
-
+Files: debian/unison-gtk.svg
+Copyright: (C) 2007 Eric Lavarde
+License: GPL-2+
 
diff --git a/debian/patches/debbug129478_strings_typo_ignore_regexp.dpatch b/debian/patches/debbug129478_strings_typo_ignore_regexp.dpatch
old mode 100644
new mode 100755
diff --git a/debian/patches/debbug137960_strings_obsolete_ssh_info.dpatch b/debian/patches/debbug137960_strings_obsolete_ssh_info.dpatch
old mode 100644
new mode 100755
diff --git a/debian/patches/debbug466173_strings_typo_follw.dpatch b/debian/patches/debbug466173_strings_typo_follw.dpatch
old mode 100644
new mode 100755
diff --git a/debian/rules b/debian/rules
index c8bbf75..38a623a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,6 +1,6 @@
 #!/usr/bin/make -f
 # debian/rules for unison 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
@@ -19,7 +19,7 @@
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/rules/dpatch.mk
-include /usr/share/cdbs/1/class/ocaml.mk
+include /usr/share/cdbs/1/rules/ocaml.mk
 
 VERSION=$(DEB_UPSTREAM_VERSION)
 # version used with addversionno in unison
@@ -82,8 +82,6 @@ endif
 
 UISTYLE := $(shell dpkg --compare-versions 2.10 ge $(VERSION) && echo gtk || echo gtk2)
 
-CDBS_BUILD_DEPENDS := $(subst ocaml-nox,ocaml-nox (>= 3.10.0-8),$(CDBS_BUILD_DEPENDS))
-
 DEB_INSTALL_DOCS_ALL := BUGS.txt TODO.txt unison-manual.txt -X unison.doc-base.in
 
 DEB_INSTALL_CHANGELOGS_ALL := NEWS 

-- 
unison packaging

