diff options
| author | tnut <thierryn1 at hispeed dot ch> | 2010-02-23 18:47:37 +0100 |
|---|---|---|
| committer | tnut <thierryn1 at hispeed dot ch> | 2010-02-23 18:47:37 +0100 |
| commit | 342f30d1f253ce0c823018d1718e069248cd7cc1 (patch) | |
| tree | 7b7646dff1fb66b8da869c06bf926f48b2db7e15 | |
| parent | 032e64a0afec49410a660caecc6d48c35dc266c2 (diff) | |
| parent | 141eb70d7096aed035e2184f5de167f75b61bb0b (diff) | |
| download | nutyx-extra-342f30d1f253ce0c823018d1718e069248cd7cc1.tar.gz nutyx-extra-342f30d1f253ce0c823018d1718e069248cd7cc1.tar.bz2 nutyx-extra-342f30d1f253ce0c823018d1718e069248cd7cc1.tar.xz nutyx-extra-342f30d1f253ce0c823018d1718e069248cd7cc1.zip | |
Merge commit 'lesibel/master'
| -rw-r--r-- | extra/conky/.footprint | 3 | ||||
| -rw-r--r-- | extra/conky/.md5sum | 2 | ||||
| -rw-r--r-- | extra/conky/Pkgfile | 4 | ||||
| -rw-r--r-- | extra/mozilla-common/mozilla-common.csh | 2 | ||||
| -rw-r--r-- | extra/mozilla-common/mozilla-common.sh | 2 |
5 files changed, 8 insertions, 5 deletions
diff --git a/extra/conky/.footprint b/extra/conky/.footprint index 798f4f4bd..57086b9bf 100644 --- a/extra/conky/.footprint +++ b/extra/conky/.footprint @@ -1,9 +1,12 @@ drwxr-xr-x root/root etc/ drwxr-xr-x root/root etc/conky/ -rw-r--r-- root/root etc/conky/conky.conf +-rw-r--r-- root/root etc/conky/conky_no_x11.conf drwxr-xr-x root/root usr/ drwxr-xr-x root/root usr/bin/ -rwxr-xr-x root/root usr/bin/conky +drwxr-xr-x root/root usr/lib/ +drwxr-xr-x root/root usr/lib/conky/ drwxr-xr-x root/root usr/share/ drwxr-xr-x root/root usr/share/man/ drwxr-xr-x root/root usr/share/man/man1/ diff --git a/extra/conky/.md5sum b/extra/conky/.md5sum index 0275c73f9..7deb8e96c 100644 --- a/extra/conky/.md5sum +++ b/extra/conky/.md5sum @@ -1 +1 @@ -44d7d41ae556fb8c19e61e9506c96a60 conky-1.7.0.tar.gz +fa5d9cf7cbef61fb5ccf0571e7339c37 conky-1.7.2.tar.gz diff --git a/extra/conky/Pkgfile b/extra/conky/Pkgfile index dcc511bdf..3f937513e 100644 --- a/extra/conky/Pkgfile +++ b/extra/conky/Pkgfile @@ -2,10 +2,10 @@ # URL: http://conky.sourceforge.net # Maintainer: NuTyX core team # Packager: geantbrun at gmail dot com -# Depends on: curl, glib +# Depends on: xorg, lua, curl, glib name=conky -version=1.7.0 +version=1.7.2 release=1 source=(http://freefr.dl.sourceforge.net/sourceforge/conky/$name-$version.tar.gz) diff --git a/extra/mozilla-common/mozilla-common.csh b/extra/mozilla-common/mozilla-common.csh index 09e49c783..032b0fd69 100644 --- a/extra/mozilla-common/mozilla-common.csh +++ b/extra/mozilla-common/mozilla-common.csh @@ -1 +1 @@ -setenv MOZ_PLUGIN_PATH "/usr/lib/mozilla/plugins" +setenv MOZ_PLUGIN_PATH "/usr/lib/firefox/plugins" diff --git a/extra/mozilla-common/mozilla-common.sh b/extra/mozilla-common/mozilla-common.sh index 132b5731e..d4f3c791a 100644 --- a/extra/mozilla-common/mozilla-common.sh +++ b/extra/mozilla-common/mozilla-common.sh @@ -1 +1 @@ -export MOZ_PLUGIN_PATH="/usr/lib/mozilla/plugins" +export MOZ_PLUGIN_PATH="/usr/lib/firefox/plugins" |