[Pkg-ocaml-maint-commits] r4473 - in /trunk/packages/confluence/trunk/debian: README.Debian changelog control copyright doc-base.confluence docs rules watch

treinen at users.alioth.debian.org treinen at users.alioth.debian.org
Sat Sep 8 17:55:20 UTC 2007


Author: treinen
Date: Sat Sep  8 17:55:20 2007
New Revision: 4473

URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/?sc=1&rev=4473
Log:
confluence 0.10.6-5 ready for upload.

Added:
    trunk/packages/confluence/trunk/debian/README.Debian
    trunk/packages/confluence/trunk/debian/doc-base.confluence
Modified:
    trunk/packages/confluence/trunk/debian/changelog
    trunk/packages/confluence/trunk/debian/control
    trunk/packages/confluence/trunk/debian/copyright
    trunk/packages/confluence/trunk/debian/docs
    trunk/packages/confluence/trunk/debian/rules
    trunk/packages/confluence/trunk/debian/watch

Added: trunk/packages/confluence/trunk/debian/README.Debian
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/confluence/trunk/debian/README.Debian?rev=4473&op=file
==============================================================================
--- trunk/packages/confluence/trunk/debian/README.Debian (added)
+++ trunk/packages/confluence/trunk/debian/README.Debian Sat Sep  8 17:55:20 2007
@@ -1,0 +1,11 @@
+This package has been adopted by the Debian Ocaml Maintainers team in
+order to coordinate with future releases of ocaml. Besides this we
+have no particular interest in this package, adoption or other help by
+anyone being interested in this package is most welcome.
+
+Also note that this package has been abandoned by upstream, and that it
+is superseeded by the "atom" project:
+
+http://www.funhdl.org/wiki/doku.php/confluence
+
+ -- Ralf Treinen <treinen at debian.org>, Sat,  8 Sep 2007 19:48:21 +0200

Modified: trunk/packages/confluence/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/confluence/trunk/debian/changelog?rev=4473&op=diff
==============================================================================
--- trunk/packages/confluence/trunk/debian/changelog (original)
+++ trunk/packages/confluence/trunk/debian/changelog Sat Sep  8 17:55:20 2007
@@ -5,10 +5,16 @@
   * Adapted debian/svn-deblayout to the pkg-ocaml directory layout
   * Use dpatch to manage patches, put diff from 0.10.6-4 into 01config.dpatch
   * debian/watch: point now to fundhl.org
-  * debian/rules:
-    - cleanup
+  * debian/rules: cleanup
+  * debian/rules: do not ignore errors of "make clean"
+  * Build-depend on ocaml-nox >= 3.10 in order to force autobuildes to use
+    the right ocaml version.
+  * Standards-Version 3.7.2.2 (no change)
+  * Register documentation with doc-base
+  * Removed package maintainer from debian/copyright.
+  * Explain status of the package in debian/README.Debian.
 
- -- Ralf Treinen <treinen at debian.org>  Wed, 05 Sep 2007 17:39:43 +0200
+ -- Ralf Treinen <treinen at debian.org>  Sat, 08 Sep 2007 19:49:08 +0200
 
 confluence (0.10.6-4) unstable; urgency=low
 

Modified: trunk/packages/confluence/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/confluence/trunk/debian/control?rev=4473&op=diff
==============================================================================
--- trunk/packages/confluence/trunk/debian/control (original)
+++ trunk/packages/confluence/trunk/debian/control Sat Sep  8 17:55:20 2007
@@ -4,9 +4,10 @@
 Maintainer: Debian OCaml Maintainers <debian-ocaml-maint at lists.debian.org>
 Uploaders: Ralf Treinen <treinen at debian.org>, 
  Remi Vanicat <vanicat at debian.org>, Stefano Zacchiroli <zack at debian.org>,
- Samuel Mimram <smimram at debian.org>, Sylvain Le Gall <gildor at debian.org>
-Build-Depends: debhelper (>= 4.0.0), dpatch, txt2man, ocaml-nox
-Standards-Version: 3.6.2
+ Samuel Mimram <smimram at debian.org>, Sylvain Le Gall <gildor at debian.org>,
+ Mike Furr <mfurr at debian.org>, Julien Cristau <julien.cristau at ens-lyon.org>
+Build-Depends: debhelper (>= 4.0.0), dpatch, txt2man, ocaml-nox (>= 3.10)
+Standards-Version: 3.7.2
 XS-Vcs-Svn: svn://svn.debian.org/svn/pkg-ocaml-maint/trunk/packages/confluence
 XS-Vcs-Browser: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/confluence/trunk/
 

Modified: trunk/packages/confluence/trunk/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/confluence/trunk/debian/copyright?rev=4473&op=diff
==============================================================================
--- trunk/packages/confluence/trunk/debian/copyright (original)
+++ trunk/packages/confluence/trunk/debian/copyright Sat Sep  8 17:55:20 2007
@@ -1,6 +1,3 @@
-Package Maintainers:
-  Wesley J. Landaker <wjl at icecavern.net> from Fri, 25 Mar 2005 09:41:23 -0700
-
 Upstream Author: Tom Hawkins <tomahawkins at yahoo.com>
 Upstream Homepage: <http://www.confluent.org>
 

Added: trunk/packages/confluence/trunk/debian/doc-base.confluence
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/confluence/trunk/debian/doc-base.confluence?rev=4473&op=file
==============================================================================
--- trunk/packages/confluence/trunk/debian/doc-base.confluence (added)
+++ trunk/packages/confluence/trunk/debian/doc-base.confluence Sat Sep  8 17:55:20 2007
@@ -1,0 +1,9 @@
+Document: confluence
+Title: Confluence Documentation
+Section: Electronics
+Author: Tom Hawkins
+
+Format: HTML
+Index: /usr/share/doc/confluence/doc/index.html
+Files: /usr/share/doc/confluence/doc/*.html
+

Modified: trunk/packages/confluence/trunk/debian/docs
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/confluence/trunk/debian/docs?rev=4473&op=diff
==============================================================================
--- trunk/packages/confluence/trunk/debian/docs (original)
+++ trunk/packages/confluence/trunk/debian/docs Sat Sep  8 17:55:20 2007
@@ -1,2 +1,3 @@
 NEWS
 src/doc/
+debian/README.Debian

Modified: trunk/packages/confluence/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/confluence/trunk/debian/rules?rev=4473&op=diff
==============================================================================
--- trunk/packages/confluence/trunk/debian/rules (original)
+++ trunk/packages/confluence/trunk/debian/rules Sat Sep  8 17:55:20 2007
@@ -24,7 +24,7 @@
 	dh_testdir
 	dh_testroot
 	rm -f build-stamp configure-stamp
-	-$(MAKE) clean
+	$(MAKE) clean
 	dh_clean cf.1 fnf.1
 
 install: build

Modified: trunk/packages/confluence/trunk/debian/watch
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/confluence/trunk/debian/watch?rev=4473&op=diff
==============================================================================
--- trunk/packages/confluence/trunk/debian/watch (original)
+++ trunk/packages/confluence/trunk/debian/watch Sat Sep  8 17:55:20 2007
@@ -1,2 +1,2 @@
-version=3
+Xversion=3
 http://www.funhdl.org/download/confluence-(.*)\.tar\.gz




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