diff -u twiki-4.1.2/debian/postinst twiki-4.1.2/debian/postinst --- twiki-4.1.2/debian/postinst +++ twiki-4.1.2/debian/postinst @@ -97,7 +97,7 @@ # fi # done - servers="apache apache-perl apache-ssl apache2" + servers="apache2 apache-perl apache-ssl apache mini-httpd" for server in $servers; do if [ -e /etc/$server/conf.d ]; then includefile=/etc/twiki/apache.conf @@ -129,7 +129,13 @@ #if the user has installed without initial universe then we can't do this if [ ! -e /var/lib/twiki/data/.htpasswd ]; then touch /var/lib/twiki/data/.htpasswd -# $HTPASSWDCMD -b /var/lib/twiki/data/.htpasswd TWikiGuest guest + # This is horrible. No, really. + if $HTPASSWDCMD -h 2>&1 | grep -qe '-b' ; then + $HTPASSWDCMD -b /var/lib/twiki/data/.htpasswd TWikiGuest guest + else + echo guest | $HTPASSWDCMD /var/lib/twiki/data/.htpasswd TWikiGuest + fi + chown $TWIKI_OWNER.www-data /var/lib/twiki/data/.htpasswd chmod 660 /var/lib/twiki/data/.htpasswd fi $HTPASSWDCMD -b /var/lib/twiki/data/.htpasswd "$configuser" "$configpassword" @@ -205,6 +211,18 @@ # reload apache configs for server in $servers; do if [ -e /etc/init.d/$server ]; then + case "$server" in + apache|apache-*) + if [ ! -x /usr/sbin/apachectl ]; then + continue + fi + ;; + apache2) + if [ ! -x /usr/sbin/apache2ctl ]; then + continue + fi + ;; + esac echo reloading $server config /etc/init.d/$server reload fi diff -u twiki-4.1.2/debian/control twiki-4.1.2/debian/control --- twiki-4.1.2/debian/control +++ twiki-4.1.2/debian/control @@ -1,7 +1,8 @@ Source: twiki Section: web Priority: optional -Maintainer: Sven Dowideit +Maintainer: Ubuntu MOTU Developers +XSBC-Original-Maintainer: Sven Dowideit Build-Depends: debhelper (>= 5), tardy, po-debconf, dpatch Standards-Version: 3.7.2 diff -u twiki-4.1.2/debian/changelog twiki-4.1.2/debian/changelog --- twiki-4.1.2/debian/changelog +++ twiki-4.1.2/debian/changelog @@ -1,3 +1,13 @@ +twiki (1:4.1.2-5ubuntu1) jaunty; urgency=low + + * Merge from debian unstable, remaining changes: (LP: #301535) + - Add a horrible hack to try and detect if htpasswd supports -b. + - Prefer apache2 to apache in the webserver list, and add mini-httpd. + - Only attempt to restart any of the apache's if /usr/sbin/apachectl + exists and is executable, doing the same favour for apache2. + + -- Bhavani Shankar Mon, 24 Nov 2008 12:40:07 +0530 + twiki (1:4.1.2-5) unstable; urgency=emergency * fix TemplateLogin passthrough sysopen (Closes: #468159) @@ -12,6 +22,16 @@ -- Sven Dowideit Wed, 12 Nov 2008 09:53:40 +0100 +twiki (1:4.1.2-4ubuntu1) jaunty; urgency=low + + * Merge from debian unstable, remaining changes: + - Add a horrible hack to try and detect if htpasswd supports -b. + - Prefer apache2 to apache in the webserver list, and add mini-httpd. + - Only attempt to restart any of the apache's if /usr/sbin/apachectl + exists and is executable, doing the same favour for apache2. + + -- Emanuele Gentili Fri, 07 Nov 2008 05:38:03 +0100 + twiki (1:4.1.2-4) unstable; urgency=emergency * move session files to /var/lib/twiki/working/tmp (Closes: #494648) @@ -22,6 +42,17 @@ -- Sven Dowideit Thu, 14 Aug 2008 09:53:40 +0100 +twiki (1:4.1.2-3.2ubuntu1) intrepid; urgency=low + + * Merge from Debian Unstable (LP: #182415), remaining Ubuntu changes: + - Add a horrible hack to try and detect if htpasswd supports -b. + - Prefer apache2 to apache in the webserver list, and add mini-httpd. + - Only attempt to restart any of the apache's if /usr/sbin/apachectl + exists and is executable, doing the same favour for apache2. + - Update Maintainer field as per spec + + -- Emanuele Gentili Sun, 20 Jul 2008 19:30:18 +0200 + twiki (1:4.1.2-3.2) unstable; urgency=high * Non-maintainer upload. @@ -51,6 +82,17 @@ -- Olivier Berger Wed, 16 Jul 2008 15:04:09 +0200 +twiki (1:4.1.2-3.1ubuntu1) hardy; urgency=low + + * Merge from Debian Unstable (LP: #182415), remaining Ubuntu changes: + - Add a horrible hack to try and detect if htpasswd supports -b. + - Prefer apache2 to apache in the webserver list, and add mini-httpd. + - Only attempt to restart any of the apache's if /usr/sbin/apachectl + exists and is executable, doing the same favour for apache2. + - Update Maintainer field as per spec + + -- Emanuele Gentili Sun, 13 Jan 2008 14:25:34 +0100 + twiki (1:4.1.2-3.1) unstable; urgency=low * Non-maintainer upload. @@ -76,6 +118,17 @@ -- Sven Dowideit Sun, 14 Oct 2007 09:53:40 +0100 +twiki (1:4.1.2-1ubuntu1) gutsy; urgency=low + + * Merge from Debian unstable. + * Remaining Ubuntu changes: + - Add a horrible hack to try and detect if htpasswd supports -b. + - Prefer apache2 to apache in the webserver list, and add mini-httpd. + - Only attempt to restart any of the apache's if /usr/sbin/apachectl + exists and is executable, doing the same favour for apache2. + + -- Steve Kowalik Fri, 18 May 2007 21:11:48 +1000 + twiki (1:4.1.2-1) unstable; urgency=low * add commented out mod_perl on apache 2 support using IFModule @@ -85,6 +138,18 @@ -- Sven Dowideit Sun, 15 Apr 2007 08:53:40 +0100 +twiki (1:4.0.5-9.1ubuntu1) feisty; urgency=low + + * Add a horrible hack to try and detect if htpasswd supports -b. + Now I feel dirty. (LP: #93669) + * Prefer apache2 to apache in the webserver list, and add mini-httpd. + * Only attempt to restart any of the apache's if /usr/sbin/apachectl + exists and is executable. (LP: #96464) + * Do the same thing for Apache 2. + * Munge Maintainer field as per spec. + + -- Steve Kowalik Sun, 8 Apr 2007 00:09:06 +1000 + twiki (1:4.0.5-9.1) unstable; urgency=low * Non-maintainer upload.