[Pkg-ocaml-maint-commits] [SCM] dose3 packaging branch, master, updated. debian/3.0.1-1-6-ge953786
The following commit has been merged in the master branch: commit 3e91f69ffc89817c90c6217d46fd3edd5b392cd1 Merge: 54c1fe9788a7f7618abb5c4597c29d9008e0a51b 7c7424c7110691381b0f71b559936a800bcd8437 Author: Ralf Treinen trei...@debian.org Date: Mon Jun 25 15:45:10 2012 +0200 Merge tag 'upstream/3.0.2' Upstream version 3.0.2 -- dose3 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
[Pkg-ocaml-maint-commits] [SCM] dose3 packaging branch, master, updated. debian/3.0.1-1-6-ge953786
The following commit has been merged in the master branch: commit c6272df4177c28d297f0a68d7ba9e52e0416ddde Author: Ralf Treinen trei...@debian.org Date: Mon Jun 25 15:46:02 2012 +0200 upstream 3.0.2 diff --git a/debian/changelog b/debian/changelog index 726fab1..6b0197e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +dose3 (3.0.2-1) unstable; urgency=low + + * New upstream version. + + -- Ralf Treinen trei...@debian.org Mon, 25 Jun 2012 15:45:39 +0200 + dose3 (3.0.1-1) unstable; urgency=low * New upstream version -- dose3 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
[Pkg-ocaml-maint-commits] [SCM] dose3 packaging branch, master, updated. debian/3.0.1-1-6-ge953786
The following commit has been merged in the master branch: commit 4a84c0151a82ce759ba643b1b618e39ae8132028 Author: Ralf Treinen trei...@debian.org Date: Mon Jun 25 15:51:32 2012 +0200 drop patch manpage-distcheck since it has been integrated upstream now diff --git a/debian/changelog b/debian/changelog index 6b0197e..06864a1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,9 @@ dose3 (3.0.2-1) unstable; urgency=low * New upstream version. + * Remove patch manpage-distcheck which has been applied upstream - -- Ralf Treinen trei...@debian.org Mon, 25 Jun 2012 15:45:39 +0200 + -- Ralf Treinen trei...@debian.org Mon, 25 Jun 2012 15:50:56 +0200 dose3 (3.0.1-1) unstable; urgency=low diff --git a/debian/patches/manpage-distcheck b/debian/patches/manpage-distcheck deleted file mode 100644 index 1bc53dd..000 --- a/debian/patches/manpage-distcheck +++ /dev/null @@ -1,40 +0,0 @@ -Author: Ralf Treinen trei...@debian.org -Description: improve description of multiarch options - -Index: dose3/doc/manpages/distcheck.pod -=== dose3.orig/doc/manpages/distcheck.pod 2012-06-17 13:45:59.0 +0200 -+++ dose3/doc/manpages/distcheck.pod 2012-06-17 13:47:56.0 +0200 -@@ -136,22 +136,22 @@ - - =head2 DEBIAN SPECIFIC OPTIONS - --=over 8 -+Multi-arch annotations are correctly considered by distcheck. Packages -+whose's architecture is neither the native architecture nor in the list -+of foreign architectures (see below) are ignored. - --Multi-arch annotations are correctly considered by distcheck. Since the from a --set of control stanzas it is impossible to determine the native and foreign --architectures, the user can specify them using the following options. By --default the native architecture is deduced by looking at the architecture of --the first stanza that is not architecture all. All other packages with --different architecture are ignored. -+=over 8 - - =item B--deb-native-arch=Iname - --Specify the native architecture. -+Specify the native architecture. The default behavior is to deduce -+the native architecture from the first package stanza in the input -+that has an architecture different from all. - --=item B--deb-foreign-archs=Iname -+=item B--deb-foreign-archs=Iname [,Iname] ... - --Specify a comma-separated list of foreign architectures. -+Specify a comma-separated list of foreign architectures. The default -+is an empty list of foreign architectures. - - =item B--deb-ignore-essential - diff --git a/debian/patches/series b/debian/patches/series index 190adde..9dceec7 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +1 @@ binaries-prefix-edos -manpage-distcheck -- dose3 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
[Pkg-ocaml-maint-commits] [SCM] dose3 packaging branch, master, updated. debian/3.0.1-1-6-ge953786
The following commit has been merged in the master branch: commit 0e4ea4477550d194fc3b0589301ef02910dec760 Author: Ralf Treinen trei...@debian.org Date: Mon Jun 25 15:58:15 2012 +0200 fix debian/licence continuation lines were missing in licence paragraphe 'connection-licence' diff --git a/debian/changelog b/debian/changelog index 06864a1..bfb58d3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,11 @@ dose3 (3.0.2-1) unstable; urgency=low - * New upstream version. - * Remove patch manpage-distcheck which has been applied upstream + * New upstream version: +- Remove patch manpage-distcheck which has been applied upstream + * debian/copyright: fix continuation lines in the paragraph for +connection-licence. - -- Ralf Treinen trei...@debian.org Mon, 25 Jun 2012 15:50:56 +0200 + -- Ralf Treinen trei...@debian.org Mon, 25 Jun 2012 15:57:25 +0200 dose3 (3.0.1-1) unstable; urgency=low diff --git a/debian/copyright b/debian/copyright index 8c9549b..0f581b2 100644 --- a/debian/copyright +++ b/debian/copyright @@ -54,11 +54,11 @@ License: connection-licence This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages arising from the use of this software. - + . Permission is granted to anyone to use this software for any purpose, including commercial applications, and to alter it and redistribute it freely, subject to the following restrictions: - + . 1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be -- dose3 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
[Pkg-ocaml-maint-commits] [SCM] dose3 packaging branch, master, updated. debian/3.0.1-1-6-ge953786
The following commit has been merged in the master branch: commit e953786413ecfcf73abf369329ed8cf82dbef3b2 Author: Ralf Treinen trei...@debian.org Date: Mon Jun 25 16:07:41 2012 +0200 fix typo in debian/copyright diff --git a/debian/changelog b/debian/changelog index bfb58d3..87e02de 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,8 +2,9 @@ dose3 (3.0.2-1) unstable; urgency=low * New upstream version: - Remove patch manpage-distcheck which has been applied upstream - * debian/copyright: fix continuation lines in the paragraph for -connection-licence. + * debian/copyright: +- fix continuation lines in the paragraph for connection-licence. +- fix typo Licence - License -- Ralf Treinen trei...@debian.org Mon, 25 Jun 2012 15:57:25 +0200 diff --git a/debian/copyright b/debian/copyright index 0f581b2..8447a94 100644 --- a/debian/copyright +++ b/debian/copyright @@ -37,7 +37,7 @@ License: LGPL-3+ Files: db/sqlite/sqlitext/connection.h Copyright: (C) 2004-2006 Gerhard Häring g...@ghaering.de -Licence: connection-licence +License: connection-licence License: LGPL-3+ This library is free software: you can redistribute it and/or modify -- dose3 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
