diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2012-10-21 10:47:37 +0200 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-10-21 10:47:37 +0200 |
| commit | aec9ffe68488d34c02bceb4942b87779f5c460d5 (patch) | |
| tree | 5aaa0d61510bf94c4dd5bd751b53f61d39817e96 /community-staging/neatx/constants.archlinux.patch | |
| parent | 59d570b2f4d752b3cd4dfcdf2ce8c75993d9c2eb (diff) | |
| parent | 9598f5141ea75ffa72a3c7c85639c6f296020ef1 (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community-staging/projectm/PKGBUILD
community-testing/evas_generic_loaders-svn/PKGBUILD
community-testing/gambas2/PKGBUILD
community-testing/gambas3/PKGBUILD
community-testing/libextractor/PKGBUILD
community-testing/pdf2djvu/PKGBUILD
community-testing/qtcreator/PKGBUILD
community-testing/qtcreator/qtcreator.desktop
community/galculator/PKGBUILD
community/ristretto/PKGBUILD
core/systemd/PKGBUILD
extra/llvm/PKGBUILD
extra/pyqt/PKGBUILD
extra/python-lxml/PKGBUILD
multilib/lib32-util-linux/PKGBUILD
staging/glew/PKGBUILD
staging/xine-lib/PKGBUILD
testing/calligra/PKGBUILD
testing/gdk-pixbuf2/PKGBUILD
testing/gdm/PKGBUILD
testing/gdm/fix_external_program_directories.patch
testing/glib2/PKGBUILD
testing/gnome-color-manager/PKGBUILD
testing/gthumb/PKGBUILD
testing/gtk3/PKGBUILD
testing/gvfs/PKGBUILD
testing/inkscape/PKGBUILD
testing/kdebase-workspace/PKGBUILD
testing/libreoffice/PKGBUILD
testing/networkmanager/PKGBUILD
testing/polkit/PKGBUILD
testing/poppler/PKGBUILD
testing/rhythmbox/PKGBUILD
testing/xorg-server/PKGBUILD
testing/xorg-xdm/PKGBUILD
Diffstat (limited to 'community-staging/neatx/constants.archlinux.patch')
| -rw-r--r-- | community-staging/neatx/constants.archlinux.patch | 42 |
1 files changed, 0 insertions, 42 deletions
diff --git a/community-staging/neatx/constants.archlinux.patch b/community-staging/neatx/constants.archlinux.patch deleted file mode 100644 index dff5e2415..000000000 --- a/community-staging/neatx/constants.archlinux.patch +++ /dev/null @@ -1,42 +0,0 @@ ---- a/neatx-0.3.1/lib/constants.py 2009-06-24 21:19:55.000000000 +0200 -+++ b/neatx-0.3.1/lib/constants.py 2009-07-08 10:50:30.000000000 +0200 -@@ -25,19 +25,19 @@ - from neatx import _autoconf - - --NXDIR = "/usr/lib/nx" -+NXDIR = "/opt/NX/bin" - - SYSLOG_ADDRESS = "/dev/log" - BASH = "/bin/bash" --NETCAT = "/bin/netcat" -+NETCAT = "/usr/bin/netcat" - XRDB = "/usr/bin/xrdb" - SU = "/bin/su" - SSH = "/usr/bin/ssh" - XAUTH = "/usr/bin/xauth" --XSESSION = "/etc/X11/Xsession" -+XSESSION = "/etc/X11/xdm/Xsession" - - START_CONSOLE_COMMAND = "/usr/bin/xterm" --START_KDE_COMMAND = XSESSION + " startkde" -+START_KDE_COMMAND = " startkde" - START_GNOME_COMMAND = XSESSION + " gnome-session" - - NXUSER = "nx" -@@ -47,12 +47,13 @@ - NXNC = _autoconf.PKGLIBDIR + "/nxnc" - NXDIALOG = _autoconf.PKGLIBDIR + "/nxdialog" - NXAGENT = NXDIR + "/nxagent" --NXAGENT_PKGNAME = "nxagent" -+#NXAGENT_PKGNAME = "nxagent" -+NXAGENT_PKGNAME = "nxserver" - FDCOPY = _autoconf.PKGLIBDIR + "/fdcopy" - TTYSETUP = _autoconf.PKGLIBDIR + "/ttysetup" - - # Extract nxagent version using the following command. --NXAGENT_VERSION_COMMAND = ("dpkg-query -W --showformat='${Version}' %s" % -+NXAGENT_VERSION_COMMAND = ("pacman -Qi %s | grep Version | awk '{print $3}'" % - NXAGENT_PKGNAME) - NXAGENT_VERSION_SEP = ".-~" - |