[Pkg-nagios-changes] [pkg-nagios] r1961 - in nagvis/tags: . 1:1.4.6-2/debian 1:1.4.6-2/debian/patches

Alexander Reichle-Schmehl tolimar at alioth.debian.org
Wed Sep 7 14:59:50 UTC 2011


Author: tolimar
Date: 2011-09-07 14:59:49 +0000 (Wed, 07 Sep 2011)
New Revision: 1961

Added:
   nagvis/tags/1:1.4.6-2/
   nagvis/tags/1:1.4.6-2/debian/README.Debian
   nagvis/tags/1:1.4.6-2/debian/apache.conf
   nagvis/tags/1:1.4.6-2/debian/changelog
   nagvis/tags/1:1.4.6-2/debian/config
   nagvis/tags/1:1.4.6-2/debian/control
   nagvis/tags/1:1.4.6-2/debian/install
   nagvis/tags/1:1.4.6-2/debian/patches/config.dpatch
   nagvis/tags/1:1.4.6-2/debian/postrm
   nagvis/tags/1:1.4.6-2/debian/rules
Removed:
   nagvis/tags/1:1.4.6-2/debian/README.Debian
   nagvis/tags/1:1.4.6-2/debian/apache.conf
   nagvis/tags/1:1.4.6-2/debian/changelog
   nagvis/tags/1:1.4.6-2/debian/config
   nagvis/tags/1:1.4.6-2/debian/control
   nagvis/tags/1:1.4.6-2/debian/install
   nagvis/tags/1:1.4.6-2/debian/patches/config.dpatch
   nagvis/tags/1:1.4.6-2/debian/postrm
   nagvis/tags/1:1.4.6-2/debian/rules
Log:
[svn-buildpackage] Tagging nagvis 1:1.4.6-2

