summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBernard Cafarelli <voyageur@gentoo.org>2007-09-19 15:34:09 +0000
committerBernard Cafarelli <voyageur@gentoo.org>2007-09-19 15:34:09 +0000
commit6cf3713048dcd5376e395919143d4be588babc12 (patch)
treeb5168b7161c7ed25769720e16ffa562f398e2a65 /net-misc/nxserver-freenx
parentBump to 1.3.0 (diff)
downloadhistorical-6cf3713048dcd5376e395919143d4be588babc12.tar.gz
historical-6cf3713048dcd5376e395919143d4be588babc12.tar.bz2
historical-6cf3713048dcd5376e395919143d4be588babc12.zip
Fix nx3support patch, closes bug #193031
Package-Manager: portage-2.1.3.9
Diffstat (limited to 'net-misc/nxserver-freenx')
-rw-r--r--net-misc/nxserver-freenx/ChangeLog6
-rw-r--r--net-misc/nxserver-freenx/Manifest16
-rw-r--r--net-misc/nxserver-freenx/files/nxserver-freenx-0.7.0-nx3support.patch4
3 files changed, 15 insertions, 11 deletions
diff --git a/net-misc/nxserver-freenx/ChangeLog b/net-misc/nxserver-freenx/ChangeLog
index 370659311747..0e45d7263b08 100644
--- a/net-misc/nxserver-freenx/ChangeLog
+++ b/net-misc/nxserver-freenx/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for net-misc/nxserver-freenx
# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/nxserver-freenx/ChangeLog,v 1.30 2007/09/18 16:35:01 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/nxserver-freenx/ChangeLog,v 1.31 2007/09/19 15:34:09 voyageur Exp $
+
+ 19 Sep 2007; Bernard Cafarelli <voyageur@gentoo.org>
+ files/nxserver-freenx-0.7.0-nx3support.patch:
+ Fix nx3support patch, closes bug #193031
*nxserver-freenx-0.7.0-r1 (18 Sep 2007)
diff --git a/net-misc/nxserver-freenx/Manifest b/net-misc/nxserver-freenx/Manifest
index 77229927a7cf..703b84d35459 100644
--- a/net-misc/nxserver-freenx/Manifest
+++ b/net-misc/nxserver-freenx/Manifest
@@ -14,10 +14,10 @@ AUX nxserver-freenx-0.7.0-kdecups.patch 1373 RMD160 34227f429683b4d718321fb696fa
MD5 8c5f7c0037b3d2e759e1dbfde81ebf9a files/nxserver-freenx-0.7.0-kdecups.patch 1373
RMD160 34227f429683b4d718321fb696faf5e05ed665dc files/nxserver-freenx-0.7.0-kdecups.patch 1373
SHA256 ad010a7b5d4f1874d9f4e60f18de370eb4a0b1e4ca78aff225918302b00d1ad2 files/nxserver-freenx-0.7.0-kdecups.patch 1373
-AUX nxserver-freenx-0.7.0-nx3support.patch 6969 RMD160 c866cc6641ff560179a178b97fc9f1f9676a8d94 SHA1 191d8b0dc2d4e5b808de3d07537bf9b9f4824170 SHA256 d66f249c6aa6e759c667314f6e770e7074ceff3e318237a7d2de547ed485d601
-MD5 485a7d2c8583e699b7e962ddd027fcea files/nxserver-freenx-0.7.0-nx3support.patch 6969
-RMD160 c866cc6641ff560179a178b97fc9f1f9676a8d94 files/nxserver-freenx-0.7.0-nx3support.patch 6969
-SHA256 d66f249c6aa6e759c667314f6e770e7074ceff3e318237a7d2de547ed485d601 files/nxserver-freenx-0.7.0-nx3support.patch 6969
+AUX nxserver-freenx-0.7.0-nx3support.patch 6969 RMD160 b42d049b53ea287b7612eac6c6c19ae4a6a4a80d SHA1 4b836566366dcc7d69ff3d40d680a6b273d45640 SHA256 14ed1aca52379aa6710b7e6d24568c200973b0cac9f5857a8335829d20dd1b2a
+MD5 98e4c3168421e44546343491a9003c65 files/nxserver-freenx-0.7.0-nx3support.patch 6969
+RMD160 b42d049b53ea287b7612eac6c6c19ae4a6a4a80d files/nxserver-freenx-0.7.0-nx3support.patch 6969
+SHA256 14ed1aca52379aa6710b7e6d24568c200973b0cac9f5857a8335829d20dd1b2a files/nxserver-freenx-0.7.0-nx3support.patch 6969
AUX nxserver-freenx-0.7.0-xfsfonts.patch 583 RMD160 74b3fb482b3fd1d689a24df19281ec9ff8223d13 SHA1 8d33b566cc23e52f25b356c4ce9a8675661fc440 SHA256 d5bc41d43d46728d770be26680970e8f1608b1aa97e1e0bb2f0cf34bd6c591df
MD5 6c71560ff7f6002f6a43a946f8b20e6e files/nxserver-freenx-0.7.0-xfsfonts.patch 583
RMD160 74b3fb482b3fd1d689a24df19281ec9ff8223d13 files/nxserver-freenx-0.7.0-xfsfonts.patch 583
@@ -36,10 +36,10 @@ EBUILD nxserver-freenx-0.7.0.ebuild 3284 RMD160 04e88b0067c3f9cd272c1f82be70584c
MD5 416ee053c1da3f4f19d7973cc6906309 nxserver-freenx-0.7.0.ebuild 3284
RMD160 04e88b0067c3f9cd272c1f82be70584cbdc03a38 nxserver-freenx-0.7.0.ebuild 3284
SHA256 78d8a9c9bb307918d22439453775401b94682728a368eb19c2b158dcbb6cb1a1 nxserver-freenx-0.7.0.ebuild 3284
-MISC ChangeLog 7279 RMD160 65db1064546912cf263c83adfcb60f88643b2dbc SHA1 bd9e2debe0cdba34a44fb719483df23d5e942d40 SHA256 b5e794cf7ec0f46036d36e9fe8de405d26029dd13cf61850b1537c043faa5e11
-MD5 ea351b7d1e5d63e5ac76c26a28f116f3 ChangeLog 7279
-RMD160 65db1064546912cf263c83adfcb60f88643b2dbc ChangeLog 7279
-SHA256 b5e794cf7ec0f46036d36e9fe8de405d26029dd13cf61850b1537c043faa5e11 ChangeLog 7279
+MISC ChangeLog 7426 RMD160 b4a10054dc6ca009af7e87b8d0d2e4aecbc46c5f SHA1 fdcaf35a6f4b296752f0a17c0031f6f3d496a073 SHA256 56c7067f4037f8384530cb4f226326b324d5cd7d0b219e9785dc6308c507908e
+MD5 c1c88221379d46ecbe922e29f45d36dc ChangeLog 7426
+RMD160 b4a10054dc6ca009af7e87b8d0d2e4aecbc46c5f ChangeLog 7426
+SHA256 56c7067f4037f8384530cb4f226326b324d5cd7d0b219e9785dc6308c507908e ChangeLog 7426
MISC metadata.xml 350 RMD160 53819424da8eb045d991b7d02b8a6d9e6d54369d SHA1 591b43c9210782070d5d9b30317b1cef3975ab7e SHA256 5cf73679195a2c8a5a960d30614cfd340b7aadabb2e4c684928f44527278500e
MD5 433fa8974d44bd11845f96eb0be88ae7 metadata.xml 350
RMD160 53819424da8eb045d991b7d02b8a6d9e6d54369d metadata.xml 350
diff --git a/net-misc/nxserver-freenx/files/nxserver-freenx-0.7.0-nx3support.patch b/net-misc/nxserver-freenx/files/nxserver-freenx-0.7.0-nx3support.patch
index 720b922917c6..baede8465232 100644
--- a/net-misc/nxserver-freenx/files/nxserver-freenx-0.7.0-nx3support.patch
+++ b/net-misc/nxserver-freenx/files/nxserver-freenx-0.7.0-nx3support.patch
@@ -140,8 +140,8 @@ diff -Naur freenx-0.7.0.orig/nxnode freenx-0.7.0/nxnode
{
- [ "$ENABLE_2_0_0_BACKEND" = "1" ] && node_start_monitor_2_0_0 "$@"
- [ "$ENABLE_2_0_0_BACKEND" = "1" ] || node_start_monitor_1_5_0 "$@"
-+ [ "$ENABLE_2_0_0_BACKEND" = "1" || "$ENABLE_3_0_0_BACKEND" = "1" ] && node_start_monitor_2_0_0 "$@"
-+ [ "$ENABLE_2_0_0_BACKEND" = "1" || "$ENABLE_3_0_0_BACKEND" = "1" ] || node_start_monitor_1_5_0 "$@"
++ [ "$ENABLE_2_0_0_BACKEND" = "1" -o "$ENABLE_3_0_0_BACKEND" = "1" ] && node_start_monitor_2_0_0 "$@"
++ [ "$ENABLE_2_0_0_BACKEND" = "1" -o "$ENABLE_3_0_0_BACKEND" = "1" ] || node_start_monitor_1_5_0 "$@"
}
#