Updated debian/ with alioth changes.

diff --git a/debian/changelog b/debian/changelog
index cc7916c..c3c91fd 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-cocanwiki (1.0.0-1) unstable; urgency=low
+cocanwiki (1.1.0-1) unstable; urgency=low
 
   * Initial Release.
 

diff --git a/debian/control b/debian/control
index 0429cfb..6cc63a9 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -1,15 +1,14 @@
 Source: cocanwiki
 Priority: optional
 Maintainer: Richard W.M. Jones <rich@annexia.org>
-Build-Depends: debhelper (>= 4.0.0), libpcre-ocaml-dev, libpgsql-ocaml-dev,
- libextlib-ocaml-dev, ocaml-findlib, ocaml-nox
-Standards-Version: 3.6.0
+Build-Depends: debhelper (>= 4.0.0), libpcre-ocaml-dev, libpgsql-ocaml-dev, libextlib-ocaml-dev, ocaml-findlib, ocaml-nox-3.08, libapache-mod-caml, libtemplate-ocaml-dev
+Standards-Version: 3.6.1
 
 Package: cocanwiki
 Section: web
-Architecture: any
+Architecture: all
 Depends: libpgsql-ocaml, libdbi-ocaml (>= 0.9.9), libpcre-ocaml,
-  ocaml-nox (>= 3.08), imagemagick
+ ocaml-base-nox-3.08, libapache-mod-caml, libtemplate-ocaml-dev, imagemagick
 Suggests: apache
 Description: A Wiki written in Objective CAML (OCaml)
  This is a Wiki written entirely in Objective CAML (OCaml).

diff --git a/debian/copyright b/debian/copyright
index 87a1a25..84f94d2 100644 (file)
--- a/debian/copyright
+++ b/debian/copyright
@@ -5,17 +5,7 @@ Upstream Author: Richard W.M. Jones <rich@annexia.org>
 
 Copyright: Copyright (C) 2004 Merjis Ltd.
 
-    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.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; see the file COPYING.  If not, write to
-    the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-    Boston, MA 02111-1307, USA.
+Copyright by the author and redistributable under the terms of the GNU
+General Public License. On Debian Linux systems, the complete text of
+the GNU General Public License can be found in
+`/usr/share/common-licenses/GPL'.

diff --git a/debian/docs b/debian/docs
index 2e3abae..e845566 100644 (file)
--- a/debian/docs
+++ b/debian/docs
@@ -1,2 +1 @@
-COPYING
 README

diff --git a/debian/rules b/debian/rules
index f7da905..8d3ffe5 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -32,11 +32,6 @@ install: build
        dh_clean -k 
        dh_installdirs
 
-       if [ -x /usr/bin/ocamlopt ]; then \
-               BUILD_OPT=1; \
-       else \
-               BUILD_OPT=0; \
-       fi; \
        $(MAKE) pkg-install DESTDIR=$(CURDIR)/debian/cocanwiki
 
 # Build architecture-independent files here.