Deleted: nagvis/tags/1:1.4.6-2/debian/README.Debian
===================================================================
--- nagvis/trunk/debian/README.Debian	2011-09-07 10:28:20 UTC (rev 1937)
+++ nagvis/tags/1:1.4.6-2/debian/README.Debian	2011-09-07 14:59:49 UTC (rev 1961)
@@ -1,32 +0,0 @@
-nagvis for Debian
------------------
-
-Starting with 1.4.5, there are changes from older packages.
-
-* URL and CGI-Path:
-Since nagvis now can be used with other systems like icinga or web interface 
-like ninja, the htdocs path is no longer part of nagios3 directory structure. 
-The new directory for nagvis is now /usr/share/nagvis/htdocs/nagvis. The 
-authentication therefore has to be configured separately. Have a look at 
-/etc/nagvis/apache.conf and edit it for your needs.
-
- -- Wolfgang Barth <wob at swobspace.net>  Sat, 28 Nov 2009 12:00:00 +0200
-
-Thank you using the NagVis addon for Nagios Network Monitoring System.
-
-To get it work you have to be sure the ndoutils package is installed and works
-fine. NagVis uses the database account of ndoutils to connect to the database. If
-you change this account with reconfiguring ndoutils, don't forget to
-dpkg-reconfigure nagvis too to get the new configuration.
-
-If you got still errors of not working NDOUtils, check your /etc/nagios3/nagios.cfg
-if the broker module ndomod.o is enabled and check_external_commands=1 is set to
-get the table <prefix>_programstatus updated.
-(See http://www.nagvis.org/docs/general/often_reported_errors#nagiosnotrunning)
-
-There are some examples in /usr/share/doc/nagvis/examples/demo to see NagVis 
-functionality. Just copy the files in demo/ to the appropriate location and change
-its owner and group to be www-data:www-data.
-
- -- Hendrik Frenzel <hfrenzel at scunc.net>  Sat, 14 Jul 2007 11:27:33 +0200
-

Copied: nagvis/tags/1:1.4.6-2/debian/README.Debian (from rev 1938, nagvis/trunk/debian/README.Debian)
===================================================================
--- nagvis/tags/1:1.4.6-2/debian/README.Debian	                        (rev 0)
+++ nagvis/tags/1:1.4.6-2/debian/README.Debian	2011-09-07 14:59:49 UTC (rev 1961)
@@ -0,0 +1,40 @@
+nagvis for Debian
+-----------------
+
+Since Version 1:1.4.6-1.1 you may also use nagvis with a remote database.
+However you'll need to configure the Database settings by hand.
+
+Please see /usr/share/nagvis/debian/nagvis.ini.php-sample for an example
+configuration file, and place it at /etc/nagvis/nagvis.ini.php.
+
+ -- Alexander Reichle-Schmehl <tolimar at debian.org> Wed, 13 Oct 2010 15:44:01 +0200
+
+Starting with 1.4.5, there are changes from older packages.
+
+* URL and CGI-Path:
+Since nagvis now can be used with other systems like icinga or web interface 
+like ninja, the htdocs path is no longer part of nagios3 directory structure. 
+The new directory for nagvis is now /usr/share/nagvis/htdocs/nagvis. The 
+authentication therefore has to be configured separately. Have a look at 
+/etc/nagvis/apache.conf and edit it for your needs.
+
+ -- Wolfgang Barth <wob at swobspace.net>  Sat, 28 Nov 2009 12:00:00 +0200
+
+Thank you using the NagVis addon for Nagios Network Monitoring System.
+
+To get it work you have to be sure the ndoutils package is installed and works
+fine. NagVis uses the database account of ndoutils to connect to the database. If
+you change this account with reconfiguring ndoutils, don't forget to
+dpkg-reconfigure nagvis too to get the new configuration.
+
+If you got still errors of not working NDOUtils, check your /etc/nagios3/nagios.cfg
+if the broker module ndomod.o is enabled and check_external_commands=1 is set to
+get the table <prefix>_programstatus updated.
+(See http://www.nagvis.org/docs/general/often_reported_errors#nagiosnotrunning)
+
+There are some examples in /usr/share/doc/nagvis/examples/demo to see NagVis 
+functionality. Just copy the files in demo/ to the appropriate location and change
+its owner and group to be www-data:www-data.
+
+ -- Hendrik Frenzel <hfrenzel at scunc.net>  Sat, 14 Jul 2007 11:27:33 +0200
+

Deleted: nagvis/tags/1:1.4.6-2/debian/apache.conf
===================================================================
--- nagvis/trunk/debian/apache.conf	2011-09-07 10:28:20 UTC (rev 1937)
+++ nagvis/tags/1:1.4.6-2/debian/apache.conf	2011-09-07 14:59:49 UTC (rev 1961)
@@ -1,23 +0,0 @@
-# -- new style
-Alias /nagvis/nagvis/templates /etc/nagvis/templates
-Alias /nagvis/nagvis/gadgets /etc/nagvis/gadgets
-Alias /nagvis/nagvis/images /var/lib/nagvis/images
-Alias /nagvis /usr/share/nagvis/htdocs
-
-# -- old style
-# Alias /nagios3/nagvis /usr/share/nagvis/htdocs
-
-# -- use basic authentification from nagios3 package
-#    please adapt to your needs
-<DirectoryMatch (/usr/share/nagvis/htdocs|etc/nagvis(templates|gadgets)|/var/lib/nagvis)>
-        Options FollowSymLinks
-	DirectoryIndex index.php
-
-        Order Allow,Deny
-        Allow From All
-
-        AuthName "NagVis Access"
-        AuthType Basic
-        AuthUserFile /etc/nagios3/htpasswd.users
-	require valid-user
-</DirectoryMatch>

Copied: nagvis/tags/1:1.4.6-2/debian/apache.conf (from rev 1955, nagvis/trunk/debian/apache.conf)
===================================================================
--- nagvis/tags/1:1.4.6-2/debian/apache.conf	                        (rev 0)
+++ nagvis/tags/1:1.4.6-2/debian/apache.conf	2011-09-07 14:59:49 UTC (rev 1961)
@@ -0,0 +1,29 @@
+# -- new style
+Alias /nagvis/nagvis/templates /etc/nagvis/templates
+Alias /nagvis/nagvis/gadgets /etc/nagvis/gadgets
+Alias /nagvis/nagvis/images /var/lib/nagvis/images
+Alias /nagvis/docs /usr/share/doc/nagvis/docs
+Alias /nagvis /usr/share/nagvis/htdocs
+
+# the FollowSymlinks option is only considere in a directory section, not
+# in a DirectoryMatch section.  Setting it here.
+<Directory /usr/share/nagvis/htdocs>
+    Options FollowSymLinks
+</Directory>
+
+# -- old style
+# Alias /nagios3/nagvis /usr/share/nagvis/htdocs
+
+# -- use basic authentification from nagios3 package
+#    please adapt to your needs
+<DirectoryMatch (/usr/share/nagvis/htdocs|etc/nagvis(templates|gadgets)|/var/lib/nagvis|/usr/share/doc/nagvis/docs)>
+	DirectoryIndex index.php
+
+        Order Allow,Deny
+        Allow From All
+
+        AuthName "NagVis Access"
+        AuthType Basic
+        AuthUserFile /etc/nagios3/htpasswd.users
+	require valid-user
+</DirectoryMatch>

Deleted: nagvis/tags/1:1.4.6-2/debian/changelog
===================================================================
--- nagvis/trunk/debian/changelog	2011-09-07 10:28:20 UTC (rev 1937)
+++ nagvis/tags/1:1.4.6-2/debian/changelog	2011-09-07 14:59:49 UTC (rev 1961)
@@ -1,194 +0,0 @@
-nagvis (1:1.4.6-1) unstable; urgency=low
-
-  [ Hendrik Frenzel ]
-  * New upstream version (Closes: #533379)
-  * Fixed desctiption (Closes: #560705)
-  * Patched deprecated ereg to preg_match to get them work with php 5.3+
-
- -- Hendrik Frenzel <hfrenzel at scunc.net>  Fri, 19 Feb 2010 12:33:48 +0100
-
-nagvis (1:1.4.5-1) UNRELEASED; urgency=low
-
-  * (NOT RELEASED YET) New upstream release
-  [ Wolfgang Barth ]
-  * New upstream version
-  * User uploaded maps now in /var/lib/nagvis/images/maps 
-    (1.3.1: /etc/maps) to avoid security problems
-  * Cache location nagvis/var ist now /var/cache/nagvis
-  * nagios independent htmlbase /nagvis and corresponding apache.conf
-    linked to /etc/apache2/conf.d
-  * README.backends.Merlin added
-  * all images now in /var/lib/nagvis/images
-
-  [ Alexander Wirt ]
-  * New upstream version 
-  * Add myself to uploaders
-
-  [ Hendrik Frenzel ]
-  * fixed include path names in nagvis/ajax_handler.php
-
-  [ Jan Wagner ]
-  * Updating standards version to 3.8.3
-    - Add README.source
-
- -- Wolfgang Barth <wob at swobspace.net>  Sat, 28 Nov 2009 09:23:36 +0100
-
-nagvis (1:1.3.1-3) unstable; urgency=low
-
-  * adjust pathnames.dpatch to form_handler.php from correct location, thanks
-    Andreas Steinel (Closes: #522296)
-  * add myself to Uploaders
-  * move nagios3 and ndoutils-mysql to Recommends, thanks Josselin Mouette
-    (Closes: #507446)
-  * Bump Standards-Version to 3.8.2, no changes needed
-  * add ${misc:Depends} to Depends
-  * remove execute bit from images
-
- -- Jan Wagner <waja at cyconet.org>  Wed, 12 Aug 2009 12:49:27 +0200
-
-nagvis (1:1.3.1-2) unstable; urgency=low
-
-  * Added --debconf-ok to debian/post{inst,rm} (Closes: 522172)
-  * Copy wui/includes/functions to the right directory (Closes: 522296)
-
- -- Hendrik Frenzel <hfrenzel at scunc.net>  Wed, 15 Apr 2009 15:54:05 +0200
-
-nagvis (1:1.3.1-1) unstable; urgency=low
-
-  * New upstream version with many new features and bugfixes
-    + See http://docs.nagvis.org/1.3/en_US/changelog.html for more info.
-    + added graphviz to Depends
-
- -- Hendrik Frenzel <hfrenzel at scunc.net>  Sat, 27 Sep 2008 12:04:13 +0200
-
-nagvis (1:1.2.2-5) unstable; urgency=low
-
-  * changed from nagios2 to nagios3 support (Closes: 479290)
-  * debian/rules:
-    + used install instead of mkdir or cp
-  * debian/postinst:
-    + added nagvis apache.conf symlink in /etc/apache2/conf.d
-  debian/control:
-    + added libapache2-mod-php5 to Depends
-  * override lintian warning package-contains-empty-directory
-  * debian/copyright
-    + switched to format as proposed on
-      http://wiki.debian.org/Proposals/CopyrightFormat
-
- -- Hendrik Frenzel <hfrenzel at scunc.net>  Mon, 19 May 2008 22:51:09 +0200
-
-nagvis (1:1.2.2-4) unstable; urgency=low
-
-  * debian/changelog:
-    + changed wrong UNRELEASED tag of 1:1.2.2-2 to unstable
-  * nagvis/includes/defines/global.php:
-    + fixed CONST_MAINCFG to point to the right nagvis.ini.php
-  * debian/postinst:
-    + insert commented debconf-common variables if they are empty
-  * nagvis.ini.php-sample:
-    + changed variables base, htmlbase and htmlcgi defaults to fit the current
-      installation paths
-  * change pathnames of included/required files in some nagvis scripts
-
- -- Hendrik Frenzel <hfrenzel at scunc.net>  Mon, 17 Mar 2008 14:36:03 +0100
-
-nagvis (1:1.2.2-3) unstable; urgency=low
-
-  * fixed path of languages
-
- -- Hendrik Frenzel <hfrenzel at scunc.net>  Fri, 14 Mar 2008 13:32:53 +0100
-
-nagvis (1:1.2.2-2) unstable; urgency=low
-
-  * debian/rules
-    + packed missing directories (Closes: #470635: nagvis deb package is not
-      complete)
-  * postinst:
-    + moved debconfs db_stop after ucf is executed
-
- -- Hendrik Frenzel <hfrenzel at scunc.net>  Wed, 12 Mar 2008 16:45:22 +0100
-
-nagvis (1:1.2.2-1) unstable; urgency=low
-
-  * New upstream release with major bugfixes:
-    * Fixed bug with wrong only_hard_states handling
-    * Fixed Logical bug in getObjects(services)
-    * Spaces in format %20 are now allowed in URLs
-    * Service description is now shown in service hover menus
-    * WUI: Fixed map deletion protection when map is linked in another
-
- -- Hendrik Frenzel <hfrenzel at scunc.net>  Wed, 13 Feb 2008 10:06:59 +0100
-
-nagvis (1:1.2.1-1) unstable; urgency=low
-
-  * New upstream version
-  * Update Standards-Version to 3.7.3.
-  * Enabled DM-Upload
-  * Removed old Homepage stanza in debian/control
-  * Removed bashism in debian/rules
-
- -- Hendrik Frenzel <hfrenzel at scunc.net>  Thu, 10 Jan 2008 01:09:06 +0100
-
-nagvis (1:1.1-6) unstable; urgency=low
-
-  * fixed lintian redundant-origin-field warning
-
- -- Hendrik Frenzel <hfrenzel at scunc.net>  Mon, 19 Nov 2007 22:44:47 +0100
-
-nagvis (1:1.1-5) unstable; urgency=low
-
-  * Rebuild because of hardware failures at ries.debian.org after uploading the
-    package.
-
- -- Hendrik Frenzel <hfrenzel at scunc.net>  Sun, 18 Nov 2007 21:50:45 +0100
-
-nagvis (1:1.1-4) unstable; urgency=low
-
-  * Added licenses of nagvis/includes/js/overlib* (Artistic) and
-    wui/includes/js/wz* (LGPL) to debian/copyright
-  * Fixed Vcs-Svn and Vcs-Browser in debian/control
-
- -- Hendrik Frenzel <hfrenzel at scunc.net>  Tue, 30 Oct 2007 13:27:11 +0100
-
-nagvis (1:1.1-3) unstable; urgency=low
-
-  * Fixed symlinks
-  * Removed unnecessary directories
-
- -- Hendrik Frenzel <hfrenzel at scunc.net>  Fri, 19 Oct 2007 10:07:13 +0200
-
-nagvis (1:1.1-2) unstable; urgency=low
-
-  * Symlinked images/maps and images/tempates to the apropriate directory below
-    /etc/nagvis
-  * Added missing debian/postrm
-
- -- Hendrik Frenzel <hfrenzel at scunc.net>  Fri, 19 Oct 2007 00:30:05 +0200
-
-nagvis (1:1.1-1) unstable; urgency=low
-
-  * New upstream release
-
- -- Hendrik Frenzel <hfrenzel at scunc.net>  Thu, 06 Sep 2007 19:59:30 +0200
-
-nagvis (1.1rc3-2) unstable; urgency=low
-
-  * Moved from misc to net section
-  * Removed unneeded stuff in debian/rules
-  * Installed apache.conf with ucf 
-
- -- Hendrik Frenzel <hfrenzel at scunc.net>  Tue, 28 Aug 2007 21:09:01 +0200
-
-nagvis (1.1rc3-1) unstable; urgency=low
-
-  * New upstream version
-
- -- Hendrik Frenzel <hfrenzel at scunc.net>  Tue, 24 Jul 2007 19:57:44 +0200
-
-nagvis (1.1rc2-1) unstable; urgency=low
-
-  * Initial release (Closes: #433048: ITP: nagvis -- Visualization addon for
-    Nagios)
-
- -- Hendrik Frenzel <hfrenzel at scunc.net>  Sat, 14 Jul 2007 11:37:16 +0200
-

Copied: nagvis/tags/1:1.4.6-2/debian/changelog (from rev 1960, nagvis/trunk/debian/changelog)
===================================================================
--- nagvis/tags/1:1.4.6-2/debian/changelog	                        (rev 0)
+++ nagvis/tags/1:1.4.6-2/debian/changelog	2011-09-07 14:59:49 UTC (rev 1961)
@@ -0,0 +1,222 @@
+nagvis (1:1.4.6-2) unstable; urgency=medium
+
+  * Add myself to uploaders
+  * Acknowledge NMU (Closes: #595313)
+  * Only call ucf on purge if it's available (Closes: #620037)
+    * Set urgency to medium due to RC bug fix
+  * Set Path to gadget files in example configuration (via
+    patches/config.dpatch) (Closes: #611909)
+  * Properly set "Options FollowSymLinks" in the apache configuration
+    (Closes: #632333)
+  * Recommend real ndoutils package instead of the virtual one; no idea why
+    there is a virtual one (Closes: #598953)
+  * Remove previous maintainers from Uploaders.  Thanks to Hendrik and
+    Wolfgang for all their work!
+  * Actually install the documentation
+  * Bump standards (no changes needed)
+  * Add recommended targets to debian/rules
+
+ -- Alexander Reichle-Schmehl <tolimar at debian.org>  Wed, 07 Sep 2011 16:47:25 +0200
+
+nagvis (1:1.4.6-1.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Only try to configure local database, if ndoutils is run localy
+    (Closes: #595313)
+
+ -- Alexander Reichle-Schmehl <tolimar at debian.org>  Mon, 11 Oct 2010 13:55:28 +0200
+
+nagvis (1:1.4.6-1) unstable; urgency=low
+
+  [ Hendrik Frenzel ]
+  * New upstream version (Closes: #533379)
+  * Fixed desctiption (Closes: #560705)
+  * Patched deprecated ereg to preg_match to get them work with php 5.3+
+
+ -- Hendrik Frenzel <hfrenzel at scunc.net>  Fri, 19 Feb 2010 12:33:48 +0100
+
+nagvis (1:1.4.5-1) UNRELEASED; urgency=low
+
+  * (NOT RELEASED YET) New upstream release
+  [ Wolfgang Barth ]
+  * New upstream version
+  * User uploaded maps now in /var/lib/nagvis/images/maps 
+    (1.3.1: /etc/maps) to avoid security problems
+  * Cache location nagvis/var ist now /var/cache/nagvis
+  * nagios independent htmlbase /nagvis and corresponding apache.conf
+    linked to /etc/apache2/conf.d
+  * README.backends.Merlin added
+  * all images now in /var/lib/nagvis/images
+
+  [ Alexander Wirt ]
+  * New upstream version 
+  * Add myself to uploaders
+
+  [ Hendrik Frenzel ]
+  * fixed include path names in nagvis/ajax_handler.php
+
+  [ Jan Wagner ]
+  * Updating standards version to 3.8.3
+    - Add README.source
+
+ -- Wolfgang Barth <wob at swobspace.net>  Sat, 28 Nov 2009 09:23:36 +0100
+
+nagvis (1:1.3.1-3) unstable; urgency=low
+
+  * adjust pathnames.dpatch to form_handler.php from correct location, thanks
+    Andreas Steinel (Closes: #522296)
+  * add myself to Uploaders
+  * move nagios3 and ndoutils-mysql to Recommends, thanks Josselin Mouette
+    (Closes: #507446)
+  * Bump Standards-Version to 3.8.2, no changes needed
+  * add ${misc:Depends} to Depends
+  * remove execute bit from images
+
+ -- Jan Wagner <waja at cyconet.org>  Wed, 12 Aug 2009 12:49:27 +0200
+
+nagvis (1:1.3.1-2) unstable; urgency=low
+
+  * Added --debconf-ok to debian/post{inst,rm} (Closes: 522172)
+  * Copy wui/includes/functions to the right directory (Closes: 522296)
+
+ -- Hendrik Frenzel <hfrenzel at scunc.net>  Wed, 15 Apr 2009 15:54:05 +0200
+
+nagvis (1:1.3.1-1) unstable; urgency=low
+
+  * New upstream version with many new features and bugfixes
+    + See http://docs.nagvis.org/1.3/en_US/changelog.html for more info.
+    + added graphviz to Depends
+
+ -- Hendrik Frenzel <hfrenzel at scunc.net>  Sat, 27 Sep 2008 12:04:13 +0200
+
+nagvis (1:1.2.2-5) unstable; urgency=low
+
+  * changed from nagios2 to nagios3 support (Closes: 479290)
+  * debian/rules:
+    + used install instead of mkdir or cp
+  * debian/postinst:
+    + added nagvis apache.conf symlink in /etc/apache2/conf.d
+  debian/control:
+    + added libapache2-mod-php5 to Depends
+  * override lintian warning package-contains-empty-directory
+  * debian/copyright
+    + switched to format as proposed on
+      http://wiki.debian.org/Proposals/CopyrightFormat
+
+ -- Hendrik Frenzel <hfrenzel at scunc.net>  Mon, 19 May 2008 22:51:09 +0200
+
+nagvis (1:1.2.2-4) unstable; urgency=low
+
+  * debian/changelog:
+    + changed wrong UNRELEASED tag of 1:1.2.2-2 to unstable
+  * nagvis/includes/defines/global.php:
+    + fixed CONST_MAINCFG to point to the right nagvis.ini.php
+  * debian/postinst:
+    + insert commented debconf-common variables if they are empty
+  * nagvis.ini.php-sample:
+    + changed variables base, htmlbase and htmlcgi defaults to fit the current
+      installation paths
+  * change pathnames of included/required files in some nagvis scripts
+
+ -- Hendrik Frenzel <hfrenzel at scunc.net>  Mon, 17 Mar 2008 14:36:03 +0100
+
+nagvis (1:1.2.2-3) unstable; urgency=low
+
+  * fixed path of languages
+
+ -- Hendrik Frenzel <hfrenzel at scunc.net>  Fri, 14 Mar 2008 13:32:53 +0100
+
+nagvis (1:1.2.2-2) unstable; urgency=low
+
+  * debian/rules
+    + packed missing directories (Closes: #470635: nagvis deb package is not
+      complete)
+  * postinst:
+    + moved debconfs db_stop after ucf is executed
+
+ -- Hendrik Frenzel <hfrenzel at scunc.net>  Wed, 12 Mar 2008 16:45:22 +0100
+
+nagvis (1:1.2.2-1) unstable; urgency=low
+
+  * New upstream release with major bugfixes:
+    * Fixed bug with wrong only_hard_states handling
+    * Fixed Logical bug in getObjects(services)
+    * Spaces in format %20 are now allowed in URLs
+    * Service description is now shown in service hover menus
+    * WUI: Fixed map deletion protection when map is linked in another
+
+ -- Hendrik Frenzel <hfrenzel at scunc.net>  Wed, 13 Feb 2008 10:06:59 +0100
+
+nagvis (1:1.2.1-1) unstable; urgency=low
+
+  * New upstream version
+  * Update Standards-Version to 3.7.3.
+  * Enabled DM-Upload
+  * Removed old Homepage stanza in debian/control
+  * Removed bashism in debian/rules
+
+ -- Hendrik Frenzel <hfrenzel at scunc.net>  Thu, 10 Jan 2008 01:09:06 +0100
+
+nagvis (1:1.1-6) unstable; urgency=low
+
+  * fixed lintian redundant-origin-field warning
+
+ -- Hendrik Frenzel <hfrenzel at scunc.net>  Mon, 19 Nov 2007 22:44:47 +0100
+
+nagvis (1:1.1-5) unstable; urgency=low
+
+  * Rebuild because of hardware failures at ries.debian.org after uploading the
+    package.
+
+ -- Hendrik Frenzel <hfrenzel at scunc.net>  Sun, 18 Nov 2007 21:50:45 +0100
+
+nagvis (1:1.1-4) unstable; urgency=low
+
+  * Added licenses of nagvis/includes/js/overlib* (Artistic) and
+    wui/includes/js/wz* (LGPL) to debian/copyright
+  * Fixed Vcs-Svn and Vcs-Browser in debian/control
+
+ -- Hendrik Frenzel <hfrenzel at scunc.net>  Tue, 30 Oct 2007 13:27:11 +0100
+
+nagvis (1:1.1-3) unstable; urgency=low
+
+  * Fixed symlinks
+  * Removed unnecessary directories
+
+ -- Hendrik Frenzel <hfrenzel at scunc.net>  Fri, 19 Oct 2007 10:07:13 +0200
+
+nagvis (1:1.1-2) unstable; urgency=low
+
+  * Symlinked images/maps and images/tempates to the apropriate directory below
+    /etc/nagvis
+  * Added missing debian/postrm
+
+ -- Hendrik Frenzel <hfrenzel at scunc.net>  Fri, 19 Oct 2007 00:30:05 +0200
+
+nagvis (1:1.1-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Hendrik Frenzel <hfrenzel at scunc.net>  Thu, 06 Sep 2007 19:59:30 +0200
+
+nagvis (1.1rc3-2) unstable; urgency=low
+
+  * Moved from misc to net section
+  * Removed unneeded stuff in debian/rules
+  * Installed apache.conf with ucf 
+
+ -- Hendrik Frenzel <hfrenzel at scunc.net>  Tue, 28 Aug 2007 21:09:01 +0200
+
+nagvis (1.1rc3-1) unstable; urgency=low
+
+  * New upstream version
+
+ -- Hendrik Frenzel <hfrenzel at scunc.net>  Tue, 24 Jul 2007 19:57:44 +0200
+
+nagvis (1.1rc2-1) unstable; urgency=low
+
+  * Initial release (Closes: #433048: ITP: nagvis -- Visualization addon for
+    Nagios)
+
+ -- Hendrik Frenzel <hfrenzel at scunc.net>  Sat, 14 Jul 2007 11:37:16 +0200
+

Deleted: nagvis/tags/1:1.4.6-2/debian/config
===================================================================
--- nagvis/trunk/debian/config	2011-09-07 10:28:20 UTC (rev 1937)
+++ nagvis/tags/1:1.4.6-2/debian/config	2011-09-07 14:59:49 UTC (rev 1961)
@@ -1,18 +0,0 @@
-#!/bin/sh
-set -e
-
-. /usr/share/debconf/confmodule
-
-tmp=`mktemp`
-dbconfig-load-include -f sh \
-	-udbc_dbuser -pdbc_dbpass -ddbc_dbname -sdbc_dbserver -Pdbc_dbport \
-	/etc/dbconfig-common/ndoutils-mysql.conf > $tmp
-. $tmp
-rm -f $tmp
-
-if [ -f /usr/share/dbconfig-common/dpkg/frontend.config.mysql ]; then
-	. /usr/share/dbconfig-common/dpkg/frontend.config.mysql
-	dbc_go nagvis $@
-fi
-db_stop
-

Copied: nagvis/tags/1:1.4.6-2/debian/config (from rev 1938, nagvis/trunk/debian/config)
===================================================================
--- nagvis/tags/1:1.4.6-2/debian/config	                        (rev 0)
+++ nagvis/tags/1:1.4.6-2/debian/config	2011-09-07 14:59:49 UTC (rev 1961)
@@ -0,0 +1,21 @@
+#!/bin/sh
+set -e
+
+. /usr/share/debconf/confmodule
+
+tmp=`mktemp`
+
+if [ -f /etc/dbconfig-common/ndoutils-mysql.conf ] ; then
+	dbconfig-load-include -f sh \
+		-udbc_dbuser -pdbc_dbpass -ddbc_dbname -sdbc_dbserver -Pdbc_dbport \
+		/etc/dbconfig-common/ndoutils-mysql.conf > $tmp
+	. $tmp
+	if [ -f /usr/share/dbconfig-common/dpkg/frontend.config.mysql ]; then
+		. /usr/share/dbconfig-common/dpkg/frontend.config.mysql
+		dbc_go nagvis $@
+	fi
+	db_stop
+fi
+
+rm -f $tmp
+

Deleted: nagvis/tags/1:1.4.6-2/debian/control
===================================================================
--- nagvis/trunk/debian/control	2011-09-07 10:28:20 UTC (rev 1937)
+++ nagvis/tags/1:1.4.6-2/debian/control	2011-09-07 14:59:49 UTC (rev 1961)
@@ -1,29 +0,0 @@
-Source: nagvis
-Section: net
-Priority: extra
-Maintainer: Debian Nagios Maintainer Group <pkg-nagios-devel at lists.alioth.debian.org>
-Uploaders: Jan Wagner <waja at cyconet.org>, Alexander Wirt <formorer at debian.org>, Hendrik Frenzel <hfrenzel at scunc.net>, Wolfgang Barth <wob at swobspace.net> 
-Build-Depends: debhelper (>= 6.0.7~), dpatch
-Standards-Version: 3.8.4
-Homepage: http://www.nagvis.org
-Vcs-Svn: svn://svn.debian.org/svn/pkg-nagios/nagvis/trunk/
-Vcs-Browser: http://svn.debian.org/wsvn/pkg-nagios/nagvis/trunk/
-Dm-Upload-Allowed: yes
-
-Package: nagvis
-Architecture: all
-Depends: ${misc:Depends}, php5-common (>= 5.3.0), libapache2-mod-php5, php5-mysql, php5-gd, ucf, dbconfig-common, graphviz
-Recommends: nagios3, ndoutils-mysql
-Description: Visualization addon for Nagios
- NagVis can be used to visualize Nagios Data, e.g. to display IT processes like
- a mail system or a network infrastructure.
- .
- 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- oder 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

Copied: nagvis/tags/1:1.4.6-2/debian/control (from rev 1956, nagvis/trunk/debian/control)
===================================================================
--- nagvis/tags/1:1.4.6-2/debian/control	                        (rev 0)
+++ nagvis/tags/1:1.4.6-2/debian/control	2011-09-07 14:59:49 UTC (rev 1961)
@@ -0,0 +1,29 @@
+Source: nagvis
+Section: net
+Priority: extra
+Maintainer: Debian Nagios Maintainer Group <pkg-nagios-devel at lists.alioth.debian.org>
+Uploaders: Jan Wagner <waja at cyconet.org>, Alexander Wirt <formorer at debian.org>, Alexander Reichle-Schmehl <tolimar at debian.org>
+Build-Depends: debhelper (>= 6.0.7~), dpatch
+Standards-Version: 3.9.2
+Homepage: http://www.nagvis.org
+Vcs-Svn: svn://svn.debian.org/svn/pkg-nagios/nagvis/trunk/
+Vcs-Browser: http://svn.debian.org/wsvn/pkg-nagios/nagvis/trunk/
+Dm-Upload-Allowed: yes
+
+Package: nagvis
+Architecture: all
+Depends: ${misc:Depends}, php5-common (>= 5.3.0), libapache2-mod-php5, php5-mysql, php5-gd, ucf, dbconfig-common, graphviz
+Recommends: nagios3, ndoutils-nagios3-mysql
+Description: Visualization addon for Nagios
+ NagVis can be used to visualize Nagios Data, e.g. to display IT processes like
+ a mail system or a network infrastructure.
+ .
+ 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- oder 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

Deleted: nagvis/tags/1:1.4.6-2/debian/install
===================================================================
--- nagvis/trunk/debian/install	2011-09-07 10:28:20 UTC (rev 1937)
+++ nagvis/tags/1:1.4.6-2/debian/install	2011-09-07 14:59:49 UTC (rev 1961)
@@ -1,6 +0,0 @@
-etc/* /etc/nagvis
-nagvis/* /usr/share/nagvis/htdocs/nagvis
-wui/* /usr/share/nagvis/htdocs/wui
-index.php  /usr/share/nagvis/htdocs
-debian/apache.conf /usr/share/nagvis/debian
-debian/apache.conf /etc/nagvis

Copied: nagvis/tags/1:1.4.6-2/debian/install (from rev 1954, nagvis/trunk/debian/install)
===================================================================
--- nagvis/tags/1:1.4.6-2/debian/install	                        (rev 0)
+++ nagvis/tags/1:1.4.6-2/debian/install	2011-09-07 14:59:49 UTC (rev 1961)
@@ -0,0 +1,7 @@
+etc/* /etc/nagvis
+nagvis/* /usr/share/nagvis/htdocs/nagvis
+docs /usr/share/doc/nagvis
+wui/* /usr/share/nagvis/htdocs/wui
+index.php  /usr/share/nagvis/htdocs
+debian/apache.conf /usr/share/nagvis/debian
+debian/apache.conf /etc/nagvis

Deleted: nagvis/tags/1:1.4.6-2/debian/patches/config.dpatch
===================================================================
--- nagvis/trunk/debian/patches/config.dpatch	2011-09-07 10:28:20 UTC (rev 1937)
+++ nagvis/tags/1:1.4.6-2/debian/patches/config.dpatch	2011-09-07 14:59:49 UTC (rev 1961)
@@ -1,100 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## config.dpatch by Wolfgang Barth <wob at swobspace.net>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: changes default configs
-
- at DPATCH@
-diff -urNad nagvis-1.4.6~/etc/nagvis.ini.php-sample nagvis-1.4.6/etc/nagvis.ini.php-sample
---- nagvis-1.4.6~/etc/nagvis.ini.php-sample	2010-02-04 21:51:13.000000000 +0100
-+++ nagvis-1.4.6/etc/nagvis.ini.php-sample	2010-03-01 18:40:01.000000000 +0100
-@@ -24,17 +24,26 @@
- 
- ; Path definitions
- [paths]
--; absolute physical NagVis path
--;base="/usr/local/nagios/share/nagvis/"
-+base="/usr/share/nagvis/htdocs/"
-+cfg="/etc/nagvis/"
-+var="/var/cache/nagvis/"
-+mapcfg="/etc/nagvis/maps/"
-+images="/var/lib/nagvis/images/"
-+icon="/var/lib/nagvis/images/iconsets/"
-+shape="/var/lib/nagvis/images/shapes/"
-+map="/var/lib/nagvis/images/maps/"
-+headertemplate="/etc/nagvis/templates/header/"
-+hovertemplate="/etc/nagvis/templates/hover/"
-+contexttemplate="/etc/nagvis/templates/context/"
- ; absolute html NagVis path
--;htmlbase="/nagios/nagvis"
-+htmlbase="/nagvis"
- ; absolute html NagVis cgi path
--;htmlcgi="/nagios/cgi-bin"
-+htmlcgi="/nagios3/cgi-bin"
- 
- ; Default values which get inherited to the maps and its objects
- [defaults]
- ; default backend (id of the default backend)
--;backend="ndomy_1"
-+backend="ndomy_1"
- ; background color of maps
- ;backgroundcolor="#fff"
- ; Enable/Disable the context menu on map objects. With the context menu you are
-@@ -158,8 +168,8 @@
- ; ----------------------------
- 
- ; Example definition of a livestatus backend. In this case the backend_id is live_1
--[backend_live_1]
--backendtype="mklivestatus"
-+;[backend_live_1]
-+;backendtype="mklivestatus"
- ;socket="unix:/usr/local/nagios/var/rw/live"
- 
- ; in this example the ID of the Backend is "ndomy_1" you can define another ID.
-@@ -186,9 +196,9 @@
- ;htmlcgi="/nagios/cgi-bin"
- 
- ; in this example the ID of the Backend is "ndo2fs_1" you can define another ID.
--[backend_ndo2fs_1]
-+;[backend_ndo2fs_1]
- ; type of backend - MUST be set
--backendtype="ndo2fs"
-+;backendtype="ndo2fs"
- ; Path to the ndo2fs var directory where the VOLATILE and PERSISTENT directories are
- ;path="/usr/local/ndo2fs/var"
- ; Name of the instance to get the data from
-@@ -223,12 +233,12 @@
- 
- ; in this example the browser switches between the maps demo and demo2 every 15
- ; seconds, the rotation is enabled by url: index.php?rotation=demo
--[rotation_demo]
-+;[rotation_demo]
- ; These steps are rotated. The "Demo2:" is a label which is being displayed in
- ; the index pages rotation list.
--maps="demo,Demo2:demo2"
-+;maps="demo,Demo2:demo2"
- ; rotation interval (seconds)
--interval=15
-+;interval=15
- 
- ; ------------------------------------------------------------------------------
- ; Below you find some advanced stuff
-diff -urNad nagvis-1.4.6~/nagvis/includes/defines/global.php nagvis-1.4.6/nagvis/includes/defines/global.php
---- nagvis-1.4.6~/nagvis/includes/defines/global.php	2010-02-04 21:51:13.000000000 +0100
-+++ nagvis-1.4.6/nagvis/includes/defines/global.php	2010-03-01 18:39:30.000000000 +0100
-@@ -61,13 +61,13 @@
- define('DEBUGLEVEL', 4);
- 
- // Path to the debug file
--define('DEBUGFILE', '../var/nagvis-debug.log');
-+define('DEBUGFILE', '/var/log/nagvis-debug.log');
- 
- // NagVis Version
- define('CONST_VERSION', '1.4.6');
- 
- // Path to the main configuration file
--define('CONST_MAINCFG', '../etc/nagvis.ini.php');
-+define('CONST_MAINCFG', '/etc/nagvis/nagvis.ini.php');
- 
- // Needed minimal PHP version
- define('CONST_NEEDED_PHP_VERSION', '5.0');

Copied: nagvis/tags/1:1.4.6-2/debian/patches/config.dpatch (from rev 1944, nagvis/trunk/debian/patches/config.dpatch)
===================================================================
--- nagvis/tags/1:1.4.6-2/debian/patches/config.dpatch	                        (rev 0)
+++ nagvis/tags/1:1.4.6-2/debian/patches/config.dpatch	2011-09-07 14:59:49 UTC (rev 1961)
@@ -0,0 +1,101 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## config.dpatch by Wolfgang Barth <wob at swobspace.net>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: changes default configs
+
+ at DPATCH@
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' nagvis-1.4.6~/etc/nagvis.ini.php-sample nagvis-1.4.6/etc/nagvis.ini.php-sample
+--- nagvis-1.4.6~/etc/nagvis.ini.php-sample	2010-02-04 21:51:13.000000000 +0100
++++ nagvis-1.4.6/etc/nagvis.ini.php-sample	2011-09-07 14:19:01.000000000 +0200
+@@ -24,17 +24,27 @@
+ 
+ ; Path definitions
+ [paths]
+-; absolute physical NagVis path
+-;base="/usr/local/nagios/share/nagvis/"
++base="/usr/share/nagvis/htdocs/"
++cfg="/etc/nagvis/"
++var="/var/cache/nagvis/"
++mapcfg="/etc/nagvis/maps/"
++images="/var/lib/nagvis/images/"
++icon="/var/lib/nagvis/images/iconsets/"
++shape="/var/lib/nagvis/images/shapes/"
++map="/var/lib/nagvis/images/maps/"
++headertemplate="/etc/nagvis/templates/header/"
++hovertemplate="/etc/nagvis/templates/hover/"
++contexttemplate="/etc/nagvis/templates/context/"
++gadget="/etc/nagvis/gadgets"
+ ; absolute html NagVis path
+-;htmlbase="/nagios/nagvis"
++htmlbase="/nagvis"
+ ; absolute html NagVis cgi path
+-;htmlcgi="/nagios/cgi-bin"
++htmlcgi="/nagios3/cgi-bin"
+ 
+ ; Default values which get inherited to the maps and its objects
+ [defaults]
+ ; default backend (id of the default backend)
+-;backend="ndomy_1"
++backend="ndomy_1"
+ ; background color of maps
+ ;backgroundcolor="#fff"
+ ; Enable/Disable the context menu on map objects. With the context menu you are
+@@ -158,8 +168,8 @@
+ ; ----------------------------
+ 
+ ; Example definition of a livestatus backend. In this case the backend_id is live_1
+-[backend_live_1]
+-backendtype="mklivestatus"
++;[backend_live_1]
++;backendtype="mklivestatus"
+ ;socket="unix:/usr/local/nagios/var/rw/live"
+ 
+ ; in this example the ID of the Backend is "ndomy_1" you can define another ID.
+@@ -186,9 +196,9 @@
+ ;htmlcgi="/nagios/cgi-bin"
+ 
+ ; in this example the ID of the Backend is "ndo2fs_1" you can define another ID.
+-[backend_ndo2fs_1]
++;[backend_ndo2fs_1]
+ ; type of backend - MUST be set
+-backendtype="ndo2fs"
++;backendtype="ndo2fs"
+ ; Path to the ndo2fs var directory where the VOLATILE and PERSISTENT directories are
+ ;path="/usr/local/ndo2fs/var"
+ ; Name of the instance to get the data from
+@@ -223,12 +233,12 @@
+ 
+ ; in this example the browser switches between the maps demo and demo2 every 15
+ ; seconds, the rotation is enabled by url: index.php?rotation=demo
+-[rotation_demo]
++;[rotation_demo]
+ ; These steps are rotated. The "Demo2:" is a label which is being displayed in
+ ; the index pages rotation list.
+-maps="demo,Demo2:demo2"
++;maps="demo,Demo2:demo2"
+ ; rotation interval (seconds)
+-interval=15
++;interval=15
+ 
+ ; ------------------------------------------------------------------------------
+ ; Below you find some advanced stuff
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' nagvis-1.4.6~/nagvis/includes/defines/global.php nagvis-1.4.6/nagvis/includes/defines/global.php
+--- nagvis-1.4.6~/nagvis/includes/defines/global.php	2010-02-04 21:51:13.000000000 +0100
++++ nagvis-1.4.6/nagvis/includes/defines/global.php	2011-09-07 14:18:33.000000000 +0200
+@@ -61,13 +61,13 @@
+ define('DEBUGLEVEL', 4);
+ 
+ // Path to the debug file
+-define('DEBUGFILE', '../var/nagvis-debug.log');
++define('DEBUGFILE', '/var/log/nagvis-debug.log');
+ 
+ // NagVis Version
+ define('CONST_VERSION', '1.4.6');
+ 
+ // Path to the main configuration file
+-define('CONST_MAINCFG', '../etc/nagvis.ini.php');
++define('CONST_MAINCFG', '/etc/nagvis/nagvis.ini.php');
+ 
+ // Needed minimal PHP version
+ define('CONST_NEEDED_PHP_VERSION', '5.0');

Deleted: nagvis/tags/1:1.4.6-2/debian/postrm
===================================================================
--- nagvis/trunk/debian/postrm	2011-09-07 10:28:20 UTC (rev 1937)
+++ nagvis/tags/1:1.4.6-2/debian/postrm	2011-09-07 14:59:49 UTC (rev 1961)
@@ -1,61 +0,0 @@
-#!/bin/sh
-# postrm script for nagvis
-#
-# see: dh_installdeb(1)
-
-set -e
-
-if [ -f /usr/share/debconf/confmodule ]; then
-	. /usr/share/debconf/confmodule
-fi
-
-if [ -f /usr/share/dbconfig-common/dpkg/postrm.mysql ]; then
-	. /usr/share/dbconfig-common/dpkg/frontend.postrm.mysql
-	dbc_go nagvis $@
-fi
-
-# summary of how this script can be called:
-#        * <postrm> `remove'
-#        * <postrm> `purge'
-#        * <old-postrm> `upgrade' <new-version>
-#        * <new-postrm> `failed-upgrade' <old-version>
-#        * <new-postrm> `abort-install'
-#        * <new-postrm> `abort-install' <old-version>
-#        * <new-postrm> `abort-upgrade' <old-version>
-#        * <disappearer's-postrm> `disappear' <overwriter>
-#          <overwriter-version>
-# for details, see http://www.debian.org/doc/debian-policy/ or
-# the debian-policy package
-
-
-case "$1" in
-    purge|remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
-    ;;
-
-    *)
-        echo "postrm called with unknown argument \`$1'" >&2
-        exit 1
-    ;;
-esac
-
-if [ "$1" = "purge" ]; then
-	for file in apache.conf nagvis.ini.php; do
-		rm -f /etc/nagvis/$file
-		ucf --debconf-ok --purge /etc/nagvis/$file
-	done
-
-	#if [ -e /etc/apache2/conf.d/nagvis.conf ]; then
-	#	rm -f /etc/apache2/conf.d/nagvis.conf
-	#fi
-
-	rm -rf /var/cache/nagvis
-fi
-	
-# dh_installdeb will replace this with shell code automatically
-# generated by other debhelper scripts.
-
-#DEBHELPER#
-
-exit 0
-
-

Copied: nagvis/tags/1:1.4.6-2/debian/postrm (from rev 1958, nagvis/trunk/debian/postrm)
===================================================================
--- nagvis/tags/1:1.4.6-2/debian/postrm	                        (rev 0)
+++ nagvis/tags/1:1.4.6-2/debian/postrm	2011-09-07 14:59:49 UTC (rev 1961)
@@ -0,0 +1,63 @@
+#!/bin/sh
+# postrm script for nagvis
+#
+# see: dh_installdeb(1)
+
+set -e
+
+if [ -f /usr/share/debconf/confmodule ]; then
+	. /usr/share/debconf/confmodule
+fi
+
+if [ -f /usr/share/dbconfig-common/dpkg/postrm.mysql ]; then
+	. /usr/share/dbconfig-common/dpkg/frontend.postrm.mysql
+	dbc_go nagvis $@
+fi
+
+# summary of how this script can be called:
+#        * <postrm> `remove'
+#        * <postrm> `purge'
+#        * <old-postrm> `upgrade' <new-version>
+#        * <new-postrm> `failed-upgrade' <old-version>
+#        * <new-postrm> `abort-install'
+#        * <new-postrm> `abort-install' <old-version>
+#        * <new-postrm> `abort-upgrade' <old-version>
+#        * <disappearer's-postrm> `disappear' <overwriter>
+#          <overwriter-version>
+# for details, see http://www.debian.org/doc/debian-policy/ or
+# the debian-policy package
+
+
+case "$1" in
+    purge|remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
+    ;;
+
+    *)
+        echo "postrm called with unknown argument \`$1'" >&2
+        exit 1
+    ;;
+esac
+
+if [ "$1" = "purge" ]; then
+	for file in apache.conf nagvis.ini.php; do
+		rm -f /etc/nagvis/$file
+		if [ -x /usr/bin/ucf ] ; then
+			ucf --debconf-ok --purge /etc/nagvis/$file
+		fi
+	done
+
+	#if [ -e /etc/apache2/conf.d/nagvis.conf ]; then
+	#	rm -f /etc/apache2/conf.d/nagvis.conf
+	#fi
+
+	rm -rf /var/cache/nagvis
+fi
+	
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0
+
+

Deleted: nagvis/tags/1:1.4.6-2/debian/rules
===================================================================
--- nagvis/trunk/debian/rules	2011-09-07 10:28:20 UTC (rev 1937)
+++ nagvis/tags/1:1.4.6-2/debian/rules	2011-09-07 14:59:49 UTC (rev 1961)
@@ -1,93 +0,0 @@
-#!/usr/bin/make -f
-# debian/rules makefile for nagvis
-# Last modified:
-# $Id$
-
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
-
-include /usr/share/dpatch/dpatch.make
-DEST = debian/nagvis
-TMP  = debian/tmp
-
-configure: configure-stamp
-configure-stamp:
-	dh_testdir
-	touch configure-stamp
-
-build: build-stamp patch-stamp
-build-stamp: configure-stamp 
-	dh_testdir
-	#$(MAKE)
-	#docbook-to-man debian/nagvis.sgml > nagvis.1
-	touch $@
-
-clean: unpatch
-	dh_testdir
-	dh_testroot
-	rm -f build-stamp configure-stamp
-	# Add here commands to clean up after the build process.
-	#-$(MAKE) clean
-	dh_clean 
-
-install: build
-	dh_testdir
-	dh_testroot
-	dh_clean -k
-	dh_installdirs
-	dh_install
-	
-	# -- images to /var 
-	rm -f $(DEST)/usr/share/nagvis/htdocs/nagvis/images/*/.gitignore
-	rm -f $(DEST)/usr/share/nagvis/htdocs/nagvis/images/*/*/.gitignore
-	mv $(DEST)/usr/share/nagvis/htdocs/nagvis/images/* $(DEST)/var/lib/nagvis/images/.
-	
-	# -- templates
-	mv $(DEST)/usr/share/nagvis/htdocs/nagvis/templates $(DEST)/etc/nagvis/.
-	
-	# -- gadgets
-	mv $(DEST)/usr/share/nagvis/htdocs/nagvis/gadgets $(DEST)/etc/nagvis/.
-	
-	[ -x /usr/bin/html2text ] && \
-		 /usr/bin/html2text -ascii -nobs < docs/en_US/changelog.html > docs/changelog
-	mv $(DEST)/etc/nagvis/nagvis.ini.php-sample \
-		$(DEST)/usr/share/nagvis/debian/
-	sed -e 's/^[; ]*\(\<dbhost\) *=.*$$/\1=_DBC_DBSERVER_/' \
-	    -e 's/^[; ]*\(\<dbport\) *=.*$$/\1=_DBC_DBPORT_/' \
-	    -e 's/^[; ]*\(\<dbname\) *=.*$$/\1=_DBC_DBNAME_/' \
-	    -e 's/^[; ]*\(\<dbuser\) *=.*$$/\1=_DBC_DBUSER_/' \
-	    -e 's/^[; ]*\(\<dbpass\) *=.*$$/\1=_DBC_DBPASS_/' \
-	 < $(DEST)/usr/share/nagvis/debian/nagvis.ini.php-sample \
-	 > $(DEST)/usr/share/nagvis/debian/nagvis.ini.php-sample.new && \
-	 mv $(DEST)/usr/share/nagvis/debian/nagvis.ini.php-sample.new \
-	    $(DEST)/usr/share/nagvis/debian/nagvis.ini.php-sample
-	
-	# demo site
-	install -d $(TMP)/demo/etc/nagvis/maps
-	mv $(DEST)/etc/nagvis/maps/demo*.cfg $(TMP)/demo/etc/nagvis/maps/
-	
-	dh_link
-	dh_lintian
-
-# Build architecture-dependent files here.
-binary-arch: build install
-# We have nothing to do by default.
-
-# Build architecture-independent files here.
-binary-indep: build install
-	dh_testdir
-	dh_testroot
-	dh_installchangelogs 
-	dh_installdocs
-	dh_installexamples
-	dh_installdebconf	
-	dh_compress
-	dh_fixperms
-	dh_installdeb
-	dh_shlibdeps
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install configure

Copied: nagvis/tags/1:1.4.6-2/debian/rules (from rev 1957, nagvis/trunk/debian/rules)
===================================================================
--- nagvis/tags/1:1.4.6-2/debian/rules	                        (rev 0)
+++ nagvis/tags/1:1.4.6-2/debian/rules	2011-09-07 14:59:49 UTC (rev 1961)
@@ -0,0 +1,96 @@
+#!/usr/bin/make -f
+# debian/rules makefile for nagvis
+# Last modified:
+# $Id$
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+include /usr/share/dpatch/dpatch.make
+DEST = debian/nagvis
+TMP  = debian/tmp
+
+configure: configure-stamp
+configure-stamp:
+	dh_testdir
+	touch configure-stamp
+
+
+build: build-arch build-indep
+build-arch: build-stamp
+build-indep: build-stamp
+build-stamp: configure-stamp
+	dh_testdir
+	#$(MAKE)
+	#docbook-to-man debian/nagvis.sgml > nagvis.1
+	touch $@
+
+clean: unpatch
+	dh_testdir
+	dh_testroot
+	rm -f build-stamp configure-stamp
+	# Add here commands to clean up after the build process.
+	#-$(MAKE) clean
+	dh_clean 
+
+install: build
+	dh_testdir
+	dh_testroot
+	dh_clean -k
+	dh_installdirs
+	dh_install
+	
+	# -- images to /var 
+	rm -f $(DEST)/usr/share/nagvis/htdocs/nagvis/images/*/.gitignore
+	rm -f $(DEST)/usr/share/nagvis/htdocs/nagvis/images/*/*/.gitignore
+	mv $(DEST)/usr/share/nagvis/htdocs/nagvis/images/* $(DEST)/var/lib/nagvis/images/.
+	
+	# -- templates
+	mv $(DEST)/usr/share/nagvis/htdocs/nagvis/templates $(DEST)/etc/nagvis/.
+	
+	# -- gadgets
+	mv $(DEST)/usr/share/nagvis/htdocs/nagvis/gadgets $(DEST)/etc/nagvis/.
+	
+	[ -x /usr/bin/html2text ] && \
+		 /usr/bin/html2text -ascii -nobs < docs/en_US/changelog.html > docs/changelog
+	mv $(DEST)/etc/nagvis/nagvis.ini.php-sample \
+		$(DEST)/usr/share/nagvis/debian/
+	sed -e 's/^[; ]*\(\<dbhost\) *=.*$$/\1=_DBC_DBSERVER_/' \
+	    -e 's/^[; ]*\(\<dbport\) *=.*$$/\1=_DBC_DBPORT_/' \
+	    -e 's/^[; ]*\(\<dbname\) *=.*$$/\1=_DBC_DBNAME_/' \
+	    -e 's/^[; ]*\(\<dbuser\) *=.*$$/\1=_DBC_DBUSER_/' \
+	    -e 's/^[; ]*\(\<dbpass\) *=.*$$/\1=_DBC_DBPASS_/' \
+	 < $(DEST)/usr/share/nagvis/debian/nagvis.ini.php-sample \
+	 > $(DEST)/usr/share/nagvis/debian/nagvis.ini.php-sample.new && \
+	 mv $(DEST)/usr/share/nagvis/debian/nagvis.ini.php-sample.new \
+	    $(DEST)/usr/share/nagvis/debian/nagvis.ini.php-sample
+	
+	# demo site
+	install -d $(TMP)/demo/etc/nagvis/maps
+	mv $(DEST)/etc/nagvis/maps/demo*.cfg $(TMP)/demo/etc/nagvis/maps/
+	
+	dh_link
+	dh_lintian
+
+# Build architecture-dependent files here.
+binary-arch: build install
+# We have nothing to do by default.
+
+# Build architecture-independent files here.
+binary-indep: build install
+	dh_testdir
+	dh_testroot
+	dh_installchangelogs 
+	dh_installdocs
+	dh_installexamples
+	dh_installdebconf	
+	dh_compress
+	dh_fixperms
+	dh_installdeb
+	dh_shlibdeps
+	dh_gencontrol
+	dh_md5sums
+	dh_builddeb
+
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary install configure




More information about the Pkg-nagios-changes mailing list