tags 553553 + pending
thanks

Dear maintainer,

I've prepared an NMU for phpsysinfo (versioned as 3.0~rc6-1.1) and
uploaded it to DELAYED/2, according to devref §5.11.1. The patch is
based on the one proposed by Mats Erik Andersson in this bug log;
additionally, it provides a README.Debian with a couple of sample
configuration snippets for Apache2 and Lighttpd (provided by Mats as
well).

Regards.

-- 
Stefano Zacchiroli -o- PhD in Computer Science \ PostDoc @ Univ. Paris 7
z...@{upsilon.cc,pps.jussieu.fr,debian.org} -<>- http://upsilon.cc/zack/
Dietro un grande uomo c'è ..|  .  |. Et ne m'en veux pas si je te tutoie
sempre uno zaino ...........| ..: |.... Je dis tu à tous ceux que j'aime
diff -u phpsysinfo-3.0~rc6/debian/changelog phpsysinfo-3.0~rc6/debian/changelog
--- phpsysinfo-3.0~rc6/debian/changelog
+++ phpsysinfo-3.0~rc6/debian/changelog
@@ -1,3 +1,15 @@
+phpsysinfo (3.0~rc6-1.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Fix dir-or-file-in-var-www bug, based on a patch from Mats Erik
+    Andersson, thanks! (Closes: #553553)
+    - debian/rules: avoid linking linked /var/www/phpsysinfo to
+      /usr/share/phpsysinfo
+    - debian/NEWS: explain change in behaviour, point to README.Debian
+    - debian/README.Debian: provide sampe configuration snippets
+
+ -- Stefano Zacchiroli <z...@debian.org>  Sat, 20 Feb 2010 12:29:03 +0100
+
 phpsysinfo (3.0~rc6-1) unstable; urgency=low
 
   * New upstream release. (Closes: #473255, #489791)
diff -u phpsysinfo-3.0~rc6/debian/rules phpsysinfo-3.0~rc6/debian/rules
--- phpsysinfo-3.0~rc6/debian/rules
+++ phpsysinfo-3.0~rc6/debian/rules
@@ -8,7 +8,6 @@
 include /usr/share/cdbs/1/rules/simple-patchsys.mk
 
 DEB_FIXPERMS_EXCLUDE := usr/share/phpsysinfo
-DEB_DH_LINK_ARGS := /usr/share/phpsysinfo /var/www/phpsysinfo
 
 # chown everything to nobody:nogroup to make suphp happy
 common-binary-post-install-indep::
only in patch2:
unchanged:
--- phpsysinfo-3.0~rc6.orig/debian/README.Debian
+++ phpsysinfo-3.0~rc6/debian/README.Debian
@@ -0,0 +1,22 @@
+In order to enable phpsysinfo, you need to provide suitable aliases and/or
+symlinks for your webserver of choice.
+
+A sample configuration for Apache can look like:
+
+    Alias /phpsysinfo /usr/share/phpsysinfo
+    <Location /phpsysinfo>
+        Options None
+        Order deny,allow
+        Deny from all
+        Allow from localhost
+    </Location>
+
+One for Lighttpd:
+
+    $HTTP["remoteip"] =~ "127.0.0.1" {
+        alias.url += ( "/phpsysinfo/" => "/usr/share/phpsysinfo/" )
+    {
+
+Obviously, YMMV.
+
+ -- Stefano Zacchiroli <z...@debian.org>, Sat, 20 Feb 2010 12:33:50 +0100
only in patch2:
unchanged:
--- phpsysinfo-3.0~rc6.orig/debian/NEWS
+++ phpsysinfo-3.0~rc6/debian/NEWS
@@ -0,0 +1,17 @@
+phpsysinfo (3.0~rc6-1.1) unstable; urgency=low
+
+  To ensure FHS compliance for phpsysinfo, this package no longer
+  provides a ready-built link
+
+    /var/www/phpsysinfo -> /usr/share/phpsysinfo
+  
+  meaning that phpsysinfo will not be enabled by default.
+
+  Instead, the Administrator should configure an alias for
+  whatever web-server she is using, or manually create the desired
+  link taking the productive base directory into account.
+  
+  See /usr/share/phpsysinfo/README.Debian for sampe configuration
+  snippets.
+
+ -- Mats Erik Andersson <mats.anders...@gisladisker.se>  Mon, 18 Jan 2010 18:45:53 +0100

Reply via email to