diff -Nru sipml5-0.0.20130314.2030/debian/changelog sipml5-0.0.20130314.2030/debian/changelog --- sipml5-0.0.20130314.2030/debian/changelog 2013-03-14 19:32:11.000000000 +0000 +++ sipml5-0.0.20130314.2030/debian/changelog 2013-06-09 09:13:12.000000000 +0000 @@ -1,3 +1,9 @@ +sipml5 (0.0.20130314.2030-2) unstable; urgency=low + + * Update for use with Apache 2.4 (Closes: #711175) + + -- Daniel Pocock Sun, 09 Jun 2013 11:12:07 +0200 + sipml5 (0.0.20130314.2030-1) unstable; urgency=low * Initial packaging (Closes: #701502) diff -Nru sipml5-0.0.20130314.2030/debian/sipml5-web-phone.postinst sipml5-0.0.20130314.2030/debian/sipml5-web-phone.postinst --- sipml5-0.0.20130314.2030/debian/sipml5-web-phone.postinst 2013-02-23 19:29:15.000000000 +0000 +++ sipml5-0.0.20130314.2030/debian/sipml5-web-phone.postinst 2013-06-09 09:10:38.000000000 +0000 @@ -16,10 +16,15 @@ # Auto-configure module dependencies - if [ ! -f /etc/$webserver/conf.d/sipml5-web-phone -a ! -h /etc/$webserver/conf.d/sipml5-web-phone ]; then + if [ -d /etc/$webserver/conf.d -a ! -f /etc/$webserver/conf.d/sipml5-web-phone -a ! -h /etc/$webserver/conf.d/sipml5-web-phone ]; then ln -s /etc/sipml5-web-phone/apache.conf /etc/$webserver/conf.d/sipml5-web-phone fi + # Apache 2.4 uses conf-available instead of conf.d: + if [ -d /etc/$webserver/conf-available -a ! -f /etc/$webserver/conf-available/sipml5-web-phone -a ! -h /etc/$webserver/conf-available/sipml5-web-phone ]; then + ln -s /etc/sipml5-web-phone/apache.conf /etc/$webserver/conf-available/sipml5-web-phone + fi + # Restart apache2 if requested db_get sipml5-web-phone/reload if [ "$RET" = "true" ]; then diff -Nru sipml5-0.0.20130314.2030/debian/sipml5-web-phone.postrm sipml5-0.0.20130314.2030/debian/sipml5-web-phone.postrm --- sipml5-0.0.20130314.2030/debian/sipml5-web-phone.postrm 2013-02-23 21:39:28.000000000 +0000 +++ sipml5-0.0.20130314.2030/debian/sipml5-web-phone.postrm 2013-06-09 09:11:22.000000000 +0000 @@ -16,6 +16,10 @@ rm -f /etc/$webserver/conf.d/sipml5-web-phone fi + if [ -h /etc/$webserver/conf-available/sipml5-web-phone ]; then + rm -f /etc/$webserver/conf-available/sipml5-web-phone + fi + if [ -x /usr/sbin/$webserver ]; then db_reset sipml5-web-phone/reload db_input high sipml5-web-phone/reload || true