summaryrefslogtreecommitdiff
path: root/community
diff options
context:
space:
mode:
authorNicolás Reynolds <fauno@endefensadelsl.org>2014-02-15 03:33:23 +0000
committerNicolás Reynolds <fauno@endefensadelsl.org>2014-02-15 03:33:23 +0000
commit34276794ce110cd2f9204e4b504aea41fb584145 (patch)
tree614343b8dd17e74468019c46daabd3861ef8dfbc /community
parent86a5624291a8a72d9a0a2c51fcc64bf6e221524b (diff)
Sat Feb 15 03:31:19 UTC 2014
Diffstat (limited to 'community')
-rw-r--r--community/argyllcms/PKGBUILD7
-rw-r--r--community/dart/PKGBUILD12
-rw-r--r--community/dispcalgui/PKGBUILD6
-rw-r--r--community/hostapd/PKGBUILD6
-rw-r--r--community/hostapd/config2
-rw-r--r--community/hostapd/hostapd.install4
-rw-r--r--community/libdivecomputer/PKGBUILD9
-rw-r--r--community/liblinebreak/PKGBUILD27
-rw-r--r--community/libvirt/PKGBUILD37
-rwxr-xr-xcommunity/lightdm-gtk2-greeter/PKGBUILD23
-rw-r--r--community/lightdm-gtk2-greeter/fix-null-username.patch83
-rw-r--r--community/lightdm-gtk2-greeter/lightdm-gtk-greeter.install13
-rwxr-xr-xcommunity/lightdm-gtk3-greeter/PKGBUILD23
-rw-r--r--community/lightdm-gtk3-greeter/fix-null-username.patch83
-rw-r--r--community/lightdm-gtk3-greeter/lightdm-gtk-greeter.install13
-rw-r--r--community/lxc/PKGBUILD7
-rw-r--r--community/lxc/lxc@.service6
-rw-r--r--community/miniupnpc/PKGBUILD6
-rw-r--r--community/pidgin-lwqq/PKGBUILD17
-rw-r--r--community/prosody/PKGBUILD13
-rw-r--r--community/prosody/prosody.install2
-rw-r--r--community/pymol/PKGBUILD18
-rw-r--r--community/pymol/pymol-38899.patch251
23 files changed, 384 insertions, 284 deletions
diff --git a/community/argyllcms/PKGBUILD b/community/argyllcms/PKGBUILD
index 21110bd41..4c7d808b3 100644
--- a/community/argyllcms/PKGBUILD
+++ b/community/argyllcms/PKGBUILD
@@ -1,21 +1,22 @@
-# $Id: PKGBUILD 102451 2013-12-11 14:31:37Z tredaelli $
+# $Id: PKGBUILD 105726 2014-02-14 14:17:13Z tredaelli $
# Maintainer: Timothy Redaelli <timothy.redaelli@gmail.com>
# Contributor: Frank Ickstadt (frank dot ickstadt at gmail dot com)
pkgname=argyllcms
_pkgname=Argyll
-pkgver=1.6.2
+pkgver=1.6.3
_pkgver="V${pkgver}"
pkgrel=1
pkgdesc="An ICC compatible color management system with support for different colorimeter hardware"
arch=(i686 x86_64)
depends=('libxss' 'libxinerama' 'libxxf86vm' 'libxrandr')
makedepends=('ftjam' 'zip' 'unzip')
+# You need to fake an UserAgent or it doesn't download
source=(http://www.argyllcms.com/${_pkgname}_${_pkgver}_src.zip)
url="http://www.argyllcms.com/"
license=("GPL" "AGPL")
install=${pkgname}.install
-sha256sums=('c21591d5615a584df438ecbfe7858fde571f6066e56da436c541d08ca899ac9f')
+sha256sums=('188beaa03dd2459403415023f8f8f9aab362bf3062a9822b3622dde6902e4b84')
build() {
cd ${_pkgname}_${_pkgver}
diff --git a/community/dart/PKGBUILD b/community/dart/PKGBUILD
index cf803512e..f353194ca 100644
--- a/community/dart/PKGBUILD
+++ b/community/dart/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 104347 2014-01-18 17:45:23Z arodseth $
+# $Id: PKGBUILD 105737 2014-02-14 17:58:11Z arodseth $
# Maintainer: Alexander Rødseth <rodseth@gmail.com>
# Contributor: T. Jameson Little <t.jameson.little at gmail dot com>
# Contributor: Usagi Ito <usagi@WonderRabbitProject.net>
@@ -6,7 +6,7 @@
# Contributor: Julien Nicoulaud <julien.nicoulaud@gmail.com>
pkgname=dart
-pkgver=1.1.1
+pkgver=1.1.3
pkgrel=1
pkgdesc='The dart programming language SDK'
arch=('x86_64' 'i686')
@@ -19,13 +19,13 @@ options=('!strip')
if [[ $CARCH == x86_64 ]]; then
source=("$pkgname-$pkgver-64.zip::http://storage.googleapis.com/dart-archive/channels/stable/release/latest/sdk/dartsdk-linux-x64-release.zip"
'license.html::https://code.google.com/intl/no/google_bsd_license.html')
- sha256sums=('baf8afd92642da97ec5b13d645e37226d1a20447cad7f2b06f8bb07417219d42'
- 'de16a5ac94310b1bdfc27a2a6d620531172bb31af894caeced37af41fb8e2650')
+ sha256sums=('5019225dd58ffba9ae726f100993345e2801f7b59f6b49edbb5020ec3621e67a'
+ 'de16a5ac94310b1bdfc27a2a6d620531172bb31af894caeced37af41fb8e2650')
else
source=("$pkgname-$pkgver-32.zip::http://storage.googleapis.com/dart-archive/channels/stable/release/latest/sdk/dartsdk-linux-ia32-release.zip"
'license.html::https://code.google.com/intl/no/google_bsd_license.html')
- sha256sums=('50863be94cff179588aca084a4f40ebd23514447cffd73679b5850e7c6fc768c'
- 'de16a5ac94310b1bdfc27a2a6d620531172bb31af894caeced37af41fb8e2650')
+ sha256sums=('de33b20167727d50903c1cf33d86320472d728f93641ec37a541a233e377acc4'
+ 'de16a5ac94310b1bdfc27a2a6d620531172bb31af894caeced37af41fb8e2650')
fi
prepare() {
diff --git a/community/dispcalgui/PKGBUILD b/community/dispcalgui/PKGBUILD
index befa56d85..575707a27 100644
--- a/community/dispcalgui/PKGBUILD
+++ b/community/dispcalgui/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 104543 2014-01-22 15:26:47Z tredaelli $
+# $Id: PKGBUILD 105728 2014-02-14 14:41:06Z tredaelli $
# Maintainer: Timothy Redaelli <timothy.redaelli@gmail.com>
# Contributor: Cedric Girard <girard.cedric@gmail.com>
# Contributor: foxbunny <bg.branko@gmail.com>
pkgname=dispcalgui
-pkgver=1.7.1.6
+pkgver=1.7.5.7
pkgrel=1
pkgdesc="A GUI frontend for several utilities from the open source color management system Argyll CMS"
arch=('i686' 'x86_64')
@@ -16,7 +16,7 @@ optdepends=('gksu: For running as root')
install=${pkgname}.install
source=("http://downloads.sourceforge.net/project/dispcalgui/release/${pkgver}/dispcalGUI-${pkgver}.tar.gz"
dispcalGUI-1.5.3.1-wxgtk3.patch)
-md5sums=('c51f5a6354b16342fd4ec3e0bb1bb4eb'
+md5sums=('7a66051d244f1b734448a865b50fae01'
'b8001e5cbbb849f9ba95e0ef9fb1d073')
prepare() {
diff --git a/community/hostapd/PKGBUILD b/community/hostapd/PKGBUILD
index 4eeec6596..828a36e47 100644
--- a/community/hostapd/PKGBUILD
+++ b/community/hostapd/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 105315 2014-02-04 20:54:33Z spupykin $
+# $Id: PKGBUILD 105700 2014-02-14 09:18:44Z spupykin $
# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
pkgname=hostapd
pkgver=2.1
-pkgrel=1
+pkgrel=2
pkgdesc="IEEE 802.11 AP, IEEE 802.1X/WPA/WPA2/EAP/RADIUS Authenticator"
arch=('i686' 'x86_64')
url="http://w1.fi/hostapd/"
@@ -24,7 +24,7 @@ source=(http://w1.fi/releases/$pkgname-$pkgver.tar.gz
config
hostapd.service)
md5sums=('bb9c50e87c5af6f89f387e63911effac'
- '5d7ee10b04e33f22c37be56a4c33dddb'
+ 'eab3ae853869f832965f59898bb04a52'
'a0a16879eed5e4e41ae6b225a4809955')
build() {
diff --git a/community/hostapd/config b/community/hostapd/config
index a11ebd587..55c6ed257 100644
--- a/community/hostapd/config
+++ b/community/hostapd/config
@@ -90,3 +90,5 @@ CONFIG_DRIVER_NL80211=y
CONFIG_IEEE80211N=y
CONFIG_LIBNL32=y
+
+CONFIG_ACS=y
diff --git a/community/hostapd/hostapd.install b/community/hostapd/hostapd.install
index d838c6a47..072cde845 100644
--- a/community/hostapd/hostapd.install
+++ b/community/hostapd/hostapd.install
@@ -1,7 +1,3 @@
post_install() {
echo "> More info: https://wiki.archlinux.org/index.php/Software_Access_Point"
}
-
-post_upgrade() {
- post_install
-}
diff --git a/community/libdivecomputer/PKGBUILD b/community/libdivecomputer/PKGBUILD
index 501254b0d..128d186c5 100644
--- a/community/libdivecomputer/PKGBUILD
+++ b/community/libdivecomputer/PKGBUILD
@@ -1,10 +1,10 @@
-# $id$
+# $Id: PKGBUILD 105692 2014-02-14 05:51:19Z bisson $
# Contributor: Francois Boulogne <fboulogne at april dot org>
# Maintainer: Gaetan Bisson <bisson@archlinux.org>
pkgname=libdivecomputer
pkgver=0.4.2
-pkgrel=1
+pkgrel=2
pkgdesc='Library for communication with dive computers'
url='http://www.libdivecomputer.org/'
license=('LGPL')
@@ -14,7 +14,10 @@ sha1sums=('a57176ae6a7bd5e0ad4d19a39e5aebcfba818acc')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
- ./configure --prefix=/usr
+ ./configure \
+ --prefix=/usr \
+ --program-prefix="${pkgname}-" \
+
make
}
diff --git a/community/liblinebreak/PKGBUILD b/community/liblinebreak/PKGBUILD
deleted file mode 100644
index d18340459..000000000
--- a/community/liblinebreak/PKGBUILD
+++ /dev/null
@@ -1,27 +0,0 @@
-# $Id: PKGBUILD 100200 2013-11-01 21:12:55Z spupykin $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Contributor: Orivej Desh <smpuj@bk.ru>
-
-pkgname=liblinebreak
-pkgver=2.1
-pkgrel=2
-pkgdesc="An implementation of the line breaking algorithm as described in Unicode 5.2.0 Standard Annex 14, Revision 24"
-arch=("i686" "x86_64")
-url="http://vimgadgets.sourceforge.net/liblinebreak/"
-license=("custom:zlib/libpng")
-depends=("glibc")
-source=("http://downloads.sourceforge.net/vimgadgets/liblinebreak-$pkgver.tar.gz")
-md5sums=('9fe73b4b230434765be2305e50f8fe45')
-
-build() {
- cd "$srcdir/liblinebreak-$pkgver"
- ./configure --prefix=/usr
- make
-}
-
-package() {
- cd "$srcdir/liblinebreak-$pkgver"
- make DESTDIR="$pkgdir" install
- install -Dm644 LICENCE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
-}
-
diff --git a/community/libvirt/PKGBUILD b/community/libvirt/PKGBUILD
index 13073ce0e..4c3579023 100644
--- a/community/libvirt/PKGBUILD
+++ b/community/libvirt/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 105566 2014-02-10 12:00:31Z spupykin $
+# $Id: PKGBUILD 105708 2014-02-14 09:37:10Z spupykin $
# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
# Contributor: Jonathan Wiersma <archaur at jonw dot org>
pkgname=libvirt
pkgver=1.2.1
-pkgrel=3
+pkgrel=4
pkgdesc="API for controlling virtualization engines (openvz,kvm,qemu,virtualbox,xen,etc)"
arch=('i686' 'x86_64')
url="http://libvirt.org/"
@@ -23,11 +23,38 @@ optdepends=('bridge-utils: for briged networking (default)'
'ebtables'
'pm-utils: host power management')
options=('emptydirs')
-backup=('etc/conf.d/libvirtd'
- 'etc/conf.d/libvirt-guests'
- 'etc/libvirt/libvirtd.conf'
+backup=('etc/conf.d/libvirt-guests'
+ 'etc/conf.d/libvirtd'
'etc/libvirt/libvirt.conf'
+ 'etc/libvirt/libvirtd.conf'
+ 'etc/libvirt/lxc.conf'
+ 'etc/libvirt/nwfilter/allow-arp.xml'
+ 'etc/libvirt/nwfilter/allow-dhcp-server.xml'
+ 'etc/libvirt/nwfilter/allow-dhcp.xml'
+ 'etc/libvirt/nwfilter/allow-incoming-ipv4.xml'
+ 'etc/libvirt/nwfilter/allow-ipv4.xml'
+ 'etc/libvirt/nwfilter/clean-traffic.xml'
+ 'etc/libvirt/nwfilter/no-arp-ip-spoofing.xml'
+ 'etc/libvirt/nwfilter/no-arp-mac-spoofing.xml'
+ 'etc/libvirt/nwfilter/no-arp-spoofing.xml'
+ 'etc/libvirt/nwfilter/no-ip-multicast.xml'
+ 'etc/libvirt/nwfilter/no-ip-spoofing.xml'
+ 'etc/libvirt/nwfilter/no-mac-broadcast.xml'
+ 'etc/libvirt/nwfilter/no-mac-spoofing.xml'
+ 'etc/libvirt/nwfilter/no-other-l2-traffic.xml'
+ 'etc/libvirt/nwfilter/no-other-rarp-traffic.xml'
+ 'etc/libvirt/nwfilter/qemu-announce-self-rarp.xml'
+ 'etc/libvirt/nwfilter/qemu-announce-self.xml'
+ 'etc/libvirt/qemu-lockd.conf'
'etc/libvirt/qemu.conf'
+ 'etc/libvirt/qemu/networks/autostart/default.xml'
+ 'etc/libvirt/qemu/networks/default.xml'
+ 'etc/libvirt/virt-login-shell.conf'
+ 'etc/libvirt/virtlockd.conf'
+ 'etc/logrotate.d/libvirtd'
+ 'etc/logrotate.d/libvirtd.lxc'
+ 'etc/logrotate.d/libvirtd.qemu'
+ 'etc/logrotate.d/libvirtd.uml'
'etc/sasl2/libvirt.conf')
install="libvirt.install"
source=("http://libvirt.org/sources/$pkgname-$pkgver.tar.gz"
diff --git a/community/lightdm-gtk2-greeter/PKGBUILD b/community/lightdm-gtk2-greeter/PKGBUILD
index 7e70ac084..0e0111c0f 100755
--- a/community/lightdm-gtk2-greeter/PKGBUILD
+++ b/community/lightdm-gtk2-greeter/PKGBUILD
@@ -1,30 +1,23 @@
-# $Id: PKGBUILD 105171 2014-02-02 11:07:34Z alucryd $
+# $Id: PKGBUILD 105741 2014-02-14 18:30:58Z alucryd $
# Maintainer: Maxime Gauduin <alucryd@gmail.com>
# Contributor: Padfoot <padfoot@exemail.com.au>
pkgname=lightdm-gtk2-greeter
-pkgver=1.6.1
-pkgrel=2
+pkgver=1.8.1
+pkgrel=1
epoch=1
-pkgdesc="GTK+ greeter for LightDM"
+pkgdesc='GTK+ greeter for LightDM'
arch=('i686' 'x86_64')
-url="https://launchpad.net/lightdm-gtk-greeter"
+url='https://launchpad.net/lightdm-gtk-greeter'
license=('GPL3' 'LGPL3')
depends=('gtk2' 'lightdm')
makedepends=('exo' 'gnome-doc-utils' 'gobject-introspection' 'intltool')
provides=("${pkgname/2/}")
conflicts=("${pkgname/2/3}")
backup=('etc/lightdm/lightdm-gtk-greeter.conf')
-source=("https://launchpad.net/${pkgname/2/}/1.6/${pkgver}/+download/${pkgname/2/}-${pkgver}.tar.gz"
- 'fix-null-username.patch')
-sha256sums=('1f0286ab093d50151f0efc46496aef3f8ed8c7306bbc81807a3fdcbcb2a468d9'
- '27e1ec5f73f963ea5fbc69d4b380dbfa47a4066b35fa1a00341203568d9aa64d')
-
-prepare() {
- cd ${pkgname/2/}-${pkgver}
-
- patch -Np0 -i ../fix-null-username.patch
-}
+install="${pkgname/2/}.install"
+source=("https://launchpad.net/${pkgname/2/}/${pkgver%.?}/${pkgver}/+download/${pkgname/2/}-${pkgver}.tar.gz")
+sha256sums=('dac5ce9ac54a6b3c1ef9f9cc056f13f01352c2a897c5bed11e52505132610bab')
build() {
cd ${pkgname/2/}-${pkgver}
diff --git a/community/lightdm-gtk2-greeter/fix-null-username.patch b/community/lightdm-gtk2-greeter/fix-null-username.patch
deleted file mode 100644
index 63cdf83c1..000000000
--- a/community/lightdm-gtk2-greeter/fix-null-username.patch
+++ /dev/null
@@ -1,83 +0,0 @@
-=== modified file 'src/lightdm-gtk-greeter.c'
---- src/lightdm-gtk-greeter.c 2014-01-07 11:02:12 +0000
-+++ src/lightdm-gtk-greeter.c 2014-01-08 00:21:56 +0000
-@@ -333,7 +333,7 @@
- gchar *s;
- gboolean matched;
- s = g_strdup(g_object_get_data (G_OBJECT (menu_iter->data), "session-key"));
-- matched = strcmp (s, session) == 0;
-+ matched = g_strcmp0 (s, session) == 0;
- g_free (s);
- if (matched)
- {
-@@ -402,7 +402,7 @@
- gchar *s;
- gboolean matched;
- s = g_strdup(g_object_get_data (G_OBJECT (menu_iter->data), "language-code"));
-- matched = strcmp (s, language) == 0;
-+ matched = g_strcmp0 (s, language) == 0;
- g_free (s);
- if (matched)
- {
-@@ -423,7 +423,7 @@
- static void
- set_message_label (const gchar *text)
- {
-- gtk_widget_set_visible (GTK_WIDGET (info_bar), strcmp (text, "") != 0);
-+ gtk_widget_set_visible (GTK_WIDGET (info_bar), g_strcmp0 (text, "") != 0);
- gtk_label_set_text (message_label, text);
- }
-
-@@ -633,13 +633,13 @@
- }
- g_free (data);
-
-- if (strcmp (username, "*other") == 0)
-+ if (g_strcmp0 (username, "*other") == 0)
- {
- gtk_widget_show (GTK_WIDGET (username_entry));
- gtk_widget_show (GTK_WIDGET (cancel_button));
- lightdm_greeter_authenticate (greeter, NULL);
- }
-- else if (strcmp (username, "*guest") == 0)
-+ else if (g_strcmp0 (username, "*guest") == 0)
- {
- lightdm_greeter_authenticate_as_guest (greeter);
- }
-@@ -689,7 +689,7 @@
- gchar *user;
-
- gtk_tree_model_get (GTK_TREE_MODEL (model), &iter, 0, &user, -1);
-- other = (strcmp (user, "*other") == 0);
-+ other = (g_strcmp0 (user, "*other") == 0);
- g_free (user);
- }
-
-@@ -964,7 +964,7 @@
-
- gtk_tree_model_get (GTK_TREE_MODEL (model), &iter, 0, &user, -1);
-
-- if (strcmp (user, "*other") == 0)
-+ if (g_strcmp0 (user, "*other") == 0)
- {
- gtk_widget_show (GTK_WIDGET (username_entry));
- gtk_widget_show (GTK_WIDGET (cancel_button));
-@@ -1463,7 +1463,7 @@
- do
- {
- gtk_tree_model_get (model, &iter, 0, &name, -1);
-- matched = strcmp (name, selected_user) == 0;
-+ matched = g_strcmp0 (name, selected_user) == 0;
- g_free (name);
- if (matched)
- {
-@@ -1954,7 +1954,7 @@
- g_object_set (gtk_settings_get_default (), "gtk-xft-dpi", (int) (1024 * atof (value)), NULL);
- value = g_key_file_get_value (config, "greeter", "xft-antialias", NULL);
- if (value)
-- g_object_set (gtk_settings_get_default (), "gtk-xft-antialias", strcmp (value, "true") == 0, NULL);
-+ g_object_set (gtk_settings_get_default (), "gtk-xft-antialias", g_strcmp0 (value, "true") == 0, NULL);
- g_free (value);
- value = g_key_file_get_value (config, "greeter", "xft-hintstyle", NULL);
- if (value)
-
diff --git a/community/lightdm-gtk2-greeter/lightdm-gtk-greeter.install b/community/lightdm-gtk2-greeter/lightdm-gtk-greeter.install
new file mode 100644
index 000000000..b72f4439b
--- /dev/null
+++ b/community/lightdm-gtk2-greeter/lightdm-gtk-greeter.install
@@ -0,0 +1,13 @@
+post_install() {
+ gtk-update-icon-cache -ftq usr/share/icons/hicolor
+}
+
+post_update() {
+ post_install
+}
+
+post_remove() {
+ post_install
+}
+
+# vim: ts=2 sw=2 et:
diff --git a/community/lightdm-gtk3-greeter/PKGBUILD b/community/lightdm-gtk3-greeter/PKGBUILD
index 785711d1e..c084d4695 100755
--- a/community/lightdm-gtk3-greeter/PKGBUILD
+++ b/community/lightdm-gtk3-greeter/PKGBUILD
@@ -1,30 +1,23 @@
-# $Id: PKGBUILD 105173 2014-02-02 11:18:41Z alucryd $
+# $Id: PKGBUILD 105739 2014-02-14 18:25:52Z alucryd $
# Maintainer: Maxime Gauduin <alucryd@gmail.com>
# Contributor: Padfoot <padfoot@exemail.com.au>
pkgname=lightdm-gtk3-greeter
-pkgver=1.6.1
-pkgrel=2
+pkgver=1.8.1
+pkgrel=1
epoch=1
-pkgdesc="GTK+ greeter for LightDM"
+pkgdesc='GTK+ greeter for LightDM'
arch=('i686' 'x86_64')
-url="https://launchpad.net/lightdm-gtk-greeter"
+url='https://launchpad.net/lightdm-gtk-greeter'
license=('GPL3' 'LGPL3')
depends=('gtk3' 'lightdm')
makedepends=('exo' 'gnome-doc-utils' 'gobject-introspection' 'intltool')
provides=("${pkgname/3/}")
conflicts=("${pkgname/3/2}")
backup=('etc/lightdm/lightdm-gtk-greeter.conf')
-source=("https://launchpad.net/${pkgname/3/}/1.6/${pkgver}/+download/${pkgname/3/}-${pkgver}.tar.gz"
- 'fix-null-username.patch')
-sha256sums=('1f0286ab093d50151f0efc46496aef3f8ed8c7306bbc81807a3fdcbcb2a468d9'
- '27e1ec5f73f963ea5fbc69d4b380dbfa47a4066b35fa1a00341203568d9aa64d')
-
-prepare() {
- cd ${pkgname/3/}-${pkgver}
-
- patch -Np0 -i ../fix-null-username.patch
-}
+install="${pkgname/3/}.install"
+source=("https://launchpad.net/${pkgname/3/}/${pkgver%.?}/${pkgver}/+download/${pkgname/3/}-${pkgver}.tar.gz")
+sha256sums=('dac5ce9ac54a6b3c1ef9f9cc056f13f01352c2a897c5bed11e52505132610bab')
build() {
cd ${pkgname/3/}-${pkgver}
diff --git a/community/lightdm-gtk3-greeter/fix-null-username.patch b/community/lightdm-gtk3-greeter/fix-null-username.patch
deleted file mode 100644
index 63cdf83c1..000000000
--- a/community/lightdm-gtk3-greeter/fix-null-username.patch
+++ /dev/null
@@ -1,83 +0,0 @@
-=== modified file 'src/lightdm-gtk-greeter.c'
---- src/lightdm-gtk-greeter.c 2014-01-07 11:02:12 +0000
-+++ src/lightdm-gtk-greeter.c 2014-01-08 00:21:56 +0000
-@@ -333,7 +333,7 @@
- gchar *s;
- gboolean matched;
- s = g_strdup(g_object_get_data (G_OBJECT (menu_iter->data), "session-key"));
-- matched = strcmp (s, session) == 0;
-+ matched = g_strcmp0 (s, session) == 0;
- g_free (s);
- if (matched)
- {
-@@ -402,7 +402,7 @@
- gchar *s;
- gboolean matched;
- s = g_strdup(g_object_get_data (G_OBJECT (menu_iter->data), "language-code"));
-- matched = strcmp (s, language) == 0;
-+ matched = g_strcmp0 (s, language) == 0;
- g_free (s);
- if (matched)
- {
-@@ -423,7 +423,7 @@
- static void
- set_message_label (const gchar *text)
- {
-- gtk_widget_set_visible (GTK_WIDGET (info_bar), strcmp (text, "") != 0);
-+ gtk_widget_set_visible (GTK_WIDGET (info_bar), g_strcmp0 (text, "") != 0);
- gtk_label_set_text (message_label, text);
- }
-
-@@ -633,13 +633,13 @@
- }
- g_free (data);
-
-- if (strcmp (username, "*other") == 0)
-+ if (g_strcmp0 (username, "*other") == 0)
- {
- gtk_widget_show (GTK_WIDGET (username_entry));
- gtk_widget_show (GTK_WIDGET (cancel_button));
- lightdm_greeter_authenticate (greeter, NULL);
- }
-- else if (strcmp (username, "*guest") == 0)
-+ else if (g_strcmp0 (username, "*guest") == 0)
- {
- lightdm_greeter_authenticate_as_guest (greeter);
- }
-@@ -689,7 +689,7 @@
- gchar *user;
-
- gtk_tree_model_get (GTK_TREE_MODEL (model), &iter, 0, &user, -1);
-- other = (strcmp (user, "*other") == 0);
-+ other = (g_strcmp0 (user, "*other") == 0);
- g_free (user);
- }
-
-@@ -964,7 +964,7 @@
-
- gtk_tree_model_get (GTK_TREE_MODEL (model), &iter, 0, &user, -1);
-
-- if (strcmp (user, "*other") == 0)
-+ if (g_strcmp0 (user, "*other") == 0)
- {
- gtk_widget_show (GTK_WIDGET (username_entry));
- gtk_widget_show (GTK_WIDGET (cancel_button));
-@@ -1463,7 +1463,7 @@
- do
- {
- gtk_tree_model_get (model, &iter, 0, &name, -1);
-- matched = strcmp (name, selected_user) == 0;
-+ matched = g_strcmp0 (name, selected_user) == 0;
- g_free (name);
- if (matched)
- {
-@@ -1954,7 +1954,7 @@
- g_object_set (gtk_settings_get_default (), "gtk-xft-dpi", (int) (1024 * atof (value)), NULL);
- value = g_key_file_get_value (config, "greeter", "xft-antialias", NULL);
- if (value)
-- g_object_set (gtk_settings_get_default (), "gtk-xft-antialias", strcmp (value, "true") == 0, NULL);
-+ g_object_set (gtk_settings_get_default (), "gtk-xft-antialias", g_strcmp0 (value, "true") == 0, NULL);
- g_free (value);
- value = g_key_file_get_value (config, "greeter", "xft-hintstyle", NULL);
- if (value)
-
diff --git a/community/lightdm-gtk3-greeter/lightdm-gtk-greeter.install b/community/lightdm-gtk3-greeter/lightdm-gtk-greeter.install
new file mode 100644
index 000000000..b72f4439b
--- /dev/null
+++ b/community/lightdm-gtk3-greeter/lightdm-gtk-greeter.install
@@ -0,0 +1,13 @@
+post_install() {
+ gtk-update-icon-cache -ftq usr/share/icons/hicolor
+}
+
+post_update() {
+ post_install
+}
+
+post_remove() {
+ post_install
+}
+
+# vim: ts=2 sw=2 et:
diff --git a/community/lxc/PKGBUILD b/community/lxc/PKGBUILD
index a357ac070..692a7fcd5 100644
--- a/community/lxc/PKGBUILD
+++ b/community/lxc/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 103083 2013-12-26 10:01:37Z spupykin $
+# $Id: PKGBUILD 105711 2014-02-14 09:37:34Z spupykin $
# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
# Contributor: Andrea Zucchelli <zukka77@gmail.com>
# Contributor: Daniel Micay <danielmicay@gmail.com>
@@ -8,7 +8,7 @@
pkgname=lxc
pkgver=0.9.0
epoch=1
-pkgrel=5
+pkgrel=6
pkgdesc="Linux Containers"
arch=('i686' 'x86_64')
url="http://linuxcontainers.org"
@@ -22,10 +22,11 @@ source=("http://linuxcontainers.org/downloads/$pkgname-${pkgver}.tar.gz"
"lxc@.service")
md5sums=('8552a4479090616f4bc04d8473765fc9'
'df94c9fb8a753011c86ee664e9f521ff'
- '8003139e60ea66c05460660f31780706')
+ '32db4ef06b27f36e15ff4b67c049dfeb')
prepare() {
cd "$srcdir/$pkgname-${pkgver/_/-}"
+ sed -i 's|sbin/init none bind|sbin/init none ro,bind|' templates/lxc-sshd.in
sed -i \
-e "s/for name in docbook2x-man db2x_docbook2man; do/for name in docbook2x-man db2x_docbook2man docbook2man; do/" \
-e "s|AM_INIT_AUTOMAKE.*|AM_INIT_AUTOMAKE([-Wall -Werror -Wno-portability subdir-objects])|" \
diff --git a/community/lxc/lxc@.service b/community/lxc/lxc@.service
index 7bc87b5dd..4c0c34e3e 100644
--- a/community/lxc/lxc@.service
+++ b/community/lxc/lxc@.service
@@ -1,11 +1,11 @@
[Unit]
-Description=%I LXC
+Description=%i LXC
After=network.target
[Service]
Type=forking
-ExecStart=/usr/bin/lxc-start -d -n %I
-ExecStop=/usr/bin/lxc-stop -n %I
+ExecStart=/usr/bin/lxc-start -d -n %i
+ExecStop=/usr/bin/lxc-stop -n %i
[Install]
WantedBy=multi-user.target
diff --git a/community/miniupnpc/PKGBUILD b/community/miniupnpc/PKGBUILD
index 5ace90fa7..ce97cf76b 100644
--- a/community/miniupnpc/PKGBUILD
+++ b/community/miniupnpc/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 104542 2014-01-22 15:26:03Z tredaelli $
+# $Id: PKGBUILD 105735 2014-02-14 15:45:18Z tredaelli $
# Maintainer: Timothy Redaelli <timothy.redaelli@gmail.com>
# Contributor: Florian Loitsch <archlinux@florian.loitsch.com>
pkgname=miniupnpc
-pkgver=1.8.20131209
+pkgver=1.9
pkgrel=1
pkgdesc="A small UPnP client library/tool to access Internet Gateway Devices"
arch=('i686' 'x86_64')
@@ -10,7 +10,7 @@ url="http://miniupnp.free.fr"
license=('BSD')
depends=('sh')
source=("http://miniupnp.free.fr/files/$pkgname-$pkgver.tar.gz")
-sha256sums=('4fb429d74c9955d8c4a8c9b34ddd0fb8efce16266ee66200e7af135fedb998e7')
+sha256sums=('2923e453e880bb949e3d4da9f83dd3cb6f08946d35de0b864d0339cf70934464')
build() {
cd "$srcdir/$pkgname-$pkgver"
diff --git a/community/pidgin-lwqq/PKGBUILD b/community/pidgin-lwqq/PKGBUILD
index 4df6f1f60..f324a8cc0 100644
--- a/community/pidgin-lwqq/PKGBUILD
+++ b/community/pidgin-lwqq/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 102564 2013-12-15 04:07:26Z fyan $
+# $Id: PKGBUILD 105694 2014-02-14 06:29:13Z fyan $
# Maintainer: Felix Yan <felixonmars@gmail.com>
pkgname=pidgin-lwqq
-pkgver=0.2c.20131206
-_commit=41f92cb7d8b4cfb26e51eded734e8110f845cff3
+pkgver=0.2c.20140214
+_commit=de349f7a2d6b1728f4f03e374dd3bc000f4b1248
pkgrel=1
pkgdesc="A pidgin plugin based on lwqq, a excellent safe useful library for webqq protocol"
arch=('i686' 'x86_64')
@@ -20,21 +20,22 @@ source=("git://github.com/xiehuc/pidgin-lwqq.git#commit=$_commit"
"git://github.com/xiehuc/lwqq.git")
prepare() {
- cd "$srcdir/$pkgname"
+ cd $pkgname
git submodule init
git config submodule."liblwqq".url "$srcdir/lwqq"
git submodule update
}
build() {
- cd "${srcdir}/$pkgname"
-
- cmake -DCMAKE_INSTALL_PREFIX=/usr .
+ cd $pkgname
+
+ #Disable SSL as per upstream suggests
+ cmake -DCMAKE_INSTALL_PREFIX=/usr -DSSL=Off .
make
}
package() {
- cd "$srcdir/$pkgname"
+ cd $pkgname
make DESTDIR="${pkgdir}" install
}
diff --git a/community/prosody/PKGBUILD b/community/prosody/PKGBUILD
index 05faf0c3c..c1f4a60ff 100644
--- a/community/prosody/PKGBUILD
+++ b/community/prosody/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 105597 2014-02-11 09:52:31Z spupykin $
+# $Id: PKGBUILD 105722 2014-02-14 11:30:55Z spupykin $
# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
# Maintainer: Dwayne Bent <dbb@dbb.io>
# Contributor: Paul-Sebastian Manole <brokenthorn@gmail.com>
@@ -6,7 +6,7 @@
pkgname=prosody
pkgver=0.9.3
-pkgrel=1
+pkgrel=2
pkgdesc="Lightweight and extensible Jabber/XMPP server written in Lua"
arch=('i686' 'x86_64')
url="http://prosody.im/"
@@ -22,12 +22,6 @@ source=("http://prosody.im/downloads/source/${pkgname}-${pkgver}.tar.gz"{,.asc}
'fix-config.patch'
'prosody.tmpfile.d'
'prosody.service')
-sha256sums=('a2df64d23b7853a9f03126750d33b98193c93b8331b2622d9ebf1fe54f8feb2d'
- 'SKIP'
- '5a2466b73bd069fb73be97a4e23b24e4c8dd1adb7db871cb8f5ab4094c1f967f'
- 'db37b1b6bcd648f264164c5db5e754fc077671c74df6079c101384e146f4d6da'
- '3f5cc5db2cfe74c4edf91f60e692e04c3504025e893d0880114d52728a2c4bc4'
- '16fbfb54bf21bb73ce9d9acacb60d47f237c35e842c5a00f1153f72f0d2f7f6b')
sha256sums=('22d2427fae4858d15b4f695348fb7781e4c65c04a24171837985024e76799ea0'
'SKIP'
'5a2466b73bd069fb73be97a4e23b24e4c8dd1adb7db871cb8f5ab4094c1f967f'
@@ -55,7 +49,7 @@ package() {
make DESTDIR="${pkgdir}" install
make DESTDIR="${pkgdir}" install -C tools/migration
- install -Dm 0644 $srcdir/prosody.logrotated "${pkgdir}"/etc/logrotate.d/prosody
+# install -Dm 0644 $srcdir/prosody.logrotated "${pkgdir}"/etc/logrotate.d/prosody
install -Dm 0644 $srcdir/prosody.tmpfile.d "${pkgdir}"/usr/lib/tmpfiles.d/prosody.conf
install -Dm 0644 $srcdir/prosody.service "${pkgdir}"/usr/lib/systemd/system/prosody.service
@@ -64,7 +58,6 @@ package() {
done
install -Dm 0644 COPYING "${pkgdir}"/usr/share/licenses/${pkgname}/COPYING
- install -dm 755 "${pkgdir}"/var/log/prosody
rm "${pkgdir}"/etc/prosody/certs/*
}
diff --git a/community/prosody/prosody.install b/community/prosody/prosody.install
index a77801d7b..dbd78bb62 100644
--- a/community/prosody/prosody.install
+++ b/community/prosody/prosody.install
@@ -7,7 +7,7 @@ post_install() {
fi
chown prosody:prosody var/lib/prosody
- chown prosody:prosody var/log/prosody
+ [ -d var/log/prosody ] && chown prosody:prosody var/log/prosody
echo ">> Documentation: http://wiki.archlinux.org/index.php/Prosody"
diff --git a/community/pymol/PKGBUILD b/community/pymol/PKGBUILD
index d09c49cbc..65a78d1a7 100644
--- a/community/pymol/PKGBUILD
+++ b/community/pymol/PKGBUILD
@@ -1,24 +1,26 @@
-# $Id: PKGBUILD 105152 2014-02-01 20:46:24Z arcanis $
-# Maintainer: Evgeniy Alekseev <arcanis dot arch at gmail dot com>
+# $Id: PKGBUILD 105733 2014-02-14 15:40:11Z arcanis $
+# Maintainer: Evgeniy Alekseev <arcanis.arch at gmail dot com>
# Contributor: graysky
# Contributor: Tomasz Żok <tomasz dot zok at gmail dot com>
pkgname=pymol
pkgver=1.7.0.0
-pkgrel=1
+pkgrel=2
pkgdesc="Molecular visualization system on an Open Source foundation"
arch=('i686' 'x86_64')
url="http://pymol.org/"
license=('custom')
depends=('glew' 'glut' 'mesa' 'python2-numpy' 'python2-pmw' 'tcsh')
makedepends=('desktop-file-utils' 'gendesk')
-source=("http://downloads.sourceforge.net/project/pymol/pymol/1.7/pymol-v${pkgver}.tar.bz2")
+source=("http://downloads.sourceforge.net/project/pymol/pymol/1.7/pymol-v${pkgver}.tar.bz2"
+ "${pkgname}-38899.patch")
install="${pkgname}.install"
-md5sums=('36fc735f6104e59802f109d0d25b6676')
+md5sums=('36fc735f6104e59802f109d0d25b6676'
+ '1f8152c4604ba2939b24e25a022937ca')
prepare() {
# create desktop file
- gendesk --pkgname "${pkgname}" --pkgdesc "${pkgdesc}" --name="PyMOL" --categories="Science;Chemistry"
+ gendesk -f --pkgname "${pkgname}" --pkgdesc "${pkgdesc}" --name="PyMOL" --categories="Science;Chemistry"
# suppress non-zero exit code that breaks makepkg
sed -i '/sys.exit/ s,2,0,' "${srcdir}/pymol/setup.py"
@@ -27,6 +29,10 @@ prepare() {
sed -i "s|python|python2|g" "${srcdir}/pymol/test/run"
sed -i "s|python|python2|g" "${srcdir}/pymol/test/show"
sed -i "s|python|python2|g" "${srcdir}/pymol/modules/pmg_tk/startup/apbs_tools.py"
+
+ # fix FS#38899
+ patch -p0 -i "${pkgname}-38899.patch"
+ mv "${srcdir}/${pkgname}/modules/web" "${srcdir}/${pkgname}/modules/pymolweb"
}
build() {
diff --git a/community/pymol/pymol-38899.patch b/community/pymol/pymol-38899.patch
new file mode 100644
index 000000000..8e4baf416
--- /dev/null
+++ b/community/pymol/pymol-38899.patch
@@ -0,0 +1,251 @@
+diff -ruN pymol.orig/modules/pymol/importing.py pymol/modules/pymol/importing.py
+--- pymol.orig/modules/pymol/importing.py 2014-01-15 00:02:55.000000000 +0400
++++ pymol/modules/pymol/importing.py 2014-02-14 10:19:11.275591741 +0400
+@@ -473,7 +473,7 @@
+ def _processPWG(fname,_self=cmd):
+ r = DEFAULT_ERROR
+ try:
+- from web.pymolhttpd import PymolHttpd
++ from pymolweb.pymolhttpd import PymolHttpd
+ browser_flag = 0
+ launch_flag = 0
+ report_url = None
+diff -ruN pymol.orig/modules/web/examples/content/SOP.html pymol/modules/web/examples/content/SOP.html
+--- pymol.orig/modules/web/examples/content/SOP.html 2014-01-15 00:02:58.000000000 +0400
++++ pymol/modules/web/examples/content/SOP.html 2014-02-14 10:19:11.275591741 +0400
+@@ -49,7 +49,7 @@
+ The first seven
+ <a href="../index.html#sample01" target="_blank"> sample applications</a>
+ are implemented like this, residing in folders at
+-<code>$PYMOL_PATH/modules/web/examples/sample[0-7]</code> There
++<code>$PYMOL_PATH/modules/pymolweb/examples/sample[0-7]</code> There
+ may be future PyMOL web applications delivered with new versions of
+ PyMOL. Of course, you are free to write your own PyMOL web
+ applications and store them on each user's machine, or perhaps on a
+diff -ruN pymol.orig/modules/web/examples/content/pwg.html pymol/modules/web/examples/content/pwg.html
+--- pymol.orig/modules/web/examples/content/pwg.html 2014-01-15 00:02:58.000000000 +0400
++++ pymol/modules/web/examples/content/pwg.html 2014-02-14 10:19:11.275591741 +0400
+@@ -58,13 +58,13 @@
+
+ <p>In contrast, the PWG file which launches the Sample 01 application is:</p>
+ <pre>
+-root $PYMOL_PATH/modules/web/examples/sample01/htdocs
++root $PYMOL_PATH/modules/pymolweb/examples/sample01/htdocs
+ browser
+ </pre>
+
+ <p>which tells PyMOL to (1) launch its internal web server on a
+ dynamically assigned port with a root content directory of
+-$PYMOL_PATH/modules/web/examples/sample01/htdocs and (2) open
++$PYMOL_PATH/modules/pymolweb/examples/sample01/htdocs and (2) open
+ up a local browser window pointing at that server instance. The
+ assumption in this scenario is that this newly-opened web page will be
+ responsible for sending requests to the PyMOL server (and thus, will
+diff -ruN pymol.orig/modules/web/examples/content/running.html pymol/modules/web/examples/content/running.html
+--- pymol.orig/modules/web/examples/content/running.html 2014-01-15 00:02:58.000000000 +0400
++++ pymol/modules/web/examples/content/running.html 2014-02-14 10:19:11.278925074 +0400
+@@ -36,7 +36,7 @@
+
+ <p>The main index file with sample application links is located at</p>
+
+-<pre>./modules/web/examples/index.html</pre>
++<pre>./modules/pymolweb/examples/index.html</pre>
+
+ <p>If you are reading this file from within a browser, then you may
+ <a href="../index.html">return to it now</a> in order to try the sample
+@@ -55,7 +55,7 @@
+
+ <pre># from within the PyMOL folder
+
+-cd ./modules/web/examples
++cd ./modules/pymolweb/examples
+
+ # then
+
+diff -ruN pymol.orig/modules/web/examples/content/server.html pymol/modules/web/examples/content/server.html
+--- pymol.orig/modules/web/examples/content/server.html 2014-01-15 00:02:58.000000000 +0400
++++ pymol/modules/web/examples/content/server.html 2014-02-14 10:19:11.278925074 +0400
+@@ -18,7 +18,7 @@
+ browser window).</p>
+
+ <p>The source code is located at
+-<code>$PYMOL_PATH/modules/web/pymolhttpd.py</code>,
++<code>$PYMOL_PATH/modules/pymolweb/pymolhttpd.py</code>,
+ and this file serves as a python module that can be imported by any
+ python script running inside of PyMOL. </p>
+
+@@ -33,7 +33,7 @@
+ <p>Alternatively, pymolhttpd.py can be used as the start-up script
+ when you launch PyMOL.</p>
+
+-<pre>pymol $PYMOL_PATH/modules/web/pymolhttpd.py</pre>
++<pre>pymol $PYMOL_PATH/modules/pymolweb/pymolhttpd.py</pre>
+
+ <p>This will cause PyMOL to start serving requests on the default port
+ (8080, assuming of course that the port is not already claimed by
+@@ -44,7 +44,7 @@
+ <p>
+ The PyMOL web server module can be imported into and launched using code like this.
+ <pre>
+-from web import pymolhttpd
++from pymolweb import pymolhttpd
+ httpd = pymolhttpd.PymolHttpd("htdocs", 8080)
+ httpd.start()
+ </pre>
+diff -ruN pymol.orig/modules/web/examples/index.html pymol/modules/web/examples/index.html
+--- pymol.orig/modules/web/examples/index.html 2014-01-15 00:02:58.000000000 +0400
++++ pymol/modules/web/examples/index.html 2014-02-14 10:19:11.288925075 +0400
+@@ -156,7 +156,7 @@
+ services interface!</p>
+
+ <p>The code for the applications above is located inside a series of folders located at:
+-<pre>$PYMOL_PATH/modules/web/examples/sample*</pre></p>
++<pre>$PYMOL_PATH/modules/pymolweb/examples/sample*</pre></p>
+
+ </body>
+ </html>
+diff -ruN pymol.orig/modules/web/examples/sample01/htdocs/api.html pymol/modules/web/examples/sample01/htdocs/api.html
+--- pymol.orig/modules/web/examples/sample01/htdocs/api.html 2014-01-15 00:02:56.000000000 +0400
++++ pymol/modules/web/examples/sample01/htdocs/api.html 2014-02-14 10:19:11.288925075 +0400
+@@ -9,9 +9,9 @@
+ </ul><hr><p>Please click the link(s) below before testing methods in this section (in order).</p><pre><a target="result" href="/apply/pymol.cmd.reinitialize">/apply/pymol.cmd.reinitialize</a></pre>
+
+ <ul><li><p><font face="Courier" size="2"><b>load</b></font>
+-<i>filename, object, state, format, finish, discrete, quiet, multiplex, zoom, partial</i><pre><a target="result" href="/apply/pymol.cmd.load?filename=$PYMOL_PATH/modules/web/examples/data/ref.pdb">/apply/pymol.cmd.load?filename=$PYMOL_PATH/modules/web/examples/data/ref.pdb</a></pre>
++<i>filename, object, state, format, finish, discrete, quiet, multiplex, zoom, partial</i><pre><a target="result" href="/apply/pymol.cmd.load?filename=$PYMOL_PATH/modules/pymolweb/examples/data/ref.pdb">/apply/pymol.cmd.load?filename=$PYMOL_PATH/modules/pymolweb/examples/data/ref.pdb</a></pre>
+
+-<pre><a target="result" href="/apply/pymol.cmd.load?filename=$PYMOL_PATH/modules/web/examples/data/map.ccp4">/apply/pymol.cmd.load?filename=$PYMOL_PATH/modules/web/examples/data/map.ccp4</a></pre>
++<pre><a target="result" href="/apply/pymol.cmd.load?filename=$PYMOL_PATH/modules/pymolweb/examples/data/map.ccp4">/apply/pymol.cmd.load?filename=$PYMOL_PATH/modules/pymolweb/examples/data/map.ccp4</a></pre>
+
+ </p></li>
+ <li><p><font face="Courier" size="2"><b>enable</b></font>
+@@ -38,7 +38,7 @@
+ </p></li>
+ </ul><hr><p>Please click the link(s) below before testing methods in this section (in order).</p><pre><a target="result" href="/apply/pymol.cmd.reinitialize">/apply/pymol.cmd.reinitialize</a></pre>
+
+-<pre><a target="result" href="/apply/pymol.cmd.load?filename=$PYMOL_PATH/modules/web/examples/data/ref.pdb">/apply/pymol.cmd.load?filename=$PYMOL_PATH/modules/web/examples/data/ref.pdb</a></pre>
++<pre><a target="result" href="/apply/pymol.cmd.load?filename=$PYMOL_PATH/modules/pymolweb/examples/data/ref.pdb">/apply/pymol.cmd.load?filename=$PYMOL_PATH/modules/pymolweb/examples/data/ref.pdb</a></pre>
+
+ <ul><li><p><font face="Courier" size="2"><b>color</b></font>
+ <i>color, selection, quiet, flags</i><pre><a target="result" href="/apply/pymol.cmd.color?color=yellow&selection=elem c">/apply/pymol.cmd.color?color=yellow&selection=elem c</a></pre>
+@@ -118,9 +118,9 @@
+ </p></li>
+ </ul><hr><p>Please click the link(s) below before testing methods in this section (in order).</p><pre><a target="result" href="/apply/pymol.cmd.reinitialize">/apply/pymol.cmd.reinitialize</a></pre>
+
+-<pre><a target="result" href="/apply/pymol.cmd.load?filename=$PYMOL_PATH/modules/web/examples/data/ref.pdb">/apply/pymol.cmd.load?filename=$PYMOL_PATH/modules/web/examples/data/ref.pdb</a></pre>
++<pre><a target="result" href="/apply/pymol.cmd.load?filename=$PYMOL_PATH/modules/pymolweb/examples/data/ref.pdb">/apply/pymol.cmd.load?filename=$PYMOL_PATH/modules/pymolweb/examples/data/ref.pdb</a></pre>
+
+-<pre><a target="result" href="/apply/pymol.cmd.load?filename=$PYMOL_PATH/modules/web/examples/data/map.ccp4">/apply/pymol.cmd.load?filename=$PYMOL_PATH/modules/web/examples/data/map.ccp4</a></pre>
++<pre><a target="result" href="/apply/pymol.cmd.load?filename=$PYMOL_PATH/modules/pymolweb/examples/data/map.ccp4">/apply/pymol.cmd.load?filename=$PYMOL_PATH/modules/pymolweb/examples/data/map.ccp4</a></pre>
+
+ <ul><li><p><font face="Courier" size="2"><b>isomesh</b></font>
+ <i>name, map, level, selection, buffer, state, carve, source_state, quiet</i><pre><a target="result" href="/apply/pymol.cmd.isomesh?name=mesh&map=map&level=1.0">/apply/pymol.cmd.isomesh?name=mesh&map=map&level=1.0</a></pre>
+@@ -142,7 +142,7 @@
+ </p></li>
+ </ul><hr><p>Please click the link(s) below before testing methods in this section (in order).</p><pre><a target="result" href="/apply/pymol.cmd.reinitialize">/apply/pymol.cmd.reinitialize</a></pre>
+
+-<pre><a target="result" href="/apply/pymol.cmd.load?filename=$PYMOL_PATH/modules/web/examples/data/ref.pdb">/apply/pymol.cmd.load?filename=$PYMOL_PATH/modules/web/examples/data/ref.pdb</a></pre>
++<pre><a target="result" href="/apply/pymol.cmd.load?filename=$PYMOL_PATH/modules/pymolweb/examples/data/ref.pdb">/apply/pymol.cmd.load?filename=$PYMOL_PATH/modules/pymolweb/examples/data/ref.pdb</a></pre>
+
+ <ul><li><p><font face="Courier" size="2"><b>show</b></font>
+ <i>representation, selection</i><pre><a target="result" href="/apply/pymol.cmd.show?representation=sticks">/apply/pymol.cmd.show?representation=sticks</a></pre>
+@@ -174,7 +174,7 @@
+ </p></li>
+ </ul><hr><p>Please click the link(s) below before testing methods in this section (in order).</p><pre><a target="result" href="/apply/pymol.cmd.reinitialize">/apply/pymol.cmd.reinitialize</a></pre>
+
+-<pre><a target="result" href="/apply/pymol.cmd.load?filename=$PYMOL_PATH/modules/web/examples/data/ref.pdb">/apply/pymol.cmd.load?filename=$PYMOL_PATH/modules/web/examples/data/ref.pdb</a></pre>
++<pre><a target="result" href="/apply/pymol.cmd.load?filename=$PYMOL_PATH/modules/pymolweb/examples/data/ref.pdb">/apply/pymol.cmd.load?filename=$PYMOL_PATH/modules/pymolweb/examples/data/ref.pdb</a></pre>
+
+ <ul><li><p><font face="Courier" size="2"><b>show_as</b></font>
+ <i>representation, selection</i><pre><a target="result" href="/apply/pymol.cmd.show_as?representation=spheres">/apply/pymol.cmd.show_as?representation=spheres</a></pre>
+@@ -224,7 +224,7 @@
+ </p></li>
+ </ul><hr><p>Please click the link(s) below before testing methods in this section (in order).</p><pre><a target="result" href="/apply/pymol.cmd.reinitialize">/apply/pymol.cmd.reinitialize</a></pre>
+
+-<pre><a target="result" href="/apply/pymol.cmd.load?filename=$PYMOL_PATH/modules/web/examples/data/ref.pdb">/apply/pymol.cmd.load?filename=$PYMOL_PATH/modules/web/examples/data/ref.pdb</a></pre>
++<pre><a target="result" href="/apply/pymol.cmd.load?filename=$PYMOL_PATH/modules/pymolweb/examples/data/ref.pdb">/apply/pymol.cmd.load?filename=$PYMOL_PATH/modules/pymolweb/examples/data/ref.pdb</a></pre>
+
+ <ul><li><p><font face="Courier" size="2"><b>super</b></font>
+ <i>mobile, target, cutoff, cycles, gap, extend, max_gap, object, matrix, mobile_state, target_state, quiet, max_skip, transform, reset, seq, radius, scale, base, coord, expect, window, ante</i><pre><a target="result" href="/apply/pymol.cmd.create?name=helix1&selection=polymer and 5-17/">/apply/pymol.cmd.create?name=helix1&selection=polymer and 5-17/</a></pre>
+diff -ruN pymol.orig/modules/web/examples/sample01/start.pwg pymol/modules/web/examples/sample01/start.pwg
+--- pymol.orig/modules/web/examples/sample01/start.pwg 2014-01-15 00:02:56.000000000 +0400
++++ pymol/modules/web/examples/sample01/start.pwg 2014-02-14 10:19:11.288925075 +0400
+@@ -1,2 +1,2 @@
+-root $PYMOL_PATH/modules/web/examples/sample01/htdocs
++root $PYMOL_PATH/modules/pymolweb/examples/sample01/htdocs
+ browser
+diff -ruN pymol.orig/modules/web/examples/sample02/start.pwg pymol/modules/web/examples/sample02/start.pwg
+--- pymol.orig/modules/web/examples/sample02/start.pwg 2014-01-15 00:02:56.000000000 +0400
++++ pymol/modules/web/examples/sample02/start.pwg 2014-02-14 10:19:11.292258408 +0400
+@@ -1,2 +1,2 @@
+-root $PYMOL_PATH/modules/web/examples/sample02/htdocs
++root $PYMOL_PATH/modules/pymolweb/examples/sample02/htdocs
+ browser
+diff -ruN pymol.orig/modules/web/examples/sample03/start.pwg pymol/modules/web/examples/sample03/start.pwg
+--- pymol.orig/modules/web/examples/sample03/start.pwg 2014-01-15 00:02:56.000000000 +0400
++++ pymol/modules/web/examples/sample03/start.pwg 2014-02-14 10:19:11.292258408 +0400
+@@ -1,2 +1,2 @@
+-root $PYMOL_PATH/modules/web/examples/sample03/htdocs
++root $PYMOL_PATH/modules/pymolweb/examples/sample03/htdocs
+ browser
+diff -ruN pymol.orig/modules/web/examples/sample04/htdocs/pdbshow.js pymol/modules/web/examples/sample04/htdocs/pdbshow.js
+--- pymol.orig/modules/web/examples/sample04/htdocs/pdbshow.js 2014-01-15 00:02:56.000000000 +0400
++++ pymol/modules/web/examples/sample04/htdocs/pdbshow.js 2014-02-14 10:19:11.292258408 +0400
+@@ -12,7 +12,7 @@
+ function get_protein(a) {
+ // load protein, unless already loaded
+ if (load_state[a] == undefined) {
+- load = "load?filename=$PYMOL_PATH/modules/web/examples/data/" + a + ".pdb.gz" + zoom;
++ load = "load?filename=$PYMOL_PATH/modules/pymolweb/examples/data/" + a + ".pdb.gz" + zoom;
+ cmd(load);
+ zoom = "&zoom=0"; // subsequent loads shold not zoom
+ cmd("orient?selection=bymol organic and elem n&animate=2");
+diff -ruN pymol.orig/modules/web/examples/sample04/start.pwg pymol/modules/web/examples/sample04/start.pwg
+--- pymol.orig/modules/web/examples/sample04/start.pwg 2014-01-15 00:02:56.000000000 +0400
++++ pymol/modules/web/examples/sample04/start.pwg 2014-02-14 10:19:11.292258408 +0400
+@@ -1,2 +1,2 @@
+-root $PYMOL_PATH/modules/web/examples/sample04/htdocs
++root $PYMOL_PATH/modules/pymolweb/examples/sample04/htdocs
+ browser
+diff -ruN pymol.orig/modules/web/examples/sample05/htdocs/index.html pymol/modules/web/examples/sample05/htdocs/index.html
+--- pymol.orig/modules/web/examples/sample05/htdocs/index.html 2014-01-15 00:02:57.000000000 +0400
++++ pymol/modules/web/examples/sample05/htdocs/index.html 2014-02-14 10:19:11.292258408 +0400
+@@ -108,7 +108,7 @@
+
+ function loadPDB(code)
+ {
+- return cmd('load?filename=$PYMOL_PATH/modules/web/examples/data/'+code+'.pdb');
++ return cmd('load?filename=$PYMOL_PATH/modules/pymolweb/examples/data/'+code+'.pdb');
+ }
+
+ </script>
+diff -ruN pymol.orig/modules/web/examples/sample05/start.pwg pymol/modules/web/examples/sample05/start.pwg
+--- pymol.orig/modules/web/examples/sample05/start.pwg 2014-01-15 00:02:57.000000000 +0400
++++ pymol/modules/web/examples/sample05/start.pwg 2014-02-14 10:19:11.292258408 +0400
+@@ -1,2 +1,2 @@
+-root $PYMOL_PATH/modules/web/examples/sample05/htdocs
++root $PYMOL_PATH/modules/pymolweb/examples/sample05/htdocs
+ browser
+diff -ruN pymol.orig/modules/web/examples/sample06/start.pwg pymol/modules/web/examples/sample06/start.pwg
+--- pymol.orig/modules/web/examples/sample06/start.pwg 2014-01-15 00:02:57.000000000 +0400
++++ pymol/modules/web/examples/sample06/start.pwg 2014-02-14 10:19:11.292258408 +0400
+@@ -1,3 +1,3 @@
+-root $PYMOL_PATH/modules/web/examples/sample06/htdocs
++root $PYMOL_PATH/modules/pymolweb/examples/sample06/htdocs
+ browser
+ logging 0
+diff -ruN pymol.orig/modules/web/examples/sample07/start.pwg pymol/modules/web/examples/sample07/start.pwg
+--- pymol.orig/modules/web/examples/sample07/start.pwg 2014-01-15 00:02:57.000000000 +0400
++++ pymol/modules/web/examples/sample07/start.pwg 2014-02-14 10:19:11.295591741 +0400
+@@ -1,2 +1,2 @@
+-root $PYMOL_PATH/modules/web/examples/sample07/htdocs
++root $PYMOL_PATH/modules/pymolweb/examples/sample07/htdocs
+ browser
+diff -ruN pymol.orig/modules/web/examples/sample08/start.pwg pymol/modules/web/examples/sample08/start.pwg
+--- pymol.orig/modules/web/examples/sample08/start.pwg 2014-01-15 00:02:57.000000000 +0400
++++ pymol/modules/web/examples/sample08/start.pwg 2014-02-14 10:19:11.295591741 +0400
+@@ -1,3 +1,3 @@
+-root $PYMOL_PATH/modules/web/examples/sample08/htdocs
++root $PYMOL_PATH/modules/pymolweb/examples/sample08/htdocs
+ browser
+ logging 0 \ No newline at end of file