diff -u colplot-5.0.1/debian/changelog colplot-5.0.1/debian/changelog --- colplot-5.0.1/debian/changelog +++ colplot-5.0.1/debian/changelog @@ -1,3 +1,11 @@ +colplot (5.0.1-3) unstable; urgency=medium + + * Only manage apache|lighttpd conf files based on the users selection + (Closes: #814627) + * Update the French translation (Closes: #814828) + + -- Troy Heber Tue, 16 Feb 2016 13:28:51 -0700 + colplot (5.0.1-2) unstable; urgency=medium * Proplery automate colplot site creation diff -u colplot-5.0.1/debian/colplot.lighttpd.conf colplot-5.0.1/debian/colplot.lighttpd.conf --- colplot-5.0.1/debian/colplot.lighttpd.conf +++ colplot-5.0.1/debian/colplot.lighttpd.conf @@ -1,5 +1,5 @@ # -*- depends: fastcgi-php -*- -# Cacti Alias +# Colplot Alias alias.url += ( "/colplot" => "/usr/share/colplot/site", ) diff -u colplot-5.0.1/debian/colplot.templates colplot-5.0.1/debian/colplot.templates --- colplot-5.0.1/debian/colplot.templates +++ colplot-5.0.1/debian/colplot.templates @@ -12,7 +12,7 @@ __Choices: apache2, lighttpd, None Default: apache2 _Description: Web server: - Please select the web server for which Cacti should be automatically + Please select the web server for which Colplot should be automatically configured. . Select "None" if you would like to configure the web server manually. diff -u colplot-5.0.1/debian/po/cs.po colplot-5.0.1/debian/po/cs.po --- colplot-5.0.1/debian/po/cs.po +++ colplot-5.0.1/debian/po/cs.po @@ -56,7 +56,7 @@ #| "Please select the web server for which colplot should be automatically " #| "configured." msgid "" -"Please select the web server for which Cacti should be automatically " +"Please select the web server for which Colplot should be automatically " "configured." msgstr "" "Vyberte webový server, který se má automaticky nastavit pro použití s " diff -u colplot-5.0.1/debian/po/da.po colplot-5.0.1/debian/po/da.po --- colplot-5.0.1/debian/po/da.po +++ colplot-5.0.1/debian/po/da.po @@ -50,7 +50,7 @@ #| "Please select the web server for which colplot should be automatically " #| "configured." msgid "" -"Please select the web server for which Cacti should be automatically " +"Please select the web server for which Colplot should be automatically " "configured." msgstr "" "Vælg venligst internetserveren som colplot skal konfigureres til automatisk." diff -u colplot-5.0.1/debian/po/de.po colplot-5.0.1/debian/po/de.po --- colplot-5.0.1/debian/po/de.po +++ colplot-5.0.1/debian/po/de.po @@ -50,7 +50,7 @@ #| "Please select the web server for which colplot should be automatically " #| "configured." msgid "" -"Please select the web server for which Cacti should be automatically " +"Please select the web server for which Colplot should be automatically " "configured." msgstr "" "Bitte wählen Sie den Webserver aus, für den colplot automatisch eingerichtet " diff -u colplot-5.0.1/debian/po/es.po colplot-5.0.1/debian/po/es.po --- colplot-5.0.1/debian/po/es.po +++ colplot-5.0.1/debian/po/es.po @@ -74,7 +74,7 @@ #| "Please select the web server for which colplot should be automatically " #| "configured." msgid "" -"Please select the web server for which Cacti should be automatically " +"Please select the web server for which Colplot should be automatically " "configured." msgstr "" "Escoja el servidor web que debería configurarse automáticamente para colplot." diff -u colplot-5.0.1/debian/po/eu.po colplot-5.0.1/debian/po/eu.po --- colplot-5.0.1/debian/po/eu.po +++ colplot-5.0.1/debian/po/eu.po @@ -54,7 +54,7 @@ #| "Please select the web server for which colplot should be automatically " #| "configured." msgid "" -"Please select the web server for which Cacti should be automatically " +"Please select the web server for which Colplot should be automatically " "configured." msgstr "" "Hautatu web-zerbitzaria (colplot zerbitzariaren arabera automatikoki " diff -u colplot-5.0.1/debian/po/fr.po colplot-5.0.1/debian/po/fr.po --- colplot-5.0.1/debian/po/fr.po +++ colplot-5.0.1/debian/po/fr.po @@ -23,13 +23,13 @@ #. Choices #: ../colplot.templates:2001 msgid "apache2" -msgstr "" +msgstr "Apache 2" #. Type: select #. Choices #: ../colplot.templates:2001 msgid "lighttpd" -msgstr "" +msgstr "Lighttpd" #. Type: select #. Choices @@ -46,16 +46,12 @@ #. Type: select #. Description #: ../colplot.templates:2002 -#, fuzzy -#| msgid "" -#| "Please select the web server for which colplot should be automatically " -#| "configured." msgid "" -"Please select the web server for which Cacti should be automatically " +"Please select the web server for which Colplot should be automatically " "configured." msgstr "" "Veuillez choisir le serveur web à reconfigurer automatiquement pour " -"l'utilisation de colplot." +"l'utilisation de Colplot." #. Type: select #. Description diff -u colplot-5.0.1/debian/po/id.po colplot-5.0.1/debian/po/id.po --- colplot-5.0.1/debian/po/id.po +++ colplot-5.0.1/debian/po/id.po @@ -54,7 +54,7 @@ #| "Please select the web server for which colplot should be automatically " #| "configured." msgid "" -"Please select the web server for which Cacti should be automatically " +"Please select the web server for which Colplot should be automatically " "configured." msgstr "" "Silakan pilih jenis web server yang digunakan oleh colplot untuk pengaturan " diff -u colplot-5.0.1/debian/po/it.po colplot-5.0.1/debian/po/it.po --- colplot-5.0.1/debian/po/it.po +++ colplot-5.0.1/debian/po/it.po @@ -54,7 +54,7 @@ #| "Please select the web server for which colplot should be automatically " #| "configured." msgid "" -"Please select the web server for which Cacti should be automatically " +"Please select the web server for which Colplot should be automatically " "configured." msgstr "" "Selezionare il server web per il quale configurare automaticamente colplot." diff -u colplot-5.0.1/debian/po/ja.po colplot-5.0.1/debian/po/ja.po --- colplot-5.0.1/debian/po/ja.po +++ colplot-5.0.1/debian/po/ja.po @@ -48,7 +48,7 @@ #| "Please select the web server for which colplot should be automatically " #| "configured." msgid "" -"Please select the web server for which Cacti should be automatically " +"Please select the web server for which Colplot should be automatically " "configured." msgstr "colplot が自動的に設定するウェブサーバを選んでください。" diff -u colplot-5.0.1/debian/po/nl.po colplot-5.0.1/debian/po/nl.po --- colplot-5.0.1/debian/po/nl.po +++ colplot-5.0.1/debian/po/nl.po @@ -51,7 +51,7 @@ #| "Please select the web server for which colplot should be automatically " #| "configured." msgid "" -"Please select the web server for which Cacti should be automatically " +"Please select the web server for which Colplot should be automatically " "configured." msgstr "Voor welke webserver moet colplot automatisch worden geconfigureerd?" diff -u colplot-5.0.1/debian/po/pl.po colplot-5.0.1/debian/po/pl.po --- colplot-5.0.1/debian/po/pl.po +++ colplot-5.0.1/debian/po/pl.po @@ -53,7 +53,7 @@ #| "Please select the web server for which colplot should be automatically " #| "configured." msgid "" -"Please select the web server for which Cacti should be automatically " +"Please select the web server for which Colplot should be automatically " "configured." msgstr "" "Proszę wybrać serwer WWW, dla którego colplot powinno zostać automatycznie " diff -u colplot-5.0.1/debian/po/pt.po colplot-5.0.1/debian/po/pt.po --- colplot-5.0.1/debian/po/pt.po +++ colplot-5.0.1/debian/po/pt.po @@ -50,7 +50,7 @@ #| "Please select the web server for which colplot should be automatically " #| "configured." msgid "" -"Please select the web server for which Cacti should be automatically " +"Please select the web server for which Colplot should be automatically " "configured." msgstr "" "Por favor seleccione o tipo de servidor web para o qual o colplot deve ser " diff -u colplot-5.0.1/debian/po/pt_BR.po colplot-5.0.1/debian/po/pt_BR.po --- colplot-5.0.1/debian/po/pt_BR.po +++ colplot-5.0.1/debian/po/pt_BR.po @@ -54,7 +54,7 @@ #. Description #: ../colplot.templates:2002 msgid "" -"Please select the web server for which Cacti should be automatically " +"Please select the web server for which Colplot should be automatically " "configured." msgstr "" diff -u colplot-5.0.1/debian/po/ru.po colplot-5.0.1/debian/po/ru.po --- colplot-5.0.1/debian/po/ru.po +++ colplot-5.0.1/debian/po/ru.po @@ -53,7 +53,7 @@ #| "Please select the web server for which colplot should be automatically " #| "configured." msgid "" -"Please select the web server for which Cacti should be automatically " +"Please select the web server for which Colplot should be automatically " "configured." msgstr "" "Выберите веб-сервер, который нужно автоматически настроить для запуска " diff -u colplot-5.0.1/debian/po/sv.po colplot-5.0.1/debian/po/sv.po --- colplot-5.0.1/debian/po/sv.po +++ colplot-5.0.1/debian/po/sv.po @@ -53,7 +53,7 @@ #| "Please select the web server for which colplot should be automatically " #| "configured." msgid "" -"Please select the web server for which Cacti should be automatically " +"Please select the web server for which Colplot should be automatically " "configured." msgstr "Välj den webbserver som colplot ska aktivera inställningar för." diff -u colplot-5.0.1/debian/po/templates.pot colplot-5.0.1/debian/po/templates.pot --- colplot-5.0.1/debian/po/templates.pot +++ colplot-5.0.1/debian/po/templates.pot @@ -45,7 +45,7 @@ #. Description #: ../colplot.templates:2002 msgid "" -"Please select the web server for which Cacti should be automatically " +"Please select the web server for which Colplot should be automatically " "configured." msgstr "" diff -u colplot-5.0.1/debian/po/vi.po colplot-5.0.1/debian/po/vi.po --- colplot-5.0.1/debian/po/vi.po +++ colplot-5.0.1/debian/po/vi.po @@ -46,7 +46,7 @@ #. Description #: ../colplot.templates:2002 msgid "" -"Please select the web server for which Cacti should be automatically " +"Please select the web server for which Colplot should be automatically " "configured." msgstr "" diff -u colplot-5.0.1/debian/postinst colplot-5.0.1/debian/postinst --- colplot-5.0.1/debian/postinst +++ colplot-5.0.1/debian/postinst @@ -19,35 +19,34 @@ db_get colplot/webserver WWWTYPE="$RET" -ucf --debconf-ok /usr/share/colplot/conf_templates/colplot.apache.conf /etc/apache2/conf-available/colplot.conf -ucfr colplot /etc/apache2/conf-available/colplot.conf -ucf --debconf-ok /usr/share/colplot/conf_templates/colplot.lighttpd.conf /etc/lighttpd/conf-available/20-colplot.conf -ucfr colplot /etc/lighttpd/conf-available/20-colplot.conf - # done with debconf... db_stop # Only create link and grant permissions on first install if [ ! -n "$2" ] ; then chown -R www-data:www-data /usr/share/colplot/site - ln -s /usr/bin/colplot /usr/share/colplot/site/index.cgi + ln -sf /usr/bin/colplot /usr/share/colplot/site/index.cgi fi # Update the webserver, if needed case $WWWTYPE in apache2) -# Sniplet adjusted from http://wiki.debian.org/Apache/PackagingFor24 - if [ -e /usr/share/apache2/apache2-maintscript-helper ] ; then - . /usr/share/apache2/apache2-maintscript-helper - apache2_invoke enconf colplot - elif dpkg-query -f '${Version}' -W 'apache2.2-common' > /dev/null 2>&1 ; then - [ -d /etc/apache2/conf.d/ ] && [ ! -h /etc/apache2/conf.d/colplot.conf ] && \ - ln -s ../conf-available/colplot.conf /etc/apache2/conf.d/colplot.conf + if [ -e /etc/apache2/conf-available/colplot.conf ] ; then + ucf --debconf-ok /usr/share/colplot/conf_templates/colplot.apache.conf /etc/apache2/conf-available/colplot.conf + ucfr colplot /etc/apache2/conf-available/colplot.conf + if [ -e /usr/share/apache2/apache2-maintscript-helper ] ; then + . /usr/share/apache2/apache2-maintscript-helper + apache2_invoke enconf colplot + else + echo "Apache2 not installed, skipping" + fi else echo "Apache2 not installed, skipping" fi ;; lighttpd) + ucf --debconf-ok /usr/share/colplot/conf_templates/colplot.lighttpd.conf /etc/lighttpd/conf-available/20-colplot.conf + ucfr colplot /etc/lighttpd/conf-available/20-colplot.conf if [ -e /etc/lighttpd/conf-available/20-colplot.conf ] ; then if which lighty-enable-mod >/dev/null 2>&1 ; then lighty-enable-mod colplot || \ diff -u colplot-5.0.1/debian/postrm colplot-5.0.1/debian/postrm --- colplot-5.0.1/debian/postrm +++ colplot-5.0.1/debian/postrm @@ -37,9 +37,6 @@ # case "$1" in purge) - if [ -e /usr/share/colplot/site/index.cgi ] ; then - rm -f /usr/share/colplot/site/index.cgi - fi # get rid of configuration files and ucf entries for config_file in \ /etc/apache2/conf-available/colplot.conf \ only in patch2: unchanged: --- colplot-5.0.1.orig/debian/prerm +++ colplot-5.0.1/debian/prerm @@ -0,0 +1,23 @@ +#!/bin/sh + +set -e + +# +# Skip, if we are not in "remove" or "purge" state +# +if [ "$1" != "remove" ] && [ "$1" != "purge" ]; then + exit 0 +fi + +## Source debconf library +. /usr/share/debconf/confmodule +db_version 2.0 + +# Remove the site symlink +if [ -e /usr/share/colplot/site/index.cgi ] ; then + rm -f /usr/share/colplot/site/index.cgi +fi + +#DEBHELPER# +exit 0 +