[Pkg-ocaml-maint-commits] r3404 - in /trunk/packages/ocsigen:
trunk/debian/ upstream/
smimram at users.alioth.debian.org
smimram at users.alioth.debian.org
Sat Dec 9 18:42:00 CET 2006
Author: smimram
Date: Sat Dec 9 18:41:59 2006
New Revision: 3404
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/?sc=1&rev=3404
Log:
New upstream release.
Added:
trunk/packages/ocsigen/upstream/ocsigen_0.5.0.orig.tar.gz (with props)
Removed:
trunk/packages/ocsigen/upstream/ocsigen_0.5.0~rc1.orig.tar.gz
Modified:
trunk/packages/ocsigen/trunk/debian/changelog
trunk/packages/ocsigen/trunk/debian/copyright
trunk/packages/ocsigen/trunk/debian/dirs.in
trunk/packages/ocsigen/trunk/debian/ocsigen.1
trunk/packages/ocsigen/trunk/debian/ocsigen.init
trunk/packages/ocsigen/trunk/debian/ocsigen.postinst
trunk/packages/ocsigen/trunk/debian/rules
Modified: trunk/packages/ocsigen/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocsigen/trunk/debian/changelog?rev=3404&op=diff
==============================================================================
--- trunk/packages/ocsigen/trunk/debian/changelog (original)
+++ trunk/packages/ocsigen/trunk/debian/changelog Sat Dec 9 18:41:59 2006
@@ -1,3 +1,13 @@
+ocsigen (0.5.0-1) unstable; urgency=low
+
+ * New upstream release. Uploading to unstable.
+ * Correctly specifying path for examples, closes: #399885.
+ * Program is now under LGPL with exceptions, updated copyright file.
+ * Ocsigen is now daemonizing and creating pid files by his own, updated
+ init.d script.
+
+ -- Samuel Mimram <smimram at debian.org> Tue, 21 Nov 2006 21:58:25 +0000
+
ocsigen (0.5.0~rc1-1) experimental; urgency=low
* New upstream release.
Modified: trunk/packages/ocsigen/trunk/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocsigen/trunk/debian/copyright?rev=3404&op=diff
==============================================================================
--- trunk/packages/ocsigen/trunk/debian/copyright (original)
+++ trunk/packages/ocsigen/trunk/debian/copyright Sat Dec 9 18:41:59 2006
@@ -9,22 +9,40 @@
License:
- This package 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 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 package 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.
+ 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.
- You should have received a copy of the GNU General Public License
- along with this package; if not, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ You should have received a copy of the GNU Lesser General Public
+ License along with this library; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-On Debian systems, the complete text of the GNU General
-Public License can be found in `/usr/share/common-licenses/GPL'.
+On Debian systems, the complete text of the GNU Lesser General
+Public License can be found in `/usr/share/common-licenses/LGPL'.
+
+This program is released under the LGPL version 2.1 (see the text below) with
+the additional exemption that compiling, linking, and/or using OpenSSL is
+allowed.
+
+As a special exception to the GNU Library General Public License, you
+may also link, statically or dynamically, a "work that uses the Library"
+with a publicly distributed version of the Library to produce an
+executable file containing portions of the Library, and distribute
+that executable file under terms of your choice, without any of the
+additional requirements listed in clause 6 of the GNU Library General
+Public License. By "a publicly distributed version of the Library",
+we mean either the unmodified Library, or a
+modified version of the Library that is distributed under the
+conditions defined in clause 3 of the GNU Library General Public
+License. This exception does not however invalidate any other reasons
+why the executable file might be covered by the GNU Library General
+Public License.
The Debian packaging is (C) 2006, Samuel Mimram <smimram at debian.org> and
is licensed under the GPL, see above.
Modified: trunk/packages/ocsigen/trunk/debian/dirs.in
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocsigen/trunk/debian/dirs.in?rev=3404&op=diff
==============================================================================
--- trunk/packages/ocsigen/trunk/debian/dirs.in (original)
+++ trunk/packages/ocsigen/trunk/debian/dirs.in Sat Dec 9 18:41:59 2006
@@ -1,6 +1,6 @@
etc/ocsigen
usr/lib/ocaml/@OCamlABI@/ocsigen
+usr/lib/ocsigen
usr/share/doc/ocsigen
-usr/share/ocsigen
var/log/ocsigen
var/www/ocsigen
Modified: trunk/packages/ocsigen/trunk/debian/ocsigen.1
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocsigen/trunk/debian/ocsigen.1?rev=3404&op=diff
==============================================================================
--- trunk/packages/ocsigen/trunk/debian/ocsigen.1 (original)
+++ trunk/packages/ocsigen/trunk/debian/ocsigen.1 Sat Dec 9 18:41:59 2006
@@ -15,20 +15,26 @@
xhtml. The server handles sessions and page parameters automatically.
.SH OPTIONS
.TP
-.B \-c
+.BR \-c ,\ \-\-config
Alternate configuration file.
.TP
-.B \-help, \-\-help
+.BR \-d ,\ \-\-daemon
+Daemon mode (detach the process). This is the default when there are more than 1 process.
+.TP
+.BR \-help ,\ \-\-help
Show summary of options.
.TP
-.B \-s
+.BR \-p ,\ \-\-pidfile
+Specify a file where to write the PIDs of the servers.
+.TP
+.BR \-s ,\ \-\-silent
Slient mode (error messages go in errors.log only).
.TP
-.B \-v
+.BR \-v ,\ \-\-verbose
Verbose mode.
.TP
-.B \-vv
-Very verbose mode.
+.B \-V ,\ \-\-veryverbose
+Very verbose mode (debug).
.TP
.B \-version
Show version of program.
Modified: trunk/packages/ocsigen/trunk/debian/ocsigen.init
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocsigen/trunk/debian/ocsigen.init?rev=3404&op=diff
==============================================================================
--- trunk/packages/ocsigen/trunk/debian/ocsigen.init (original)
+++ trunk/packages/ocsigen/trunk/debian/ocsigen.init Sat Dec 9 18:41:59 2006
@@ -18,6 +18,7 @@
DAEMON=/usr/bin/ocsigen
NAME=ocsigen
DESC=ocsigen
+PIDFILE=/var/run/$NAME.pid
test -x $DAEMON || exit 0
@@ -36,21 +37,14 @@
fi
echo -n "Starting $DESC: "
- start-stop-daemon --start --quiet --background \
- --pidfile /var/run/$NAME.pid --make-pidfile \
- --exec $DAEMON -- $DAEMON_OPTS
+ $DAEMON --daemon --pidfile $PIDFILE $DAEMON_OPTS
echo "$NAME."
;;
stop)
echo -n "Stopping $DESC: "
- start-stop-daemon --stop --quiet --oknodo --pidfile /var/run/$NAME.pid \
- --exec $DAEMON
+ for pid in `cat $PIDFILE`; do kill $pid || true; done
+ rm -f $PIDFILE
echo "$NAME."
- ;;
- reload)
- echo "Reloading $DESC configuration files."
- start-stop-daemon --stop --signal 1 --quiet --pidfile \
- /var/run/$NAME.pid --exec $DAEMON
;;
restart|force-reload)
$0 stop
@@ -58,7 +52,7 @@
;;
*)
N=/etc/init.d/$NAME
- echo "Usage: $N {start|stop|restart|reload|force-reload|force-start}" >&2
+ echo "Usage: $N {start|stop|restart|force-reload|force-start}" >&2
exit 1
;;
esac
Modified: trunk/packages/ocsigen/trunk/debian/ocsigen.postinst
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocsigen/trunk/debian/ocsigen.postinst?rev=3404&op=diff
==============================================================================
--- trunk/packages/ocsigen/trunk/debian/ocsigen.postinst (original)
+++ trunk/packages/ocsigen/trunk/debian/ocsigen.postinst Sat Dec 9 18:41:59 2006
@@ -54,9 +54,7 @@
###
# 4. Change ownership of directory.
-$CHOWN -R $OCSIGEN:$OCSIGEN /usr/share/ocsigen/
$CHOWN -R $OCSIGEN:$OCSIGEN /var/log/ocsigen/
-#$CHOWN -R $OCSIGEN:$OCSIGEN /var/run/ocsigen/
$CHOWN -R $OCSIGEN:$OCSIGEN /var/www/ocsigen/
###
Modified: trunk/packages/ocsigen/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocsigen/trunk/debian/rules?rev=3404&op=diff
==============================================================================
--- trunk/packages/ocsigen/trunk/debian/rules (original)
+++ trunk/packages/ocsigen/trunk/debian/rules Sat Dec 9 18:41:59 2006
@@ -43,7 +43,10 @@
dh_clean -k
dh_installdirs
- $(MAKE) install BINDIR=$(DESTDIR)/usr/bin MODULEINSTALLDIR=$(DESTDIR)/$(shell ocamlc -where)
+ $(MAKE) install \
+ BINDIR=$(DESTDIR)/usr/bin \
+ MODULEINSTALLDIR=$(DESTDIR)/$(shell ocamlc -where) \
+ EXAMPLESINSTALLDIR=$(DESTDIR)/usr/lib/ocsigen
cp -r doc $(DESTDIR)/usr/share/doc/ocsigen/html
cat files/ocsigen.conf \
| sed s%_LOGDIR_%/var/log/ocsigen%g \
Added: trunk/packages/ocsigen/upstream/ocsigen_0.5.0.orig.tar.gz
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocsigen/upstream/ocsigen_0.5.0.orig.tar.gz?rev=3404&op=file
==============================================================================
Binary file - no diff available.
Propchange: trunk/packages/ocsigen/upstream/ocsigen_0.5.0.orig.tar.gz
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
More information about the Pkg-ocaml-maint-commits
mailing list