[Pkg-ocaml-maint-commits] r4786 - in /trunk/packages/ocsigen/trunk/debian: changelog control dirs.in ocsigen-doc.dirs ocsigen-doc.doc-base ocsigen-doc.links ocsigen.dirs.in ocsigen.doc-base rules

smimram at users.alioth.debian.org smimram at users.alioth.debian.org
Sat Nov 17 17:58:23 UTC 2007 

Author: smimram
Date: Sat Nov 17 17:58:23 2007
New Revision: 4786

URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/?sc=1&rev=4786
Log:
Split documentation into ocsigen-doc.

Added:
    trunk/packages/ocsigen/trunk/debian/ocsigen-doc.dirs
    trunk/packages/ocsigen/trunk/debian/ocsigen-doc.doc-base
      - copied, changed from r4730, trunk/packages/ocsigen/trunk/debian/ocsigen.doc-base
    trunk/packages/ocsigen/trunk/debian/ocsigen-doc.links
    trunk/packages/ocsigen/trunk/debian/ocsigen.dirs.in
      - copied unchanged from r4730, trunk/packages/ocsigen/trunk/debian/dirs.in
Removed:
    trunk/packages/ocsigen/trunk/debian/dirs.in
    trunk/packages/ocsigen/trunk/debian/ocsigen.doc-base
Modified:
    trunk/packages/ocsigen/trunk/debian/changelog
    trunk/packages/ocsigen/trunk/debian/control
    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=4786&op=diff
==============================================================================
--- trunk/packages/ocsigen/trunk/debian/changelog (original)
+++ trunk/packages/ocsigen/trunk/debian/changelog Sat Nov 17 17:58:23 2007
@@ -1,3 +1,9 @@
+ocsigen (0.99.3-3) unstable; urgency=low
+
+  * Split documentation into ocsigen-doc, closes: #451517.
+
+ -- Samuel Mimram <smimram at debian.org>  Sat, 17 Nov 2007 17:37:18 +0000
+
 ocsigen (0.99.3-2) unstable; urgency=low
 
   * Upload to unstable.

Modified: trunk/packages/ocsigen/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocsigen/trunk/debian/control?rev=4786&op=diff
==============================================================================
--- trunk/packages/ocsigen/trunk/debian/control (original)
+++ trunk/packages/ocsigen/trunk/debian/control Sat Nov 17 17:58:23 2007
@@ -11,8 +11,20 @@
 Package: ocsigen
 Architecture: any
 Depends: adduser, ${shlibs:Depends}, ocaml-nox-${F:OCamlABI}
+Suggests: ocsigen-doc
 Description: web programming framework in OCaml
  Ocsigen is a programming framework providing a new way to create
  dynamic web sites. With Ocsigen, you program in a concise and modular
  way, with a strong type system which helps you to produce always valid
  xhtml. The server handles sessions and page parameters automatically.
+
+Package: ocsigen-doc
+Architecture: all
+Depends: adduser, ${shlibs:Depends}, ocaml-nox-${F:OCamlABI}
+Description: documentation of ocsigen web programming framework in OCaml
+ Ocsigen is a programming framework providing a new way to create
+ dynamic web sites. With Ocsigen, you program in a concise and modular
+ way, with a strong type system which helps you to produce always valid
+ xhtml. The server handles sessions and page parameters automatically.
+ .
+ This package contains the documentation of the ocsigen modules.

Added: trunk/packages/ocsigen/trunk/debian/ocsigen-doc.dirs
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocsigen/trunk/debian/ocsigen-doc.dirs?rev=4786&op=file
==============================================================================
--- trunk/packages/ocsigen/trunk/debian/ocsigen-doc.dirs (added)
+++ trunk/packages/ocsigen/trunk/debian/ocsigen-doc.dirs Sat Nov 17 17:58:23 2007
@@ -1,0 +1,2 @@
+usr/share/doc/ocsigen-doc
+usr/share/doc/ocsigen

Copied: trunk/packages/ocsigen/trunk/debian/ocsigen-doc.doc-base (from r4730, trunk/packages/ocsigen/trunk/debian/ocsigen.doc-base)
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocsigen/trunk/debian/ocsigen-doc.doc-base?rev=4786&op=diff
==============================================================================
--- trunk/packages/ocsigen/trunk/debian/ocsigen.doc-base (original)
+++ trunk/packages/ocsigen/trunk/debian/ocsigen-doc.doc-base Sat Nov 17 17:58:23 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-doc/html/index.html
+Files: /usr/share/doc/ocsigen-doc/html/*.html

Added: trunk/packages/ocsigen/trunk/debian/ocsigen-doc.links
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocsigen/trunk/debian/ocsigen-doc.links?rev=4786&op=file
==============================================================================
--- trunk/packages/ocsigen/trunk/debian/ocsigen-doc.links (added)
+++ trunk/packages/ocsigen/trunk/debian/ocsigen-doc.links Sat Nov 17 17:58:23 2007
@@ -1,0 +1,1 @@
+usr/share/doc/ocsigen-doc/html usr/share/doc/ocsigen/html

Modified: trunk/packages/ocsigen/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocsigen/trunk/debian/rules?rev=4786&op=diff
==============================================================================
--- trunk/packages/ocsigen/trunk/debian/rules (original)
+++ trunk/packages/ocsigen/trunk/debian/rules Sat Nov 17 17:58:23 2007
@@ -31,7 +31,7 @@
 	    --bindir /usr/bin \
 	    --libdir /usr/lib \
 	    --mandir /usr/share/man/man1 \
-	    --docdir /usr/share/doc \
+	    --docdir /usr/share/doc/ocsigen-doc \
 	    --ocsigen-user ocsigen \
 	    --ocsigen-group ocsigen \
 	    --disable-ocamlduce
@@ -66,12 +66,11 @@
 	$(MAKE) install MODULEINSTALLDIR=$(shell ocamlc -where) CHOWN=true
 	$(MAKE) logrotate
 	rm -f $(DESTDIR)/var/run/ocsigen_command
-	cp -r doc $(DESTDIR)/usr/share/doc/ocsigen/html
+	mv $(DESTDIR)/usr/share/doc/ocsigen-doc/ocsigen debian/ocsigen-doc/usr/share/doc/ocsigen-doc/html
+#	cp -r doc debian/ocsigen-doc/usr/share/doc/ocsigen-doc/html
 	rm -f $(DESTDIR)/var/www/ocsigen/ocsigenstuff/LICENSE
 
-binary-indep: build install
-
-binary-arch: build install
+binary-common:
 	dh_testdir
 	dh_testroot
 	dh_installchangelogs
@@ -91,5 +90,11 @@
 	dh_md5sums
 	dh_builddeb
 
+binary-indep: build install
+	$(MAKE) -f debian/rules DH_OPTIONS=-i binary-common
+
+binary-arch: build install
+	$(MAKE) -f debian/rules DH_OPTIONS=-a binary-common
+
 binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install configure patch unpatch
+.PHONY: build clean binary-common binary-indep binary-arch binary install configure patch unpatch

More information about the Pkg-ocaml-maint-commits mailing list