Revert patch from bubulle for now, so 1.6.6 can be uploaded

(I also removed the pending tag from 674859)

git-svn-id: svn://svn.debian.org/svn/pkg-nagios/nagvis/trunk@2051 98d490a6-b407-0410-aaaa-fdee166ba3f5

diff --git a/debian/changelog b/debian/changelog
index 31334aa96096cedc470acf90dce0505ab4205de0..824aae869978dcdf844736f29487e5ca4370e1b6 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,8 +4,6 @@ nagvis (1:1.6.6+dfsg.1-1) UNRELEASED; urgency=low
   * New upstream release
   * Adjust versioning scheme to lintian's recommendation
     * Also adjust debian/watch
   * New upstream release
   * Adjust versioning scheme to lintian's recommendation
     * Also adjust debian/watch

-  * Add patch from Christian Perrier and his gang to improve package
-    description and templates (first step of closing #674859)

   * Fix debian/watch to not track beta versions
 
  -- Alexander Reichle-Schmehl <tolimar@debian.org>  Wed, 23 May 2012 12:31:33 +0200
   * Fix debian/watch to not track beta versions
 
  -- Alexander Reichle-Schmehl <tolimar@debian.org>  Wed, 23 May 2012 12:31:33 +0200

diff --git a/debian/control b/debian/control
index 27b56a3d596ebcc3e60309f5b9326190d4fc1ec0..e4dd073a476c0dc93013fbfb72e591dedc3ee251 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -13,29 +13,36 @@ Package: nagvis
 Architecture: all
 Depends: ${misc:Depends}, php5-common (>= 5.3.0), libapache2-mod-php5, php5-gd, ucf, graphviz, php5-sqlite, php-net-socket, php-gettext, check-mk-livestatus
 Suggests: nagvis-demos
 Architecture: all
 Depends: ${misc:Depends}, php5-common (>= 5.3.0), libapache2-mod-php5, php5-gd, ucf, graphviz, php5-sqlite, php-net-socket, php-gettext, check-mk-livestatus
 Suggests: nagvis-demos

-Description: visualization addon for Nagios or Icinga
- NagVis can be used to visualize Nagios or Icinga data, for instance
- to display network traffic or IT services such as email.
+Description: Visualization addon for Nagios or Icinga
+ NagVis can be used to visualize Nagios or Icinga Data, e.g. to display IT
+ processes like  a mail system or a network infrastructure.

  .
  .

- Its key features are:
-  * Display of single hosts or services;
-  * Representation of a host dependent on the state of its services;
-  * Visualization of complete host- or servicegroups with one icon;
-  * Organization of hosts/services/groups into Sub-Map icons;
-  * Graphical representation of complete IT systems.
+ Key features are:
+ .
+  * Display of single Hosts or Services
+  * Display the state of a Host dependent on the state of its services
+    ("recognize services")
+  * Visualization of Host- or Servicegroups with one icon
+  * Define Sub-Map icons wich represent a complete NagVis Map of
+    Hosts/Services/Groups in one icon (drill down)
+  * Visualization of complete IT Processes using self drawn graphics

 
 Package: nagvis-demos
 Architecture: all
 Depends: ${misc:Depends}, nagvis (= ${source:Version})
 
 Package: nagvis-demos
 Architecture: all
 Depends: ${misc:Depends}, nagvis (= ${source:Version})

-Description: visualization addon for Nagios or Icinga - demo maps
- NagVis can be used to visualize Nagios or Icinga data, for instance
- to display network traffic or IT services such as email.
+Description: Demo Mapgs for NagVis
+ NagVis can be used to visualize Nagios or Icinga Data, e.g. to display IT
+ processes like  a mail system or a network infrastructure.

  .
  .

- Its key features are:
-  * Display of single hosts or services;
-  * Representation of a host dependent on the state of its services;
-  * Visualization of complete host- or servicegroups with one icon;
-  * Organization of hosts/services/groups into Sub-Map icons;
-  * Graphical representation of complete IT systems.
+ Key features are:

  .
  .

- This package provides some demonstration maps.
+  * Display of single Hosts or Services
+  * Display the state of a Host dependent on the state of its services
+    ("recognize services")
+  * Visualization of Host- or Servicegroups with one icon
+  * Define Sub-Map icons wich represent a complete NagVis Map of
+    Hosts/Services/Groups in one icon (drill down)
+  * Visualization of complete IT Processes using self drawn graphics
+  .
+  This package contains some demonstration maps.
+

diff --git a/debian/nagvis.templates b/debian/nagvis.templates
index 429b59b9a60f0ab175d35a2a4cfd3d05d8a6268f..799e1fd6384ab9b6ab1539d448652629dcab7420 100644 (file)
--- a/debian/nagvis.templates
+++ b/debian/nagvis.templates
@@ -1,30 +1,22 @@
-# These templates have been reviewed by the debian-l10n-english
-# team
-#
-# If modifications/additions/rewording are needed, please ask
-# debian-l10n-english@lists.debian.org for advice.
-#
-# Even minor modifications require translation updates and such
-# changes should be coordinated with translators and reviewers.
-

 Template: nagvis/monitoring_system
 Type: select
 Default: icinga
 Choices: icinga, nagios, other
 Template: nagvis/monitoring_system
 Type: select
 Default: icinga
 Choices: icinga, nagios, other

-_Description: Monitoring suite used with NagVis:
- The NagVis package supports Icinga as well as
- Nagios, using the check-mk-live broker backend.
+_Description: For which monitoring suite should NagVis be configured?
+ This NagVis package supports the monitoring suites Icinga as well as
+ well as Nagios using the check-mk-live broker backend.  please choose the,
+ respective entry.  

  .
  If you would like to use NagVis with a different backend or a different
  .
  If you would like to use NagVis with a different backend or a different

- monitoring suite, please choose "other". You'll have to configure it
+ monitoring suite, please choose "other".  You'll have to configure it

  manually.
 
 Template: nagvis/delete_on_purge
 Type: boolean
 Default: false
  manually.
 
 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
- /etc/nagvis (for instance background images and map files), including a small
- database for authentification. If you don't need any of these files,
+_Description: Should the user created NagVis data be removed?
+ During usage NagVis creates some file in /var/cache/nagvis and and
+ /etc/nagvis (e.g. 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.
  they can be removed now, or you may want to keep them and clean up by hand
  later.