[Pkg-ocaml-maint-commits] r3592 - in /trunk/packages/ocsigen:
trunk/debian/ trunk/debian/patches/ upstream/
smimram at users.alioth.debian.org
smimram at users.alioth.debian.org
Sat Mar 3 01:10:02 CET 2007
Author: smimram
Date: Sat Mar 3 00:09:50 2007
New Revision: 3592
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/?sc=1&rev=3592
Log:
New upstream release.
Added:
trunk/packages/ocsigen/upstream/ocsigen_0.6.0~rc1.orig.tar.gz (with props)
Removed:
trunk/packages/ocsigen/trunk/debian/ocsigen.1
trunk/packages/ocsigen/trunk/debian/ocsigen.manpages
trunk/packages/ocsigen/trunk/debian/patches/depend.dpatch
trunk/packages/ocsigen/upstream/ocsigen_0.5.1.orig.tar.gz
Modified:
trunk/packages/ocsigen/trunk/debian/changelog
trunk/packages/ocsigen/trunk/debian/control
trunk/packages/ocsigen/trunk/debian/dirs.in
trunk/packages/ocsigen/trunk/debian/ocsigen.doc-base
trunk/packages/ocsigen/trunk/debian/patches/00list
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=3592&op=diff
==============================================================================
--- trunk/packages/ocsigen/trunk/debian/changelog (original)
+++ trunk/packages/ocsigen/trunk/debian/changelog Sat Mar 3 00:09:50 2007
@@ -1,3 +1,12 @@
+ocsigen (0.6.0~rc1-1) experimental; urgency=low
+
+ * New upstream release.
+ * Bumped build-dependency on libocamlnet-ocaml-dev.
+ * Removed depend.dpatch, integrated upstream.
+ * Removed manpage from package, integrated upstream.
+
+ -- Samuel Mimram <smimram at debian.org> Fri, 2 Mar 2007 20:11:10 +0100
+
ocsigen (0.5.1-2) unstable; urgency=low
* Using dpatch to handle patches.
Modified: trunk/packages/ocsigen/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocsigen/trunk/debian/control?rev=3592&op=diff
==============================================================================
--- trunk/packages/ocsigen/trunk/debian/control (original)
+++ trunk/packages/ocsigen/trunk/debian/control Sat Mar 3 00:09:50 2007
@@ -2,7 +2,7 @@
Section: devel
Priority: optional
Maintainer: Samuel Mimram <smimram at debian.org>
-Build-Depends: debhelper (>= 5), dpatch, ocaml-nox (>= 3.08.4), ocaml-findlib, libocamlnet-ocaml-dev (>= 1.1), libdbi-ocaml-dev, libssl-ocaml-dev (>= 0.4.0-1)
+Build-Depends: debhelper (>= 5), dpatch, ocaml-nox (>= 3.08.4), ocaml-findlib, libocamlnet-ocaml-dev (>= 2.2.4-1), libdbi-ocaml-dev, libssl-ocaml-dev (>= 0.4.0-1)
Standards-Version: 3.7.2
XS-Vcs-Svn: svn://svn.debian.org/svn/pkg-ocaml-maint/trunk/packages/ocsigen
XS-Vcs-Browser: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocsigen/trunk/
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=3592&op=diff
==============================================================================
--- trunk/packages/ocsigen/trunk/debian/dirs.in (original)
+++ trunk/packages/ocsigen/trunk/debian/dirs.in Sat Mar 3 00:09:50 2007
@@ -1,4 +1,5 @@
etc/ocsigen
+etc/logrotate.d
usr/lib/ocaml/@OCamlABI@/ocsigen
usr/lib/ocsigen
usr/share/doc/ocsigen
Modified: trunk/packages/ocsigen/trunk/debian/ocsigen.doc-base
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocsigen/trunk/debian/ocsigen.doc-base?rev=3592&op=diff
==============================================================================
--- trunk/packages/ocsigen/trunk/debian/ocsigen.doc-base (original)
+++ trunk/packages/ocsigen/trunk/debian/ocsigen.doc-base Sat Mar 3 00:09:50 2007
@@ -5,5 +5,5 @@
Section: devel
Format: HTML
-Index: /usr/share/doc/ocsigen/html/index.html
-Files: /usr/share/doc/ocsigen/html/*.html
+Index: /usr/share/doc/ocsigen/html/oc/index.html
+Files: /usr/share/doc/ocsigen/html/oc/*.html
Modified: trunk/packages/ocsigen/trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocsigen/trunk/debian/patches/00list?rev=3592&op=diff
==============================================================================
--- trunk/packages/ocsigen/trunk/debian/patches/00list (original)
+++ trunk/packages/ocsigen/trunk/debian/patches/00list Sat Mar 3 00:09:50 2007
@@ -1,1 +1,0 @@
-depend
Modified: trunk/packages/ocsigen/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocsigen/trunk/debian/rules?rev=3592&op=diff
==============================================================================
--- trunk/packages/ocsigen/trunk/debian/rules (original)
+++ trunk/packages/ocsigen/trunk/debian/rules Sat Mar 3 00:09:50 2007
@@ -14,17 +14,33 @@
OCAMLABI := $(shell ocamlc -version)
OFILES := $(patsubst %.in,%,$(wildcard debian/*.in))
-DESTDIR=$(CURDIR)/debian/ocsigen
+DESTDIR=$(CURDIR)/debian/ocsigen/
ocamlinit:
for f in $(OFILES); do sed -e 's/@OCamlABI@/$(OCAMLABI)/g' $$f.in > $$f; done
-build: patch ocamlinit build-stamp
-build-stamp:
+configure: configure-stamp
+configure-stamp:
dh_testdir
- -$(MAKE) depend all OCSIMORE=YES BINDIR=/usr/bin
+ chmod +x configure
+ ./configure \
+ --prefix $(DESTDIR) \
+ --bindir /usr/bin \
+ --libdir /usr/lib \
+ --mandir /usr/share/man/man1 \
+ --docdir /usr/share/doc \
+ --ocsigen-user ocsigen \
+ --ocsigen-group ocsigen
+
+ touch $@
+
+build: patch ocamlinit build-stamp
+build-stamp: configure-stamp
+ dh_testdir
+
+ #-$(MAKE) depend all OCSIMORE=YES BINDIR=/usr/bin
$(MAKE) all OCSIMORE=YES BINDIR=/usr/bin
$(MAKE) doc OCSIMORE=YES
@@ -37,37 +53,27 @@
-$(MAKE) clean
- dh_clean
+ dh_clean
install: build
dh_testdir
dh_testroot
- dh_clean -k
+ dh_clean -k
dh_installdirs
- $(MAKE) install \
- BINDIR=$(DESTDIR)/usr/bin \
- MODULEINSTALLDIR=$(DESTDIR)/$(shell ocamlc -where) \
- EXAMPLESINSTALLDIR=$(DESTDIR)/usr/lib/ocsigen
+ $(MAKE) fullinstall MODULEINSTALLDIR=$(shell ocamlc -where)
cp -r doc $(DESTDIR)/usr/share/doc/ocsigen/html
- cat files/ocsigen.conf \
- | sed s%_LOGDIR_%/var/log/ocsigen%g \
- | sed s%_STATICPAGESDIR_%/var/www/ocsigen%g \
- | sed s%_OCSIGENUSER_%ocsigen%g \
- | sed s%_OCSIGENGROUP_%ocsigen%g \
- | sed s%_MODULEINSTALLDIR_%$(shell ocamlc -where)/ocsigen%g \
- > $(DESTDIR)/etc/ocsigen/ocsigen.conf
binary-indep: build install
binary-arch: build install
dh_testdir
dh_testroot
- dh_installchangelogs
+ dh_installchangelogs
dh_installdocs
dh_installexamples
dh_install
-# dh_installlogrotate
+ dh_installlogrotate
dh_installinit
dh_installman
dh_link
Added: trunk/packages/ocsigen/upstream/ocsigen_0.6.0~rc1.orig.tar.gz
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocsigen/upstream/ocsigen_0.6.0%7Erc1.orig.tar.gz?rev=3592&op=file
==============================================================================
Binary file - no diff available.
Propchange: trunk/packages/ocsigen/upstream/ocsigen_0.6.0~rc1.orig.tar.gz
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
More information about the Pkg-ocaml-maint-commits
mailing list