--- nurpawiki-1.2.2.orig/debian/README.source +++ nurpawiki-1.2.2/debian/README.source @@ -0,0 +1,16 @@ +Nurpawiki Debian source package +=============================== + +Patching upstream sources +------------------------- + +This source package uses quilt to apply and remove its patches. Please +refer to `/usr/share/doc/quilt/README.source' for information about +how to use quilt for source packages. + +The quilt series is generated from the Git repository, using +dom-{apply,save}-patches, from the dh-ocaml (>= 0.4.2) package. Please +refer to the appendix about Git in the Debian OCaml Packaging Policy +(from the same package). + + -- Stephane Glondu , Sun, 21 Jun 2009 01:50:10 +0200 --- nurpawiki-1.2.2.orig/debian/changelog +++ nurpawiki-1.2.2/debian/changelog @@ -0,0 +1,28 @@ +nurpawiki (1.2.2-4) unstable; urgency=low + + * Patch upstream to build and install native plugin + * Add dependency to quilt and README.source + * Update Standards-Version to 3.8.2 + * Add versioned dependency to ocsigen-dev to ease OCaml 3.11.1 + transition + + -- Stephane Glondu Thu, 09 Jul 2009 23:42:46 +0200 + +nurpawiki (1.2.2-3) unstable; urgency=low + + * Add debian/gbp.conf to force use of pristine-tar + * Update Standards-Version to 3.8.1 (no changes) + + -- Stephane Glondu Wed, 01 Apr 2009 23:28:50 +0200 + +nurpawiki (1.2.2-2) experimental; urgency=low + + * Fix generation of OCaml ABI dependency + + -- Stephane Glondu Fri, 12 Dec 2008 11:25:42 +0100 + +nurpawiki (1.2.2-1) experimental; urgency=low + + * Initial release (Closes: #500726) + + -- Stephane Glondu Fri, 14 Nov 2008 13:40:40 +0100 --- nurpawiki-1.2.2.orig/debian/ocsigen.conf.template +++ nurpawiki-1.2.2/debian/ocsigen.conf.template @@ -0,0 +1,33 @@ + + + 8080 + /var/log/ocsigen + /var/lib/ocsigen + + ocsigen + ocsigen + + UTF-8 + + + + + + + + + + + + + + + + + + + + + + + --- nurpawiki-1.2.2.orig/debian/copyright +++ nurpawiki-1.2.2/debian/copyright @@ -0,0 +1,45 @@ +Packaged-By: Stéphane Glondu +Packaged-Date: Thu, 25 Sep 2008 13:53:53 +0200 +Original-Source-Location: http://code.google.com/p/nurpawiki/ + +Files: * +Copyright: © 2006-2008 Janne Hellsten +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 + 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. + If not, see . + + The complete text of the GNU General Public License can be found in + `/usr/share/common-licenses/GPL-2'. + +Files: files/jscalendar/* +Copyright: © 2002-2005 Mihai Bazon, Dynarch.com +License: LGPL-2.1+ + + Original website is at http://dynarch.com/mishoo/. + + This library is free software; you can redistribute it and/or modify + it under the terms of the GNU Lesser General Public License as + published by the Free Software Foundation; either version 2.1 of the + License, or (at your option) any later version. + + This library 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 + Lesser General Public License for more details. + + The complete text of the GNU Lesser General Public License can be found in + `/usr/share/common-licenses/LGPL-2.1'. + +Files: debian/* +Copyright: © 2008 Stéphane Glondu +License: GPL-2+ --- nurpawiki-1.2.2.orig/debian/watch +++ nurpawiki-1.2.2/debian/watch @@ -0,0 +1,6 @@ +# See uscan(1) for format + +# Compulsory line, this is a version 3 file +version=3 + +http://code.google.com/p/nurpawiki/ http://nurpawiki\.googlecode\.com/files/nurpawiki-(.*)\.tar\.gz --- nurpawiki-1.2.2.orig/debian/control +++ nurpawiki-1.2.2/debian/control @@ -0,0 +1,40 @@ +Source: nurpawiki +Priority: extra +Maintainer: Debian OCaml Maintainers +Uploaders: Stephane Glondu +DM-Upload-Allowed: yes +Build-Depends: + debhelper (>= 7.0.52), + quilt (>= 0.46-7), + dh-ocaml, + ocsigen-dev (>= 1.2.0), + libcalendar-ocaml-dev, + libextlib-ocaml-dev, + libpostgresql-ocaml-dev, + ocaml-nox (>= 3.11) +Standards-Version: 3.8.2 +Section: web +Homepage: http://code.google.com/p/nurpawiki/ +Vcs-Browser: http://git.debian.org/?p=pkg-ocaml-maint/packages/nurpawiki.git +Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/nurpawiki.git + +Package: nurpawiki +Architecture: any +Depends: + ${shlibs:Depends}, + ${misc:Depends}, + ocaml-base-nox-${F:OCamlABI}, + libcalendar-ocaml-dev, + libextlib-ocaml-dev, + libpostgresql-ocaml-dev, + ocsigen (>= 1.1.0) +Suggests: + postgresql +Description: Wiki with integrated to-do list and scheduler + Nurpawiki is a personal information manager (PIM) application that + combines a wiki, a to-do list and a simple scheduler to help you get + organized. It aims to ease note taking and action planning. Actions + (to-dos) are always associated with notes or plans (wiki pages). + . + Nurpawiki is available as an Eliom module for the Ocsigen web server, + and uses PostgreSQL as backend. --- nurpawiki-1.2.2.orig/debian/gbp.conf +++ nurpawiki-1.2.2/debian/gbp.conf @@ -0,0 +1,2 @@ +[DEFAULT] +pristine-tar = True --- nurpawiki-1.2.2.orig/debian/nurpawiki.examples +++ nurpawiki-1.2.2/debian/nurpawiki.examples @@ -0,0 +1 @@ +debian/ocsigen.conf.template --- nurpawiki-1.2.2.orig/debian/nurpawiki.dirs +++ nurpawiki-1.2.2/debian/nurpawiki.dirs @@ -0,0 +1,2 @@ +usr/lib/ocsigen +usr/share/ocsigen/nurpawiki --- nurpawiki-1.2.2.orig/debian/rules +++ nurpawiki-1.2.2/debian/rules @@ -0,0 +1,38 @@ +#!/usr/bin/make -f +# -*- makefile -*- +include /usr/share/ocaml/ocamlinit.mk + +# For ocamlfind +export OCAMLFIND_DESTDIR := debian/nurpawiki/usr/lib/ocsigen + +%: + dh --with quilt $@ + +.PHONY: override_dh_auto_build +override_dh_auto_build: ocamlinit + make +ifeq ($(OCAML_HAVE_OCAMLOPT),yes) + make nurpawiki.cmxs +endif + +.PHONY: override_dh_auto_install +override_dh_auto_install: + install -d $(OCAMLFIND_DESTDIR) + make install + +.PHONY: override_dh_install +override_dh_install: + dh_install +# Fix ugly permissions + chmod 644 debian/nurpawiki/usr/share/ocsigen/nurpawiki/*.png +# Small hack to prevent a runtime dependency on libpcre-ocaml which is +# statically linked in ocsigen + sed -i 's/,pcre//' $(OCAMLFIND_DESTDIR)/nurpawiki/META + +.PHONY: override_dh_gencontrol +override_dh_gencontrol: + dh_gencontrol -- -VF:OCamlABI="$(OCAML_ABI)" + +.PHONY: override_dh_auto_clean +override_dh_auto_clean: ocamlinit-clean + make clean --- nurpawiki-1.2.2.orig/debian/nurpawiki.install.in +++ nurpawiki-1.2.2/debian/nurpawiki.install.in @@ -0,0 +1,2 @@ +files/* usr/share/ocsigen/nurpawiki/ +OPT: nurpawiki.cmxs usr/lib/ocsigen/nurpawiki --- nurpawiki-1.2.2.orig/debian/README.Debian +++ nurpawiki-1.2.2/debian/README.Debian @@ -0,0 +1,63 @@ +Nurpawiki for Debian +-------------------- + + +1. Setting up Nurpawiki +~~~~~~~~~~~~~~~~~~~~~~~ + +To use Nurpwaki, you first need to set up a PostgreSQL database. With +Lenny's PostgreSQL (version 8.3), the steps on the SQL server are (as +user postgres): + + 1. Create a user in the database: + createuser ${DBUSER} + 2. Create the database for Nurpawiki: + createdb -O ${DBUSER} -E UTF-8 ${DBNAME} + 3. Set a password for the user accessing the database: + psql ${DBNAME} ${DBUSER} + ALTER ${DBUSER} PASSWORD '${DBPASSWORD}'; + \q + +You can take, for example, DBUSER=ocsigen and DBNAME=nurpawiki (beware +of commands executed in psql shell). The schema.psql file is available +in /usr/share/doc/nurpawiki. + +A sample template for a configuration file is available in +/usr/share/doc/nurpawiki/examples. Filling it with proper database +user, database name and password will give you a that can be +run with "ocsigen -c " (as root). Ocsigen will then be listening +on port 8080, as user ocsigen, and be serving Nurpawiki only (at +/). If satisfied, and if you don't use any other Ocsigen-based +service, you can directly use that configuration file as +/etc/ocsigen/ocsigen.conf and use the initscript to launch ocsigen. Of +course, Nurpawiki can be used with other Ocsigen-based services, but +you'll have to edit /etc/ocsigen.conf yourself. + +At installation, a wiki user "admin" with an empty password is created. + + +2. Websites +~~~~~~~~~~~ + + Tutorial on using Nurpawiki: + http://code.google.com/p/nurpawiki/wiki/Tutorial + + Nurpawiki project page (use Issues tab for bug reporting): + http://code.google.com/p/nurpawiki/ + + Ocsigen project page: + http://ocsigen.org/ + + +3. Known limitations +~~~~~~~~~~~~~~~~~~~~ + +Nurpawiki can only be used with a local PostgreSQL database and +doesn't handle ident (socket-based) authentication. This is merely a +configuration limitation and should be easy to fix if need be. + +Ocsigen provides a /etc/ocsigen/conf.d directory for easy splitting of +the configuration but the default /etc/ocsigen/ocsigen.conf provided +by the ocsigen package makes it useless. This is the reason why the +configuration part is still a bit tricky (this will hopefully be fixed +in the future). --- nurpawiki-1.2.2.orig/debian/nurpawiki.docs +++ nurpawiki-1.2.2/debian/nurpawiki.docs @@ -0,0 +1 @@ +schema.psql --- nurpawiki-1.2.2.orig/debian/compat +++ nurpawiki-1.2.2/debian/compat @@ -0,0 +1 @@ +7 --- nurpawiki-1.2.2.orig/debian/clean +++ nurpawiki-1.2.2/debian/clean @@ -0,0 +1,2 @@ +META +version.ml --- nurpawiki-1.2.2.orig/debian/patches/series +++ nurpawiki-1.2.2/debian/patches/series @@ -0,0 +1 @@ +0001-Build-native-plugin.patch --- nurpawiki-1.2.2.orig/debian/patches/0001-Build-native-plugin.patch +++ nurpawiki-1.2.2/debian/patches/0001-Build-native-plugin.patch @@ -0,0 +1,58 @@ +From: Stephane Glondu +Date: Sun, 21 Jun 2009 01:44:42 +0200 +Subject: [PATCH] Build native plugin + +--- + META.in | 3 ++- + Makefile | 9 +++++++-- + 2 files changed, 9 insertions(+), 3 deletions(-) + +diff --git a/META.in b/META.in +index b66410c..7fcc3c7 100644 +--- a/META.in ++++ b/META.in +@@ -1,3 +1,4 @@ + requires = "unix,extlib,postgresql,calendar,pcre,str" + version = "%_NURPAWIKI_VERSION_%" +-archive(byte) = "nurpawiki.cma" ++archive(plugin,byte) = "nurpawiki.cma" ++archive(plugin,native) = "nurpawiki.cmxs" +diff --git a/Makefile b/Makefile +index 03383c2..3f3ec6b 100644 +--- a/Makefile ++++ b/Makefile +@@ -8,14 +8,20 @@ CAMLDEP = ocamlfind ocamldep + LIB = -package threads,netstring,calendar,extlib,postgresql,ocsigen + + OBJS = $(FILES:.ml=.cmo) ++OBJX = $(FILES:.ml=.cmx) + + CMA = nurpawiki.cma ++CMX = nurpawiki.cmx + + all: $(CMA) META + + $(CMA): $(OBJS) + $(CAMLC) -a -o $(CMA) $(OBJS) + ++$(CMX)s $(CMX)a: $(OBJX) ++ $(CAMLOPT) -a -o $(CMX)a $(OBJX) ++ $(CAMLOPT) -shared -linkall -o $(CMX)s $(CMX)a ++ + .SUFFIXES: + .SUFFIXES: .ml .mli .cmo .cmi .cmx + +@@ -43,11 +49,10 @@ doc: + # $(CAMLDOC) -d doc -html db.mli + + clean: +- -rm -f *.cm[ioxa] *~ $(NAME) ++ -rm -f *.cm[ioxa] *~ *.[oa] *.cmx[as] $(NAME) + + install: + ocamlfind install nurpawiki META $(CMA) + + depend: + $(CAMLDEP) $(PP) $(LIB) $(FILES:.ml=.mli) $(FILES) > .depend +- +--