[Pkg-grid-commits] nws/debian changelog, 1.10, 1.11 control, 1.5, 1.6 nws.postrm, 1.4, 1.5 rules, 1.3, 1.4

[Martin Quinson]

Update of /cvsroot/pkg-grid/nws/debian
In directory haydn:/tmp/cvs-serv21066

Modified Files:
	changelog control nws.postrm rules 
Log Message:
Various packaging cleanups

Index: control
===================================================================
RCS file: /cvsroot/pkg-grid/nws/debian/control,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- control	8 Aug 2005 21:02:09 -0000	1.5
+++ control	10 Aug 2005 08:13:07 -0000	1.6
@@ -7,9 +7,9 @@
 
 Package: nws
 Architecture: any
-Depends: procps, ${shlibs:Depends}, debconf (>= 1.2.0), ucf
+Depends: procps, ${shlibs:Depends}, debconf (>= 1.2.0), ucf, adduser
 Suggests: logrotate
-Description: Grid monitoring infrastructure (executables and man pages)
+Description: grid monitoring infrastructure (executables and man pages)
  The Network Weather Service is the de facto standard of the emerging Grid
  community to monitor the system availability. (the grid usually denotes any
  platform formed by the federation and aggregation of local resources between
@@ -33,7 +33,7 @@
 Package: libnws-dev
 Architecture: any
 Depends: nws (=${Source-Version})
-Description: Grid monitoring infrastructure (headers and devel documentation)
+Description: grid monitoring infrastructure (headers and devel documentation)
  The Network Weather Service is the de facto standard of the emerging Grid
  community to monitor the system availability. (the grid usually denotes any
  platform formed by the federation and aggregation of local resources between

Index: changelog
===================================================================
RCS file: /cvsroot/pkg-grid/nws/debian/changelog,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- changelog	10 Aug 2005 07:30:06 -0000	1.10
+++ changelog	10 Aug 2005 08:13:07 -0000	1.11
@@ -1,6 +1,10 @@
 nws (2.13-2) unstable; urgency=low
 
   * Yet another debconf template review by Clytie Siddall.
+  * Let nws depend on adduser since we use it.
+  * On purge, do unregister *our* conffile from ucf, not the one of the
+    package I copy/pasted the postrm from. 
+  * Also, purge /etc/nws.conf 
 
  -- Martin Quinson <mquinson at debian.org>  Wed, 10 Aug 2005 09:28:57 +0200
 

Index: rules
===================================================================
RCS file: /cvsroot/pkg-grid/nws/debian/rules,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- rules	8 Aug 2005 21:56:11 -0000	1.3
+++ rules	10 Aug 2005 08:13:07 -0000	1.4
@@ -13,6 +13,12 @@
 # ... and moving it to the right dir using dh_install
 DEB_DH_INSTALL_SOURCEDIR := debian/tmp
 
+# Cleanup autotools generated files to make lintian and autobuilders happy
+clean::
+	rm -f Portability/Forecast/config.log Portability/Forecast/config.status
+	rm -f Portability/config.log          Portability/config.status
+	rm -f config.log                      config.status
+
 # I hate the nws non-standard build system
 DEB_MAKE_BUILD_TARGET := all
 DEB_MAKE_INSTALL_TARGET := install \
@@ -23,4 +29,4 @@
 
 # Also work with old cdbs
 reverse-config::
-update-config::
\ No newline at end of file
+update-config::

Index: nws.postrm
===================================================================
RCS file: /cvsroot/pkg-grid/nws/debian/nws.postrm,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- nws.postrm	8 Aug 2005 22:12:04 -0000	1.4
+++ nws.postrm	10 Aug 2005 08:13:07 -0000	1.5
@@ -3,7 +3,7 @@
  
 set -e
 
-CONF=/etc/fonts/local.conf
+CONF=/var/lib/nws/local.conf
  
 case "$1" in
 	purge)
@@ -13,7 +13,12 @@
 			ucf --purge $CONF
 		fi
 		rm -f $CONF
-		
+                rm -rf /var/lib/nws
+
+		####
+                ## Purge the configuration file
+		rm -f /etc/nws.conf		
+
                 ####
 		## Purge the status and log files
 		rm -rf /var/log/nws /var/state/nws