[Pkg-ocaml-maint-commits] r5836 - in /trunk/packages/ocsigen/trunk/debian: changelog ocsigen.dirs ocsigen.install ocsigen.postinst rules

[glondu-guest at users.alioth.debian.org]

Author: glondu-guest
Date: Mon Jul  7 11:52:55 2008
New Revision: 5836

URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/?sc=1&rev=5836
Log:
Do not ship files under /var/www (as complained by lintian)
(Closes: #485566).

Modified:
    trunk/packages/ocsigen/trunk/debian/changelog
    trunk/packages/ocsigen/trunk/debian/ocsigen.dirs
    trunk/packages/ocsigen/trunk/debian/ocsigen.install
    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=5836&op=diff
==============================================================================
--- trunk/packages/ocsigen/trunk/debian/changelog (original)
+++ trunk/packages/ocsigen/trunk/debian/changelog Mon Jul  7 11:52:55 2008
@@ -6,8 +6,10 @@
   * Add support for update hooks in /etc/ocsigen/update.d.
   * Add DM-Upload-Allowed field to debian/control.
   * Ship .mli files in ocsigen-dev.
+  * Do not ship files under /var/www (as complained by lintian)
+    (Closes: #485566).
 
- -- Stephane Glondu <steph at glondu.net>  Mon, 07 Jul 2008 11:38:26 +0200
+ -- Stephane Glondu <steph at glondu.net>  Mon, 07 Jul 2008 13:24:46 +0200
 
 ocsigen (1.0.0-1) unstable; urgency=low
 

Modified: trunk/packages/ocsigen/trunk/debian/ocsigen.dirs
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocsigen/trunk/debian/ocsigen.dirs?rev=5836&op=diff
==============================================================================
--- trunk/packages/ocsigen/trunk/debian/ocsigen.dirs (original)
+++ trunk/packages/ocsigen/trunk/debian/ocsigen.dirs Mon Jul  7 11:52:55 2008
@@ -4,4 +4,3 @@
 usr/share/doc/ocsigen
 var/lib/ocsigen
 var/log/ocsigen
-var/www/ocsigen

Modified: trunk/packages/ocsigen/trunk/debian/ocsigen.install
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocsigen/trunk/debian/ocsigen.install?rev=5836&op=diff
==============================================================================
--- trunk/packages/ocsigen/trunk/debian/ocsigen.install (original)
+++ trunk/packages/ocsigen/trunk/debian/ocsigen.install Mon Jul  7 11:52:55 2008
@@ -3,6 +3,6 @@
 usr/bin
 usr/lib/ocsigen
 usr/share/man
+usr/share/ocsigen
 var/lib/ocsigen
 var/log/ocsigen
-var/www/ocsigen

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=5836&op=diff
==============================================================================
--- trunk/packages/ocsigen/trunk/debian/ocsigen.postinst (original)
+++ trunk/packages/ocsigen/trunk/debian/ocsigen.postinst Mon Jul  7 11:52:55 2008
@@ -42,11 +42,11 @@
 #    Issue a warning if it fails.
   if $GROUPMOD $OCSIGEN > /dev/null 2>&1; then
     # group already exists, use --ingroup
-    if ! $ADDUSER --system --disabled-password --disabled-login --home /var/www/ocsigen --no-create-home --ingroup $OCSIGEN $OCSIGEN; then
+    if ! $ADDUSER --system --disabled-password --disabled-login --home /var/lib/ocsigen --no-create-home --ingroup $OCSIGEN $OCSIGEN; then
       echo "The adduser command failed."
     fi
   else
-    if ! $ADDUSER --system --disabled-password --disabled-login --home /var/www/ocsigen --no-create-home --group $OCSIGEN; then
+    if ! $ADDUSER --system --disabled-password --disabled-login --home /var/lib/ocsigen --no-create-home --group $OCSIGEN; then
       echo "The adduser command failed."
     fi
   fi
@@ -58,7 +58,6 @@
 $CHOWN -R $OCSIGEN:$OCSIGEN /var/lib/ocsigen/
 $CHMOD 750 /var/lib/ocsigen/
 $CHOWN -R $OCSIGEN:$OCSIGEN /var/log/ocsigen/
-$CHOWN -R $OCSIGEN:$OCSIGEN /var/www/ocsigen/
 
 ###
 # 5. Call update hooks

Modified: trunk/packages/ocsigen/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocsigen/trunk/debian/rules?rev=5836&op=diff
==============================================================================
--- trunk/packages/ocsigen/trunk/debian/rules (original)
+++ trunk/packages/ocsigen/trunk/debian/rules Mon Jul  7 11:52:55 2008
@@ -32,6 +32,7 @@
 	    --libdir /usr/lib \
 	    --mandir /usr/share/man/man1 \
 	    --docdir /usr/share/doc \
+	    --staticpagesdir /usr/share \
 	    --ocsigen-user ocsigen \
 	    --ocsigen-group ocsigen \
 	    --disable-ocamlduce
@@ -72,7 +73,7 @@
 	$(MAKE) logrotate
 	mv $(DESTDIR)/usr/share/doc/ocsigen debian/ocsigen-doc/usr/share/doc/ocsigen-doc/html
 	rm -f $(DESTDIR)/var/run/ocsigen_command
-	rm -f $(DESTDIR)/var/www/ocsigen/ocsigenstuff/LICENSE
+	rm -f $(DESTDIR)/usr/share/ocsigen/ocsigenstuff/LICENSE
 
 binary-common:
 	dh_testdir