[Pkg-nx-commits] r41 - in freenx/trunk/debian: . patches

[Stefan Lippers-Hollmann]

Author: slh-guest
Date: 2005-08-17 15:55:57 +0000 (Wed, 17 Aug 2005)
New Revision: 41

Modified:
   freenx/trunk/debian/changelog
   freenx/trunk/debian/control
   freenx/trunk/debian/patches/00list
   freenx/trunk/debian/postinst
   freenx/trunk/debian/postrm
   freenx/trunk/debian/prerm
Log:
[freenx]
- really add ENABLE_1_5_0_BACKEND="1".
- remove bash assumptions for maintainer scripts.


Modified: freenx/trunk/debian/changelog
===================================================================
--- freenx/trunk/debian/changelog	2005-08-17 00:02:26 UTC (rev 40)
+++ freenx/trunk/debian/changelog	2005-08-17 15:55:57 UTC (rev 41)
@@ -1,12 +1,11 @@
 freenx (0.4.4-0) UNRELEASED; urgency=low
 
   * (NOT RELEASED YET) New upstream release
-  * use #!/bin/bash for maintainer scripts until they're properly POSIX
-    compatible.
   * depend on nx 1.5.0.
   * ENABLE_1_5_0_BACKEND="1" in /etc/nxserver/node.conf is required!
+  * add esound-clients libarts1c2 || libarts1 to suggests.
 
- -- Stefan Lippers-Hollmann <s.l-h at gmx.de>  Sun,  7 Aug 2005 02:20:16 +0200
+ -- Stefan Lippers-Hollmann <s.l-h at gmx.de>  Wed, 17 Aug 2005 17:54:32 +0200
 
 freenx (0.4.3-0) UNRELEASED; urgency=low
 

Modified: freenx/trunk/debian/control
===================================================================
--- freenx/trunk/debian/control	2005-08-17 00:02:26 UTC (rev 40)
+++ freenx/trunk/debian/control	2005-08-17 15:55:57 UTC (rev 41)
@@ -8,9 +8,7 @@
 Package: freenx
 Architecture: all
 Depends: nxagent (>= 1.4.90), ssh, netcat, expect, bash (>= 2.05), xbase-clients, xfonts-base, debconf (>= 0.5.00), adduser
-Replaces: nxserver (<= 0.2-4)
-Conflicts: nxserver
-Suggests: nxdesktop (>= 1.4.90), nxviewer (>= 1.4.90)
+Suggests: nxdesktop (>= 1.4.90), nxviewer (>= 1.4.90), esound-clients, libarts1c2 || libarts1
 Description: The FreeNX application/thin-client server based on NX technology
  NoMachine NX is the next-generation X compression and roundtrip suppression
  scheme. It can operate remote X11 sessions over 56k modem dialup links or

Modified: freenx/trunk/debian/patches/00list
===================================================================
--- freenx/trunk/debian/patches/00list	2005-08-17 00:02:26 UTC (rev 40)
+++ freenx/trunk/debian/patches/00list	2005-08-17 15:55:57 UTC (rev 41)
@@ -1 +1,2 @@
 01_binpath.dpatch
+02_nx_1.5.0_support.dpatch

Modified: freenx/trunk/debian/postinst
===================================================================
--- freenx/trunk/debian/postinst	2005-08-17 00:02:26 UTC (rev 40)
+++ freenx/trunk/debian/postinst	2005-08-17 15:55:57 UTC (rev 41)
@@ -1,4 +1,4 @@
-#! /bin/bash
+#! /bin/sh
 # postinst script for freenx
 #
 # see: dh_installdeb(1)
@@ -30,10 +30,10 @@
 case "$1" in
     configure)
 	# well, this fallback should never happen - but I've encountered it in the wild...
-	if ! getent group root &> /dev/null; then
+	if ! getent group root >/dev/null 2>&1; then
 		groupadd -g 0 root
 	fi
-	if ! getent group root &> /dev/null; then
+	if ! getent group root >/dev/null 2>&1; then
 		# this system must be really weird - are you sure we're talking about debian?
 		db_set freenx/configured false
 		exit 1
@@ -43,7 +43,7 @@
 	case "$RET" in
 		"NoMachine Keys")
 			db_get freenx/configured
-			if ! /usr/sbin/nxsetup --install --setup-nomachine-key --clean --purge &> /dev/null; then
+			if ! /usr/sbin/nxsetup --install --setup-nomachine-key --clean --purge >/dev/null 2>&1; then
 				db_set freenx/configured false
 				exit 2
 			fi
@@ -51,7 +51,7 @@
 			;;
 		"Custom keys")
 			db_get freenx/configured
-			if ! /usr/sbin/nxsetup --install --clean --purge &> /dev/null; then
+			if ! /usr/sbin/nxsetup --install --clean --purge >/dev/null 2>&1; then
 				db_set freenx/configured false
 				exit 3
 			fi
@@ -62,7 +62,7 @@
 			db_set freenx/configured true
 			;;
 		"Remove freenx keys")
-			/usr/sbin/nxsetup --uninstall --purge &> /dev/null
+			/usr/sbin/nxsetup --uninstall --purge >/dev/null 2>&1
 			db_set freenx/configured false
 			;;
 		*)

Modified: freenx/trunk/debian/postrm
===================================================================
--- freenx/trunk/debian/postrm	2005-08-17 00:02:26 UTC (rev 40)
+++ freenx/trunk/debian/postrm	2005-08-17 15:55:57 UTC (rev 41)
@@ -1,4 +1,4 @@
-#! /bin/bash
+#! /bin/sh
 # postrm script for freenx
 #
 # see: dh_installdeb(1)

Modified: freenx/trunk/debian/prerm
===================================================================
--- freenx/trunk/debian/prerm	2005-08-17 00:02:26 UTC (rev 40)
+++ freenx/trunk/debian/prerm	2005-08-17 15:55:57 UTC (rev 41)
@@ -1,4 +1,4 @@
-#! /bin/bash
+#! /bin/sh
 # prerm script for freenx
 #
 # see: dh_installdeb(1)
@@ -21,14 +21,14 @@
 case "$1" in
     remove)
 #       install-info --quiet --remove /usr/info/freenx.info.gz
-	/usr/sbin/nxsetup --uninstall &> /dev/null
+	/usr/sbin/nxsetup --uninstall >/dev/null 2>&1
         ;;
     upgrade)
 	;;
     failed-upgrade)
         ;;
     deconfigure|purge)
-	/usr/sbin/nxsetup --uninstall --purge &> /dev/null
+	/usr/sbin/nxsetup --uninstall --purge >/dev/null 2>&1
         ;;
     *)
         echo "prerm called with unknown argument \`$1'" >&2