[Pkg-nagios-changes] [pkg-nagvis] 03/04: Moved userfiles to /var/lib/nagvis/userfiles
Markus Frosch
lazyfrosch-guest at moszumanska.debian.org
Thu Dec 19 21:07:27 UTC 2013
This is an automated email from the git hooks/post-receive script.
lazyfrosch-guest pushed a commit to branch master
in repository pkg-nagvis.
commit 8f7d7482e0c87679b555a193b4516e42936acc6c
Author: Markus Frosch <markus at lazyfrosch.de>
Date: Thu Dec 19 21:52:33 2013 +0100
Moved userfiles to /var/lib/nagvis/userfiles
For compliance with policy and a cleaner setup. Including language updated due
to path mention. Postinst will migrate standard userdata.
Closes: #706245
Git-Dch: long
---
debian/nagvis-demos.install | 4 +-
debian/nagvis-demos.lintian-overrides | 7 ---
debian/nagvis.dirs | 1 +
debian/nagvis.install | 2 +-
debian/nagvis.links | 2 +-
debian/nagvis.lintian-overrides | 96 -----------------------------------
debian/nagvis.postinst | 27 ++++++++--
debian/nagvis.postrm | 1 +
debian/nagvis.templates | 2 +-
debian/po/cs.po | 4 +-
debian/po/da.po | 4 +-
debian/po/de.po | 4 +-
debian/po/es.po | 4 +-
debian/po/fr.po | 4 +-
debian/po/it.po | 4 +-
debian/po/ja.po | 4 +-
debian/po/nl.po | 4 +-
debian/po/pl.po | 4 +-
debian/po/pt.po | 4 +-
debian/po/ru.po | 4 +-
debian/po/sv.po | 4 +-
debian/po/templates.pot | 6 +--
debian/rules | 6 +--
23 files changed, 59 insertions(+), 143 deletions(-)
diff --git a/debian/nagvis-demos.install b/debian/nagvis-demos.install
index c76a160..a8ad259 100644
--- a/debian/nagvis-demos.install
+++ b/debian/nagvis-demos.install
@@ -1,4 +1,4 @@
debian/demo_pool.ini.php etc/nagvis/conf.d/
etc/maps/demo*.cfg etc/nagvis/maps/
-share/userfiles/images/shapes/demo*.png var/cache/nagvis/userfiles/images/shapes/
-share/userfiles/images/maps/demo*.png var/cache/nagvis/userfiles/images/maps/
+share/userfiles/images/shapes/demo*.png var/lib/nagvis/userfiles/images/shapes/
+share/userfiles/images/maps/demo*.png var/lib/nagvis/userfiles/images/maps/
diff --git a/debian/nagvis-demos.lintian-overrides b/debian/nagvis-demos.lintian-overrides
deleted file mode 100644
index 46aeafb..0000000
--- a/debian/nagvis-demos.lintian-overrides
+++ /dev/null
@@ -1,7 +0,0 @@
-nagvis-demos: file-in-unusual-dir var/cache/nagvis/userfiles/images/maps/demo-germany.png
-nagvis-demos: file-in-unusual-dir var/cache/nagvis/userfiles/images/maps/demo-ham-racks.png
-nagvis-demos: file-in-unusual-dir var/cache/nagvis/userfiles/images/maps/demo-host.png
-nagvis-demos: file-in-unusual-dir var/cache/nagvis/userfiles/images/maps/demo-load.png
-nagvis-demos: file-in-unusual-dir var/cache/nagvis/userfiles/images/maps/demo-overview.png
-nagvis-demos: file-in-unusual-dir var/cache/nagvis/userfiles/images/shapes/demo-wan-cloud.png
-nagvis-demos: file-in-unusual-dir var/cache/nagvis/userfiles/images/shapes/demo_traffic_load_legend.png
diff --git a/debian/nagvis.dirs b/debian/nagvis.dirs
index f7e3bf8..3e5cc46 100644
--- a/debian/nagvis.dirs
+++ b/debian/nagvis.dirs
@@ -1,6 +1,7 @@
var/cache/nagvis
var/cache/nagvis/tmpl/cache
var/cache/nagvis/tmpl/compile
+var/lib/nagvis
etc/nagvis/profiles
etc/apache2/conf.d/
usr/share/nagvis/defaults
diff --git a/debian/nagvis.install b/debian/nagvis.install
index 5b1044a..1543d95 100644
--- a/debian/nagvis.install
+++ b/debian/nagvis.install
@@ -1,4 +1,4 @@
-share/userfiles/ var/cache/nagvis
+share/userfiles/ var/lib/nagvis
share/ usr/share/nagvis
docs/ usr/share/nagvis
etc/* etc/nagvis
diff --git a/debian/nagvis.links b/debian/nagvis.links
index c3f1347..c8b9110 100644
--- a/debian/nagvis.links
+++ b/debian/nagvis.links
@@ -1,4 +1,4 @@
-/var/cache/nagvis/userfiles /usr/share/nagvis/share/userfiles
+/var/lib/nagvis/userfiles /usr/share/nagvis/share/userfiles
/usr/share/nagvis/docs /usr/share/doc/nagvis/html
/usr/share/nagvis/docs /usr/share/nagvis/share/docs
/etc/nagvis /usr/share/nagvis/etc
diff --git a/debian/nagvis.lintian-overrides b/debian/nagvis.lintian-overrides
index ff8caeb..a69ec21 100644
--- a/debian/nagvis.lintian-overrides
+++ b/debian/nagvis.lintian-overrides
@@ -3,99 +3,3 @@
apache2-reverse-dependency-calls-invoke-rc.d postrm
apache2-reverse-dependency-calls-wrapper-script postinst a2enmod
apache2-reverse-dependency-calls-invoke-rc.d postinst
-
-nagvis: file-in-unusual-dir var/cache/nagvis/userfiles/gadgets/gadgets_core.php
-nagvis: file-in-unusual-dir var/cache/nagvis/userfiles/gadgets/std_bar.php
-nagvis: file-in-unusual-dir var/cache/nagvis/userfiles/gadgets/std_html_bar.php
-nagvis: file-in-unusual-dir var/cache/nagvis/userfiles/gadgets/std_speedometer.php
-nagvis: file-in-unusual-dir var/cache/nagvis/userfiles/gadgets/std_speedometer2.php
-nagvis: file-in-unusual-dir var/cache/nagvis/userfiles/images/iconsets/20x20.gif
-nagvis: file-in-unusual-dir var/cache/nagvis/userfiles/images/iconsets/std_big_ack.png
-nagvis: file-in-unusual-dir var/cache/nagvis/userfiles/images/iconsets/std_big_critical.png
-nagvis: file-in-unusual-dir var/cache/nagvis/userfiles/images/iconsets/std_big_down.png
-nagvis: file-in-unusual-dir var/cache/nagvis/userfiles/images/iconsets/std_big_downtime.png
-nagvis: file-in-unusual-dir var/cache/nagvis/userfiles/images/iconsets/std_big_error.png
-nagvis: file-in-unusual-dir var/cache/nagvis/userfiles/images/iconsets/std_big_ok.png
-nagvis: file-in-unusual-dir var/cache/nagvis/userfiles/images/iconsets/std_big_pending.png
-nagvis: file-in-unusual-dir var/cache/nagvis/userfiles/images/iconsets/std_big_sack.png
-nagvis: file-in-unusual-dir var/cache/nagvis/userfiles/images/iconsets/std_big_sdowntime.png
-nagvis: file-in-unusual-dir var/cache/nagvis/userfiles/images/iconsets/std_big_unchecked.png
-nagvis: file-in-unusual-dir var/cache/nagvis/userfiles/images/iconsets/std_big_unknown.png
-nagvis: file-in-unusual-dir var/cache/nagvis/userfiles/images/iconsets/std_big_unreachable.png
-nagvis: file-in-unusual-dir var/cache/nagvis/userfiles/images/iconsets/std_big_up.png
-nagvis: file-in-unusual-dir var/cache/nagvis/userfiles/images/iconsets/std_big_warning.png
-nagvis: file-in-unusual-dir var/cache/nagvis/userfiles/images/iconsets/std_medium_ack.png
-nagvis: file-in-unusual-dir var/cache/nagvis/userfiles/images/iconsets/std_medium_critical.png
-nagvis: file-in-unusual-dir var/cache/nagvis/userfiles/images/iconsets/std_medium_down.png
-nagvis: file-in-unusual-dir var/cache/nagvis/userfiles/images/iconsets/std_medium_downtime.png
-nagvis: file-in-unusual-dir var/cache/nagvis/userfiles/images/iconsets/std_medium_error.png
-nagvis: file-in-unusual-dir var/cache/nagvis/userfiles/images/iconsets/std_medium_ok.png
-nagvis: file-in-unusual-dir var/cache/nagvis/userfiles/images/iconsets/std_medium_pending.png
-nagvis: file-in-unusual-dir var/cache/nagvis/userfiles/images/iconsets/std_medium_sack.png
-nagvis: file-in-unusual-dir var/cache/nagvis/userfiles/images/iconsets/std_medium_sdowntime.png
-nagvis: file-in-unusual-dir var/cache/nagvis/userfiles/images/iconsets/std_medium_unchecked.png
-nagvis: file-in-unusual-dir var/cache/nagvis/userfiles/images/iconsets/std_medium_unknown.png
-nagvis: file-in-unusual-dir var/cache/nagvis/userfiles/images/iconsets/std_medium_unreachable.png
-nagvis: file-in-unusual-dir var/cache/nagvis/userfiles/images/iconsets/std_medium_up.png
-nagvis: file-in-unusual-dir var/cache/nagvis/userfiles/images/iconsets/std_medium_warning.png
-nagvis: file-in-unusual-dir var/cache/nagvis/userfiles/images/iconsets/std_small_ack.png
-nagvis: file-in-unusual-dir var/cache/nagvis/userfiles/images/iconsets/std_small_critical.png
-nagvis: file-in-unusual-dir var/cache/nagvis/userfiles/images/iconsets/std_small_down.png
-nagvis: file-in-unusual-dir var/cache/nagvis/userfiles/images/iconsets/std_small_downtime.png
-nagvis: file-in-unusual-dir var/cache/nagvis/userfiles/images/iconsets/std_small_error.png
-nagvis: file-in-unusual-dir var/cache/nagvis/userfiles/images/iconsets/std_small_ok.png
-nagvis: file-in-unusual-dir var/cache/nagvis/userfiles/images/iconsets/std_small_pending.png
-nagvis: file-in-unusual-dir var/cache/nagvis/userfiles/images/iconsets/std_small_sack.png
-nagvis: file-in-unusual-dir var/cache/nagvis/userfiles/images/iconsets/std_small_sdowntime.png
-nagvis: file-in-unusual-dir var/cache/nagvis/userfiles/images/iconsets/std_small_unchecked.png
-nagvis: file-in-unusual-dir var/cache/nagvis/userfiles/images/iconsets/std_small_unknown.png
-nagvis: file-in-unusual-dir var/cache/nagvis/userfiles/images/iconsets/std_small_unreachable.png
-nagvis: file-in-unusual-dir var/cache/nagvis/userfiles/images/iconsets/std_small_up.png
-nagvis: file-in-unusual-dir var/cache/nagvis/userfiles/images/iconsets/std_small_warning.png
-nagvis: file-in-unusual-dir var/cache/nagvis/userfiles/images/shapes/std_dummy.png
-nagvis: file-in-unusual-dir var/cache/nagvis/userfiles/images/templates/default.control_delete.gif
-nagvis: file-in-unusual-dir var/cache/nagvis/userfiles/images/templates/default.control_drag.gif
-nagvis: file-in-unusual-dir var/cache/nagvis/userfiles/images/templates/default.control_modify.gif
-nagvis: file-in-unusual-dir var/cache/nagvis/userfiles/images/templates/default.control_togglemid.gif
-nagvis: file-in-unusual-dir var/cache/nagvis/userfiles/images/templates/default.folder_closed.gif
-nagvis: file-in-unusual-dir var/cache/nagvis/userfiles/images/templates/default.folder_open.gif
-nagvis: file-in-unusual-dir var/cache/nagvis/userfiles/images/templates/default.header.png
-nagvis: file-in-unusual-dir var/cache/nagvis/userfiles/images/templates/default.header_down.png
-nagvis: file-in-unusual-dir var/cache/nagvis/userfiles/images/templates/default.header_hide.png
-nagvis: file-in-unusual-dir var/cache/nagvis/userfiles/images/templates/default.header_over.png
-nagvis: file-in-unusual-dir var/cache/nagvis/userfiles/images/templates/default.header_show.png
-nagvis: file-in-unusual-dir var/cache/nagvis/userfiles/sounds/std_critical.mp3
-nagvis: file-in-unusual-dir var/cache/nagvis/userfiles/sounds/std_down.mp3
-nagvis: file-in-unusual-dir var/cache/nagvis/userfiles/sounds/std_error.mp3
-nagvis: file-in-unusual-dir var/cache/nagvis/userfiles/sounds/std_unreachable.mp3
-nagvis: file-in-unusual-dir var/cache/nagvis/userfiles/sounds/std_warning.mp3
-nagvis: file-in-unusual-dir var/cache/nagvis/userfiles/templates/default.automap.html
-nagvis: file-in-unusual-dir var/cache/nagvis/userfiles/templates/default.automapModifyParams.html
-nagvis: file-in-unusual-dir var/cache/nagvis/userfiles/templates/default.automapToMap.html
-nagvis: file-in-unusual-dir var/cache/nagvis/userfiles/templates/default.changePassword.html
-nagvis: file-in-unusual-dir var/cache/nagvis/userfiles/templates/default.context.css
-nagvis: file-in-unusual-dir var/cache/nagvis/userfiles/templates/default.context.html
-nagvis: file-in-unusual-dir var/cache/nagvis/userfiles/templates/default.css
-nagvis: file-in-unusual-dir var/cache/nagvis/userfiles/templates/default.header.html
-nagvis: file-in-unusual-dir var/cache/nagvis/userfiles/templates/default.header.js
-nagvis: file-in-unusual-dir var/cache/nagvis/userfiles/templates/default.hover.css
-nagvis: file-in-unusual-dir var/cache/nagvis/userfiles/templates/default.hover.html
-nagvis: file-in-unusual-dir var/cache/nagvis/userfiles/templates/default.index.html
-nagvis: file-in-unusual-dir var/cache/nagvis/userfiles/templates/default.info.html
-nagvis: file-in-unusual-dir var/cache/nagvis/userfiles/templates/default.login.css
-nagvis: file-in-unusual-dir var/cache/nagvis/userfiles/templates/default.login.html
-nagvis: file-in-unusual-dir var/cache/nagvis/userfiles/templates/default.manageRoles.html
-nagvis: file-in-unusual-dir var/cache/nagvis/userfiles/templates/default.map.html
-nagvis: file-in-unusual-dir var/cache/nagvis/userfiles/templates/default.multisiteMaps.html
-nagvis: file-in-unusual-dir var/cache/nagvis/userfiles/templates/default.overview.html
-nagvis: file-in-unusual-dir var/cache/nagvis/userfiles/templates/default.search.html
-nagvis: file-in-unusual-dir var/cache/nagvis/userfiles/templates/default.url.html
-nagvis: file-in-unusual-dir var/cache/nagvis/userfiles/templates/default.userMgmt.html
-nagvis: file-in-unusual-dir var/cache/nagvis/userfiles/templates/default.wuiEditMainCfg.html
-nagvis: file-in-unusual-dir var/cache/nagvis/userfiles/templates/default.wuiManageBackends.html
-nagvis: file-in-unusual-dir var/cache/nagvis/userfiles/templates/default.wuiManageBackgrounds.html
-nagvis: file-in-unusual-dir var/cache/nagvis/userfiles/templates/default.wuiManageMaps.html
-nagvis: file-in-unusual-dir var/cache/nagvis/userfiles/templates/default.wuiManageShapes.html
-nagvis: file-in-unusual-dir var/cache/nagvis/userfiles/templates/default.wuiMapAddModify.html
-nagvis: file-in-unusual-dir var/cache/nagvis/userfiles/templates/default.wuiMapManageTmpl.html
-
diff --git a/debian/nagvis.postinst b/debian/nagvis.postinst
index bdfbe5d..fac9f84 100644
--- a/debian/nagvis.postinst
+++ b/debian/nagvis.postinst
@@ -57,17 +57,33 @@ update_permissions() {
setperm www-data www-data 0755 /etc/nagvis/conf.d
setperm www-data www-data 0755 /etc/nagvis/profiles
- setperm www-data www-data 0750 /var/cache/nagvis
-
- setperm www-data www-data 0755 /var/cache/nagvis/userfiles
- setperm www-data www-data 0755 /var/cache/nagvis/userfiles/images/maps
- setperm www-data www-data 0755 /var/cache/nagvis/userfiles/images/shapes
+ setperm www-data www-data 0755 /var/lib/nagvis/userfiles
+ setperm www-data www-data 0755 /var/lib/nagvis/userfiles/images/maps
+ setperm www-data www-data 0755 /var/lib/nagvis/userfiles/images/shapes
+ setperm www-data www-data 0750 /var/cache/nagvis
setperm www-data www-data 0750 /var/cache/nagvis/tmpl
setperm www-data www-data 0750 /var/cache/nagvis/tmpl/compile
setperm www-data www-data 0750 /var/cache/nagvis/tmpl/cache
}
+# migrate userfiles from /var/cache/nagvis to /var/lib/nagvis
+migrate_userfiles() {
+ from="/var/cache/nagvis/userfiles"
+ to="/var/lib/nagvis/userfiles"
+
+ for dir in images/maps images/shapes; do
+ if [ -d "$from/$dir" ]; then
+ echo "moving files from $from/$dir to $to/$dir ..."
+ mv "$from/$dir"/* "$to/$dir/"
+ rmdir "$from/$dir" || true
+ fi
+ done
+
+ test -d "$from/images" && rmdir "$from/images" || true
+ test -d "$from" && rmdir "$from" || true
+}
+
case "$1" in
configure)
# Source debconf library.
@@ -173,6 +189,7 @@ case "$1" in
fi
update_permissions
+ migrate_userfiles
;;
abort-upgrade|abort-remove|abort-deconfigure)
diff --git a/debian/nagvis.postrm b/debian/nagvis.postrm
index ac4e1d8..0ddabb1 100644
--- a/debian/nagvis.postrm
+++ b/debian/nagvis.postrm
@@ -66,6 +66,7 @@ case "$1" in
rm -rf /etc/nagvis/maps/*
rm -rf /etc/nagvis/profiles/*
rm -rf /var/cache/nagvis/*
+ rm -rf /var/lib/nagvis/*
fi
;;
remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
diff --git a/debian/nagvis.templates b/debian/nagvis.templates
index 4c4c259..1b84b0e 100644
--- a/debian/nagvis.templates
+++ b/debian/nagvis.templates
@@ -24,7 +24,7 @@ Template: nagvis/delete_on_purge
Type: boolean
Default: false
_Description: Delete NagVis data when purging the package?
- NagVis creates files in /var/cache/nagvis and
+ NagVis creates files in /var/{cache,lib}/nagvis and
/etc/nagvis (for instance background images and map files), including a small
database for authentification. If you don't need any of these files,
they can be removed now, or you may want to keep them and clean up by hand
diff --git a/debian/po/cs.po b/debian/po/cs.po
index 8c96bbf..22872ab 100644
--- a/debian/po/cs.po
+++ b/debian/po/cs.po
@@ -59,12 +59,12 @@ msgstr "Smazat při odstraňování balíčku data pro NagVis?"
#. Description
#: ../nagvis.templates:3001
msgid ""
-"NagVis creates files in /var/cache/nagvis and /etc/nagvis (for instance "
+"NagVis creates files in /var/{cache,lib}/nagvis and /etc/nagvis (for instance "
"background images and map files), including a small database for "
"authentification. If you don't need any of these files, they can be removed "
"now, or you may want to keep them and clean up by hand later."
msgstr ""
-"NagVis ve /var/cache/nagvis a /etc/nagvis vytváří soubory (například pro "
+"NagVis ve /var/{cache,lib}/nagvis a /etc/nagvis vytváří soubory (například pro "
"obrázky na pozadí a soubory s mapami), včetně malé databáze pro ověřování. "
"Pokud žádný z těchto souborů nepotřebujete, lze je nyní odstranit, nebo je "
"můžete ponechat a odstranit je později ručně."
diff --git a/debian/po/da.po b/debian/po/da.po
index 328b9c5..3a1d094 100644
--- a/debian/po/da.po
+++ b/debian/po/da.po
@@ -60,12 +60,12 @@ msgstr "Slet NagVis-data når pakken afinstalleres?"
#. Description
#: ../nagvis.templates:3001
msgid ""
-"NagVis creates files in /var/cache/nagvis and /etc/nagvis (for instance "
+"NagVis creates files in /var/{cache,lib}/nagvis and /etc/nagvis (for instance "
"background images and map files), including a small database for "
"authentification. If you don't need any of these files, they can be removed "
"now, or you may want to keep them and clean up by hand later."
msgstr ""
-"NagVis opretter filer i /var/cache/nagvis og /etc/nagvis (for eksempel "
+"NagVis opretter filer i /var/{cache,lib}/nagvis og /etc/nagvis (for eksempel "
"baggrundsbilleder og kortfiler), inklusiv en lille database for godkendelse. "
"Hvis du ikke har brug for nogle af disse filer, så kan de fjernes nu, eller "
"måske ønsker du at beholde dem og rydde op manuelt senere."
diff --git a/debian/po/de.po b/debian/po/de.po
index 05dbb72..0d86df6 100644
--- a/debian/po/de.po
+++ b/debian/po/de.po
@@ -61,12 +61,12 @@ msgstr ""
#. Description
#: ../nagvis.templates:3001
msgid ""
-"NagVis creates files in /var/cache/nagvis and /etc/nagvis (for instance "
+"NagVis creates files in /var/{cache,lib}/nagvis and /etc/nagvis (for instance "
"background images and map files), including a small database for "
"authentification. If you don't need any of these files, they can be removed "
"now, or you may want to keep them and clean up by hand later."
msgstr ""
-"NagVis erstellt Dateien in /var/cache/nagvis und /etc/nagvis (beispielsweise "
+"NagVis erstellt Dateien in /var/{cache,lib}/nagvis und /etc/nagvis (beispielsweise "
"für Hintergründe und Kartendateien), einschließlich einer kleinen Datenbank "
"für die Authentifizierung. Wenn Sie keine dieser Dateien benötigen, können "
"sie jetzt gelöscht werden. Sie können sie auch behalten und später selbst "
diff --git a/debian/po/es.po b/debian/po/es.po
index a23a402..126e930 100644
--- a/debian/po/es.po
+++ b/debian/po/es.po
@@ -83,12 +83,12 @@ msgstr "¿Desea eliminar los datos de NagVis al purgar el paquete?"
#. Description
#: ../nagvis.templates:3001
msgid ""
-"NagVis creates files in /var/cache/nagvis and /etc/nagvis (for instance "
+"NagVis creates files in /var/{cache,lib}/nagvis and /etc/nagvis (for instance "
"background images and map files), including a small database for "
"authentification. If you don't need any of these files, they can be removed "
"now, or you may want to keep them and clean up by hand later."
msgstr ""
-"NagVis genera archivos en «/var/cache/nagvis» y en «/etc/nagvis» (p. ej., "
+"NagVis genera archivos en «/var/{cache,lib}/nagvis» y en «/etc/nagvis» (p. ej., "
"imágenes de fondo y archivos de mapas), así como una pequeña base de datos "
"para la autentificación. Si no necesita mantener estos archivos puede "
"eliminarlos ahora o quizá prefiera mantenerlos y eliminarlos manualmente más "
diff --git a/debian/po/fr.po b/debian/po/fr.po
index e3c766f..993d3ac 100644
--- a/debian/po/fr.po
+++ b/debian/po/fr.po
@@ -63,12 +63,12 @@ msgstr "Faut-il effacer les données de NagVis lors de la purge du paquet ?"
#. Description
#: ../nagvis.templates:3001
msgid ""
-"NagVis creates files in /var/cache/nagvis and /etc/nagvis (for instance "
+"NagVis creates files in /var/{cache,lib}/nagvis and /etc/nagvis (for instance "
"background images and map files), including a small database for "
"authentification. If you don't need any of these files, they can be removed "
"now, or you may want to keep them and clean up by hand later."
msgstr ""
-"NagVis crée des fichiers de données dans /var/cache/nagvis et /etc/nagvis "
+"NagVis crée des fichiers de données dans /var/{cache,lib}/nagvis et /etc/nagvis "
"(pour les images d'arrière-plan et les cartes en cours), y compris une "
"petite base de données pour l'authentification. Si vous n'avez pas besoin de "
"ces fichiers, ils peuvent être effacés maintenant ou vous pouvez les "
diff --git a/debian/po/it.po b/debian/po/it.po
index c50328d..044885c 100644
--- a/debian/po/it.po
+++ b/debian/po/it.po
@@ -61,12 +61,12 @@ msgstr "Cancellare i dati NagVis quando il pacchetto viene eliminato?"
#. Description
#: ../nagvis.templates:3001
msgid ""
-"NagVis creates files in /var/cache/nagvis and /etc/nagvis (for instance "
+"NagVis creates files in /var/{cache,lib}/nagvis and /etc/nagvis (for instance "
"background images and map files), including a small database for "
"authentification. If you don't need any of these files, they can be removed "
"now, or you may want to keep them and clean up by hand later."
msgstr ""
-"NagVis crea file in /var/cache/nagvis e /etc/nagvis (ad esempio immagini di "
+"NagVis crea file in /var/{cache,lib}/nagvis e /etc/nagvis (ad esempio immagini di "
"sfondo e file mappa), incluso un piccolo database per l'autenticazione. Se "
"nessuno di questi file è necessario possono essere rimossi adesso, oppure si "
"può tenerli e ripulire a mano successivamente."
diff --git a/debian/po/ja.po b/debian/po/ja.po
index 9a52989..906158f 100644
--- a/debian/po/ja.po
+++ b/debian/po/ja.po
@@ -59,12 +59,12 @@ msgstr "パッケージの完全削除時に NagVis のデータを削除しま
#. Description
#: ../nagvis.templates:3001
msgid ""
-"NagVis creates files in /var/cache/nagvis and /etc/nagvis (for instance "
+"NagVis creates files in /var/{cache,lib}/nagvis and /etc/nagvis (for instance "
"background images and map files), including a small database for "
"authentification. If you don't need any of these files, they can be removed "
"now, or you may want to keep them and clean up by hand later."
msgstr ""
-"NagVis は /var/cache/nagvis と /etc/nagvis (例えば背景画像やマップファイル) に"
+"NagVis は /var/{cache,lib}/nagvis と /etc/nagvis (例えば背景画像やマップファイル) に"
"認証用の小さなデータベースも含め、ファイルを作成します。こういったファイルが"
"一切不要な場合ここで削除することができますが、残しておいて後で手作業で整理する"
"こともできます。"
diff --git a/debian/po/nl.po b/debian/po/nl.po
index 3c2b3b0..cefaf3f 100644
--- a/debian/po/nl.po
+++ b/debian/po/nl.po
@@ -59,12 +59,12 @@ msgstr "Verwijder gegevens van NagVis bij het wissen ('purge') van het pakket?"
#. Description
#: ../nagvis.templates:3001
msgid ""
-"NagVis creates files in /var/cache/nagvis and /etc/nagvis (for instance "
+"NagVis creates files in /var/{cache,lib}/nagvis and /etc/nagvis (for instance "
"background images and map files), including a small database for "
"authentification. If you don't need any of these files, they can be removed "
"now, or you may want to keep them and clean up by hand later."
msgstr ""
-"NagVis maakt bestanden aan in /var/cache/nagvis en /etc/nagvis (bijvoorbeeld "
+"NagVis maakt bestanden aan in /var/{cache,lib}/nagvis en /etc/nagvis (bijvoorbeeld "
"achtergrondafbeeldingen en map-bestanden), inclusief een kleine database "
"voor authenticatie. Als u deze bestanden niet nodig heeft kunnen ze nu "
"worden verwijderd, of u kunt ze nu bewaren en later zelf met de hand "
diff --git a/debian/po/pl.po b/debian/po/pl.po
index 1290f15..0398b9c 100644
--- a/debian/po/pl.po
+++ b/debian/po/pl.po
@@ -62,12 +62,12 @@ msgstr "Usunąć dane NagVis przy czyszczeniu pakietu?"
#. Description
#: ../nagvis.templates:3001
msgid ""
-"NagVis creates files in /var/cache/nagvis and /etc/nagvis (for instance "
+"NagVis creates files in /var/{cache,lib}/nagvis and /etc/nagvis (for instance "
"background images and map files), including a small database for "
"authentification. If you don't need any of these files, they can be removed "
"now, or you may want to keep them and clean up by hand later."
msgstr ""
-"NagVis tworzy pliki w /var/cache/nagvis i /etc/nagvis (np. pliki tła i pliki "
+"NagVis tworzy pliki w /var/{cache,lib}/nagvis i /etc/nagvis (np. pliki tła i pliki "
"map), także małą bazę danych do uwierzytelniania. Jeśli pliki te nie są "
"potrzebne, mogą zostać usunięte; można również wybrać opcję zachowania ich i "
"ręcznego usunięcia później."
diff --git a/debian/po/pt.po b/debian/po/pt.po
index 3a53653..8aa0be1 100644
--- a/debian/po/pt.po
+++ b/debian/po/pt.po
@@ -60,12 +60,12 @@ msgstr "Apagar os dados do NagVis ao purgar a pacote?"
#. Description
#: ../nagvis.templates:3001
msgid ""
-"NagVis creates files in /var/cache/nagvis and /etc/nagvis (for instance "
+"NagVis creates files in /var/{cache,lib}/nagvis and /etc/nagvis (for instance "
"background images and map files), including a small database for "
"authentification. If you don't need any of these files, they can be removed "
"now, or you may want to keep them and clean up by hand later."
msgstr ""
-"O NagVis cria ficheiros em /var/cache/nagvis e /etc/nagvis (por exemplo, "
+"O NagVis cria ficheiros em /var/{cache,lib}/nagvis e /etc/nagvis (por exemplo, "
"imagens de fundo e ficheiros de mapa), incluindo uma pequena base de dados "
"para autenticação. Se não necessita de nenhum destes ficheiros, podem ser "
"removidos agora, ou pode mantê-los e limpá-los manualmente mais tarde."
diff --git a/debian/po/ru.po b/debian/po/ru.po
index c632a02..871d60c 100644
--- a/debian/po/ru.po
+++ b/debian/po/ru.po
@@ -62,12 +62,12 @@ msgstr "Удалить данные NagVis при вычистке пакета?
#. Description
#: ../nagvis.templates:3001
msgid ""
-"NagVis creates files in /var/cache/nagvis and /etc/nagvis (for instance "
+"NagVis creates files in /var/{cache,lib}/nagvis and /etc/nagvis (for instance "
"background images and map files), including a small database for "
"authentification. If you don't need any of these files, they can be removed "
"now, or you may want to keep them and clean up by hand later."
msgstr ""
-"NagVis создаёт файлы в каталоге /var/cache/nagvis и /etc/nagvis (такие как "
+"NagVis создаёт файлы в каталоге /var/{cache,lib}/nagvis и /etc/nagvis (такие как "
"фоновые изображения и карты), в которых содержится маленькая база "
"аутентификационных данных. Если вам ненужны эти файлы, то они могут быть "
"удалены прямо сейчас, или вы можете их оставить и удалить позже вручную."
diff --git a/debian/po/sv.po b/debian/po/sv.po
index 407104c..2e2e12a 100644
--- a/debian/po/sv.po
+++ b/debian/po/sv.po
@@ -61,12 +61,12 @@ msgstr "Ska NagVis data tas bort när paktet tas bort?"
#. Description
#: ../nagvis.templates:3001
msgid ""
-"NagVis creates files in /var/cache/nagvis and /etc/nagvis (for instance "
+"NagVis creates files in /var/{cache,lib}/nagvis and /etc/nagvis (for instance "
"background images and map files), including a small database for "
"authentification. If you don't need any of these files, they can be removed "
"now, or you may want to keep them and clean up by hand later."
msgstr ""
-"NagVis skapar filer i /var/cache/nagvis och /etc/nagvis (exempelvis "
+"NagVis skapar filer i /var/{cache,lib}/nagvis och /etc/nagvis (exempelvis "
"bakgrundsbilder och datafiler), bland annat en liten databas för "
"autentisering. Om du inte behöver dessa filer så kan de tas bort nu om du "
"inte vill behålla dem och ta bort de manuellt senare."
diff --git a/debian/po/templates.pot b/debian/po/templates.pot
index 2e01d31..ebe3b1a 100644
--- a/debian/po/templates.pot
+++ b/debian/po/templates.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: nagvis\n"
"Report-Msgid-Bugs-To: nagvis at packages.debian.org\n"
-"POT-Creation-Date: 2012-06-03 19:19+0200\n"
+"POT-Creation-Date: 2013-12-19 21:38+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
@@ -56,8 +56,8 @@ msgstr ""
#. Description
#: ../nagvis.templates:3001
msgid ""
-"NagVis creates files in /var/cache/nagvis and /etc/nagvis (for instance "
-"background images and map files), including a small database for "
+"NagVis creates files in /var/{cache,lib}/nagvis and /etc/nagvis (for "
+"instance background images and map files), including a small database for "
"authentification. If you don't need any of these files, they can be removed "
"now, or you may want to keep them and clean up by hand later."
msgstr ""
diff --git a/debian/rules b/debian/rules
index a8d63c9..678891a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -18,9 +18,9 @@ override_dh_install:
# remove them from the nagvis package here
rm -f debian/nagvis/etc/nagvis/conf.d/demo.ini.php \
debian/nagvis/etc/nagvis/maps/demo*.cfg \
- debian/nagvis/var/cache/nagvis/userfiles/images/maps/demo*.png \
- debian/nagvis/var/cache/nagvis/userfiles/images/shapes/demo*.png
- # these files are shiped in /var/cache/nagvis/userfiles
+ debian/nagvis/var/lib/nagvis/userfiles/images/maps/demo*.png \
+ debian/nagvis/var/lib/nagvis/userfiles/images/shapes/demo*.png
+ # these files are shiped in /var/lib/nagvis/userfiles
# they are installed by the more general copy of the content of
# /usr/share/nagvis/share
rm -rf debian/nagvis/usr/share/nagvis/share/userfiles/
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-nagios/pkg-nagvis.git
More information about the Pkg-nagios-changes
mailing list