Control: retitle -1 jwchat: patch for NMU versions 1.0+dfsg-1.2 and 1.0+dfsg-1.3
I forgot the updated symlinks in version -1.2. Here is an updated patch used in -1.3. This is the changelog: jwchat (1.0+dfsg-1.3) unstable; urgency=low * Non-maintainer upload. * Add forgotten symlinks used in debug mode (really closes: #644097). * Add launcepad bug reference for #710688 fix. -- Petter Reinholdtsen <p...@debian.org> Tue, 24 Sep 2013 15:12:21 +0200 -- Happy hacking Petter Reinholdtsen
diff -Nru jwchat-1.0+dfsg/debian/changelog jwchat-1.0+dfsg/debian/changelog --- jwchat-1.0+dfsg/debian/changelog 2012-09-05 00:08:20.000000000 +0200 +++ jwchat-1.0+dfsg/debian/changelog 2013-09-24 15:13:05.000000000 +0200 @@ -1,3 +1,35 @@ +jwchat (1.0+dfsg-1.3) unstable; urgency=low + + * Non-maintainer upload. + * Add forgotten symlinks used in debug mode (really closes: #644097). + * Add launcepad bug reference for #710688 fix. + + -- Petter Reinholdtsen <p...@debian.org> Tue, 24 Sep 2013 15:12:21 +0200 + +jwchat (1.0+dfsg-1.2) unstable; urgency=low + + * Non-maintainer upload. + * Rename /etc/apache4/sites-available/jwchat and + /etc/apache2/sites-available/jwchat.conf and add maintainer script + code to handle this rename during upgrades, to make jwchat + compatible with apache 2.4 (Closes: #710688). Based on patch from + Jean-Michel Vourgère with additions from Petter Reinholdtsen. + Also fixes LP: #571925. + * Change file owner of files handled out via apache from nobody and + www-data to root, to ensure the apache server and processes + running as user nobody can't modify the files (Closes: #632631). + * Apply patch from Jean-Michel Vourgère to not leave any + files behind after purge, even if ucf isn't available during + purge (Closes: #656455). + * Add web page symlinks to allow DEBUG=true mode to work with the + jwchat web client (Closes: #644097). Patch from Jean-Michel + Vourgère. + * Updated Standards-Version from 3.9.1 to 3.9.4 keeping lintian + happy. No changes needed. + * Removed article from short description, keeping lintian happy. + + -- Petter Reinholdtsen <p...@debian.org> Tue, 24 Sep 2013 14:24:39 +0200 + jwchat (1.0+dfsg-1.1) unstable; urgency=low * Non-maintainer upload. diff -Nru jwchat-1.0+dfsg/debian/control jwchat-1.0+dfsg/debian/control --- jwchat-1.0+dfsg/debian/control 2010-09-17 23:55:06.000000000 +0200 +++ jwchat-1.0+dfsg/debian/control 2013-09-24 14:24:33.000000000 +0200 @@ -10,13 +10,13 @@ Vcs-Browser: http://git.debian.org/?p=pkg-xmpp/jwchat.git Vcs-Git: git://git.debian.org/git/pkg-xmpp/jwchat.git Homepage: http://jwchat.sourceforge.net/ -Standards-Version: 3.9.1 +Standards-Version: 3.9.4 Package: jwchat Architecture: all Depends: ${misc:Depends}, apache2 | httpd, ucf, libjs-jac, libjs-xmlextras, libjs-debugger Recommends: ejabberd -Description: a full featured, web-based Jabber chat client +Description: full featured, web-based Jabber chat client JWChat is a full featured, web-based Jabber client. Written using AJAX technology it relies on JavaScript and HTML at the client-side only. It supports basic jabber instant messaging, roster management and groupchats diff -Nru jwchat-1.0+dfsg/debian/links jwchat-1.0+dfsg/debian/links --- jwchat-1.0+dfsg/debian/links 2010-09-17 23:55:06.000000000 +0200 +++ jwchat-1.0+dfsg/debian/links 2013-09-24 15:07:45.000000000 +0200 @@ -2,3 +2,6 @@ /usr/share/javascript/jsjac/jsjac.js /usr/share/jwchat/www/jsjac.js /usr/share/javascript/xmlextras/xmlextras.js /usr/share/jwchat/www/xmlextras.js /usr/share/javascript/debugger/Debugger.js /usr/share/jwchat/www/Debugger.js +/usr/share/javascript/debugger/Debugger.html /usr/share/jwchat/www/Debugger.html +/usr/share/javascript/debugger/DebugBottom.html /usr/share/jwchat/www/DebugBottom.html +/usr/share/javascript/debugger/DebugTop.html /usr/share/jwchat/www/DebugTop.html diff -Nru jwchat-1.0+dfsg/debian/postinst jwchat-1.0+dfsg/debian/postinst --- jwchat-1.0+dfsg/debian/postinst 2010-09-17 20:11:48.000000000 +0200 +++ jwchat-1.0+dfsg/debian/postinst 2013-09-24 14:17:32.000000000 +0200 @@ -7,7 +7,8 @@ configfile='/etc/jwchat/config.js' configsource='/usr/share/jwchat/config.js' -apachefile='/etc/apache2/sites-available/jwchat' +oldapachefile='/etc/apache2/sites-available/jwchat' +apachefile='/etc/apache2/sites-available/jwchat.conf' apachesource='/usr/share/jwchat/apache.conf' wwwdir='/usr/share/jwchat/www' tempfile=$(mktemp) @@ -19,17 +20,27 @@ { find $wwwdir -type d -exec chmod 0755 {} \; find $wwwdir -type f -exec chmod 0644 {} \; - find $wwwdir -type f -exec chown nobody:nogroup {} \; + find $wwwdir -type f -exec chown root:nogroup {} \; } setup_apache() { + case "$1" in + configure) + if dpkg --compare-versions "$2" le "1.0+dfsg-1.1"; then + if [ -e $oldapachefile.dpkg-backup ] && [ ! -e $apachefile ] ; then + mv $oldapachefile.dpkg-backup $apachefile + fi + fi + esac + db_get jwchat/ApacheServerName apache_server_name="$RET" sed -e "s|__ApacheServerName__|$apache_server_name|g" $configsource > \ $tempfile ucf --three-way --debconf-ok $tempfile $configfile - chown www-data:www-data $configfile + chmod 644 $configfile + chown root:www-data $configfile if [ -x /usr/sbin/apache2 -a "$apache_server_name" != "none" ]; then db_get jwchat/JabberAddress jabber_address="$RET" @@ -38,20 +49,21 @@ $apachesource > $tempfile ucf --three-way --debconf-ok $tempfile $apachefile db_stop - a2enmod proxy - a2enmod proxy_http - a2ensite jwchat - invoke-rc.d apache2 force-reload + if [ -e /usr/share/apache2/apache2-maintscript-helper ] ; then + . /usr/share/apache2/apache2-maintscript-helper + apache2_invoke enmod proxy + apache2_invoke enmod proxy_http + apache2_invoke ensite jwchat + fi fi } + case $1 in configure|reconfigure) - fixperms - setup_apache + setup_apache $@ rm -f $tempfile - exit 0 ;; *) @@ -61,4 +73,3 @@ esac #DEBHELPER# - diff -Nru jwchat-1.0+dfsg/debian/postrm jwchat-1.0+dfsg/debian/postrm --- jwchat-1.0+dfsg/debian/postrm 2010-09-17 20:11:48.000000000 +0200 +++ jwchat-1.0+dfsg/debian/postrm 2013-09-24 14:15:30.000000000 +0200 @@ -6,14 +6,14 @@ set -e configfile='/etc/jwchat/config.js' -apachefile='/etc/apache2/sites-available/jwchat' +apachefile='/etc/apache2/sites-available/jwchat.conf' case "$1" in remove) - if [ -x /usr/sbin/a2dissite -a -x /etc/init.d/apache2 -a -L /etc/apache2/sites-enabled/jwchat ]; then - a2dissite jwchat - invoke-rc.d apache2 force-reload + if [ -e /usr/share/apache2/apache2-maintscript-helper ] ; then + . /usr/share/apache2/apache2-maintscript-helper + apache2_invoke dissite jwchat fi ;; @@ -22,8 +22,8 @@ if [ -x /usr/bin/ucf ] ; then ucf --purge $configfile ucf --purge $apachefile - rm -f $configfile $apachefile fi + rm -f $configfile $apachefile ;; upgrade|failed-upgrade|abort-install|abort-upgrade|disappear) diff -Nru jwchat-1.0+dfsg/debian/preinst jwchat-1.0+dfsg/debian/preinst --- jwchat-1.0+dfsg/debian/preinst 1970-01-01 01:00:00.000000000 +0100 +++ jwchat-1.0+dfsg/debian/preinst 2013-09-24 14:15:30.000000000 +0200 @@ -0,0 +1,16 @@ +#!/bin/sh + +set -e + +oldapachefile='/etc/apache2/sites-available/jwchat' + +case "$1" in + install|upgrade) + if dpkg --compare-versions "$2" le "1.0+dfsg-1.1"; then + if [ -e $oldapachefile ] ; then + mv $oldapachefile $oldapachefile.dpkg-backup + fi + fi +esac + +#DEBHELPER#