[Pkg-ocaml-maint-commits] r2186 - in
trunk/packages/cocanwiki/trunk: . debian debian/patches
Stefano Zacchiroli
zack at costa.debian.org
Tue Nov 29 22:30:24 UTC 2005
Author: zack
Date: 2005-11-29 22:30:21 +0000 (Tue, 29 Nov 2005)
New Revision: 2186
Added:
trunk/packages/cocanwiki/trunk/debian/patches/
trunk/packages/cocanwiki/trunk/debian/patches/00list
trunk/packages/cocanwiki/trunk/debian/patches/01_build_fix.dpatch
trunk/packages/cocanwiki/trunk/debian/svn-deblayout
Removed:
trunk/packages/cocanwiki/trunk/cocanwiki_1.0.0-rc1.orig.tar.gz
trunk/packages/cocanwiki/trunk/cocanwiki_1.3.11.orig.tar.gz
trunk/packages/cocanwiki/trunk/cocanwiki_1.3.12.orig.tar.gz
trunk/packages/cocanwiki/trunk/cocanwiki_1.3.13.orig.tar.gz
Modified:
trunk/packages/cocanwiki/trunk/debian/
trunk/packages/cocanwiki/trunk/debian/changelog
trunk/packages/cocanwiki/trunk/debian/control
trunk/packages/cocanwiki/trunk/debian/rules
Log:
- ported to ocaml 3.09
- new upstream release
- svn structure
- dpatch
- various debian/control fixes
Deleted: trunk/packages/cocanwiki/trunk/cocanwiki_1.0.0-rc1.orig.tar.gz
===================================================================
(Binary files differ)
Deleted: trunk/packages/cocanwiki/trunk/cocanwiki_1.3.11.orig.tar.gz
===================================================================
(Binary files differ)
Deleted: trunk/packages/cocanwiki/trunk/cocanwiki_1.3.12.orig.tar.gz
===================================================================
(Binary files differ)
Deleted: trunk/packages/cocanwiki/trunk/cocanwiki_1.3.13.orig.tar.gz
===================================================================
(Binary files differ)
Property changes on: trunk/packages/cocanwiki/trunk/debian
___________________________________________________________________
Name: mergeWithUpstream
+ 1
Modified: trunk/packages/cocanwiki/trunk/debian/changelog
===================================================================
--- trunk/packages/cocanwiki/trunk/debian/changelog 2005-11-29 22:05:13 UTC (rev 2185)
+++ trunk/packages/cocanwiki/trunk/debian/changelog 2005-11-29 22:30:21 UTC (rev 2186)
@@ -1,3 +1,19 @@
+cocanwiki (1.3.18-1) unstable; urgency=low
+
+ * new upstream release
+ * rebuilt with ocaml 3.09.0, bumped deps accordingly
+ * made svn structure svn-buildpackage friendly
+ * use dpatch
+ - added 01_build_fix witch fixes FTBFS of this upstream release wrt
+ the latest ocamldbi
+ * debian/control
+ - s/Build-Depends/Build-Depends-Indep/
+ - bumped standards version
+ - fixed formatting errors
+ - removed no longer needed gregoriandate dep
+
+ -- Stefano Zacchiroli <zack at debian.org> Tue, 29 Nov 2005 23:03:44 +0100
+
cocanwiki (1.3.13-1) unstable; urgency=low
* New upstream release.
Modified: trunk/packages/cocanwiki/trunk/debian/control
===================================================================
--- trunk/packages/cocanwiki/trunk/debian/control 2005-11-29 22:05:13 UTC (rev 2185)
+++ trunk/packages/cocanwiki/trunk/debian/control 2005-11-29 22:30:21 UTC (rev 2186)
@@ -1,19 +1,14 @@
Source: cocanwiki
Priority: optional
Maintainer: Richard W.M. Jones <rich at annexia.org>
-Build-Depends: debhelper (>= 4.0.0), libpcre-ocaml-dev, libpgsql-ocaml-dev, libextlib-ocaml-dev, libgregoriandate-ocaml-dev, ocaml-findlib, ocaml-nox-3.08.3, libapache-mod-caml (>= 1.3.3), libtemplate-ocaml-dev (>= 1.3.3), ocamldsort (>= 0.14.2), libcalendar-ocaml-dev (>= 1.09)
-Standards-Version: 3.6.1
+Uploaders: Stefano Zacchiroli <zack at debian.org>
+Build-Depends-Indep: debhelper (>= 4.0.0), libpcre-ocaml-dev (>= 5.10.1), libdbi-ocaml-dev (>= 0.9.12), libextlib-ocaml-dev (>= 1.4-4), ocaml-findlib (>= 1.1), ocaml-nox (>= 3.09.0), libapache-mod-caml (>= 1.3.6-2), libtemplate-ocaml-dev (>= 1.3.6-2), ocamldsort, libcalendar-ocaml-dev (>= 1.09.3-2), dpatch
+Standards-Version: 3.6.2
Package: cocanwiki
Section: web
Architecture: all
-Depends: libpgsql-ocaml, libdbi-ocaml (>= 0.9.9), libpcre-ocaml,
- libgregoriandate-ocaml,
- ocaml-base-nox-3.08.3, libapache-mod-caml (>= 1.3.3),
- libtemplate-ocaml-dev (>= 1.3.3),
- libocamlnet-ocaml-dev (>= 0.98),
- imagemagick, curl (>= 7.12.1),
- libcalendar-ocaml-dev (>= 1.09)
+Depends: libdbi-ocaml (>= 0.9.12), libpcre-ocaml, ocaml-base-nox-3.09.0, libapache-mod-caml (>= 1.3.6-2), libtemplate-ocaml-dev (>= 1.3.6-2), libocamlnet-ocaml-dev (>= 1.1-7), imagemagick, curl (>= 7.12.1), libcalendar-ocaml-dev (>= 1.09.3-2)
Suggests: apache
Recommends: graphviz
Description: A Wiki written in Objective CAML (OCaml)
Added: trunk/packages/cocanwiki/trunk/debian/patches/00list
===================================================================
--- trunk/packages/cocanwiki/trunk/debian/patches/00list 2005-11-29 22:05:13 UTC (rev 2185)
+++ trunk/packages/cocanwiki/trunk/debian/patches/00list 2005-11-29 22:30:21 UTC (rev 2186)
@@ -0,0 +1 @@
+01_build_fix.dpatch
Added: trunk/packages/cocanwiki/trunk/debian/patches/01_build_fix.dpatch
===================================================================
--- trunk/packages/cocanwiki/trunk/debian/patches/01_build_fix.dpatch 2005-11-29 22:05:13 UTC (rev 2185)
+++ trunk/packages/cocanwiki/trunk/debian/patches/01_build_fix.dpatch 2005-11-29 22:30:21 UTC (rev 2186)
@@ -0,0 +1,109 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 01_build_fix.dpatch by Stefano Zacchiroli <zack at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad trunk~/scripts/create_contact.ml trunk/scripts/create_contact.ml
+--- trunk~/scripts/create_contact.ml 2005-11-17 11:14:42.000000000 +0100
++++ trunk/scripts/create_contact.ml 2005-11-29 23:26:22.000000000 +0100
+@@ -63,7 +63,7 @@
+ values (?, ?, ?)" in
+ sth#execute [`Int hostid; `String name; `String subject];
+
+- let contactid = Int64.to_int (sth#serial "contacts_id_seq") in
++ let contactid = sth#serial "contacts_id_seq" in
+
+ let sth = dbh#prepare_cached "insert into contact_emails (contactid, email)
+ values (?, ?)" in
+diff -urNad trunk~/scripts/edit_page_css.ml trunk/scripts/edit_page_css.ml
+--- trunk~/scripts/edit_page_css.ml 2005-11-17 11:14:42.000000000 +0100
++++ trunk/scripts/edit_page_css.ml 2005-11-29 23:26:22.000000000 +0100
+@@ -79,7 +79,7 @@
+ sth#execute [`Int hostid; `String page; title; description;
+ creation_date; logged_ip; logged_user; redirect; css ];
+
+- let pageid = Int64.to_int (sth#serial "pages_id_seq") in
++ let pageid = sth#serial "pages_id_seq" in
+
+ let sth = dbh#prepare_cached "insert into contents (pageid, ordering,
+ sectionname, content, divname)
+diff -urNad trunk~/scripts/lib/cocanwiki_create_host.ml trunk/scripts/lib/cocanwiki_create_host.ml
+--- trunk~/scripts/lib/cocanwiki_create_host.ml 2005-11-17 11:14:43.000000000 +0100
++++ trunk/scripts/lib/cocanwiki_create_host.ml 2005-11-29 23:26:22.000000000 +0100
+@@ -24,7 +24,7 @@
+ open Cgi
+ open Printf
+
+-let create_host dbh canonical_hostname hostnames template
++let create_host (dbh: Dbi.connection) canonical_hostname hostnames template
+ title username password force_password_change email =
+ let sth =
+ dbh#prepare_cached "set constraints hosts_hostname_cn deferred" in
+@@ -33,7 +33,7 @@
+ values (?)" in
+ sth#execute [`String canonical_hostname];
+
+- let hostid = Int64.to_int (sth#serial "hosts_id_seq") in
++ let hostid = sth#serial "hosts_id_seq" in
+
+ let sth = dbh#prepare_cached "insert into hostnames (hostid, name)
+ values (?, ?)" in
+diff -urNad trunk~/scripts/lib/cocanwiki_pages.ml trunk/scripts/lib/cocanwiki_pages.ml
+--- trunk~/scripts/lib/cocanwiki_pages.ml 2005-11-17 11:14:43.000000000 +0100
++++ trunk/scripts/lib/cocanwiki_pages.ml 2005-11-29 23:26:22.000000000 +0100
+@@ -155,7 +155,7 @@
+ `String model.description; logged_ip; logged_user;
+ redirect];
+
+- let pageid = Int64.to_int (sth#serial "pages_id_seq") in
++ let pageid = sth#serial "pages_id_seq" in
+
+ (* Create the page contents. *)
+ let sth = dbh#prepare_cached "insert into contents (pageid,
+@@ -246,7 +246,7 @@
+ logged_user; redirect; css];
+
+ (* New page ID <> old page ID model.id. *)
+- let pageid = Int64.to_int (sth#serial "pages_id_seq") in
++ let pageid = sth#serial "pages_id_seq" in
+
+ (* Create the page contents. *)
+ let sth = dbh#prepare_cached "insert into contents (pageid,
+diff -urNad trunk~/scripts/mail_import.ml trunk/scripts/mail_import.ml
+--- trunk~/scripts/mail_import.ml 2005-11-17 11:14:42.000000000 +0100
++++ trunk/scripts/mail_import.ml 2005-11-29 23:26:22.000000000 +0100
+@@ -172,7 +172,7 @@
+ message_date) values (?, ?, ?, ?)" in
+ sth#execute [`Int hostid; `String subject; `String inet_message_id;
+ `Timestamp (date, time)];
+- let msgid = Int64.to_int (sth#serial "messages_id_seq") in
++ let msgid = sth#serial "messages_id_seq" in
+
+ let sth =
+ dbh#prepare_cached
+diff -urNad trunk~/scripts/restore.ml trunk/scripts/restore.ml
+--- trunk~/scripts/restore.ml 2005-11-21 16:28:39.000000000 +0100
++++ trunk/scripts/restore.ml 2005-11-29 23:26:22.000000000 +0100
+@@ -77,7 +77,7 @@
+ sth#execute [`Int hostid; `String page; title; description;
+ creation_date; logged_ip; logged_user; redirect; css ];
+
+- let pageid = Int64.to_int (sth#serial "pages_id_seq") in
++ let pageid = sth#serial "pages_id_seq" in
+
+ let sth = dbh#prepare_cached "insert into contents (pageid, ordering,
+ sectionname, content, divname)
+diff -urNad trunk~/scripts/signup.ml trunk/scripts/signup.ml
+--- trunk~/scripts/signup.ml 2005-11-17 11:14:42.000000000 +0100
++++ trunk/scripts/signup.ml 2005-11-29 23:26:22.000000000 +0100
+@@ -88,7 +88,7 @@
+ values (?, ?, ?, ?)" in
+ sth#execute [`String username; `String password; email; `Int hostid];
+
+- let userid = Int64.to_int (sth#serial "users_id_seq") in
++ let userid = sth#serial "users_id_seq" in
+
+ (* Create a cookie. *)
+ let cookie = random_sessionid () in
Property changes on: trunk/packages/cocanwiki/trunk/debian/patches/01_build_fix.dpatch
___________________________________________________________________
Name: svn:executable
+ *
Modified: trunk/packages/cocanwiki/trunk/debian/rules
===================================================================
--- trunk/packages/cocanwiki/trunk/debian/rules 2005-11-29 22:05:13 UTC (rev 2185)
+++ trunk/packages/cocanwiki/trunk/debian/rules 2005-11-29 22:30:21 UTC (rev 2186)
@@ -6,19 +6,22 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
+include /usr/share/dpatch/dpatch.make
+
configure: configure-stamp
configure-stamp:
dh_testdir
touch configure-stamp
build: build-stamp
-build-stamp: configure-stamp
+build-stamp: patch-stamp configure-stamp
dh_testdir
$(MAKE)
touch build-stamp
-clean:
+clean: clean1 unpatch
+clean1:
dh_testdir
dh_testroot
rm -f build-stamp configure-stamp
Added: trunk/packages/cocanwiki/trunk/debian/svn-deblayout
===================================================================
--- trunk/packages/cocanwiki/trunk/debian/svn-deblayout 2005-11-29 22:05:13 UTC (rev 2185)
+++ trunk/packages/cocanwiki/trunk/debian/svn-deblayout 2005-11-29 22:30:21 UTC (rev 2186)
@@ -0,0 +1,3 @@
+origDir=../upstream
+origUrl=svn+ssh://svn.debian.org/svn/pkg-ocaml-maint/trunk/packages/cocanwiki/upstream
+tagsUrl=svn+ssh://svn.debian.org/svn/pkg-ocaml-maint/tags/packages/cocanwiki
More information about the Pkg-ocaml-maint-commits
mailing list