diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2012-04-27 16:17:51 +0200 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-04-27 16:17:51 +0200 |
| commit | 0ee0392ee9301df31f6e3c601214bb250112fa75 (patch) | |
| tree | 3d91576bf751a8a45ddad77e0a37c2d8fd4fa91f /extra/gnome-pilot | |
| parent | a3ba265c32b1de731745e1abc812f5d21bcd6aaf (diff) | |
| parent | 5233daa5825f00ccf0722ef9733ea6b3bbd44bc8 (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/dwdiff/PKGBUILD
community/ejabberd/PKGBUILD
community/gnome-settings-daemon-updates/PKGBUILD
community/gpicview/PKGBUILD
community/libgexiv2/PKGBUILD
community/mapnik/PKGBUILD
community/mplayer2/PKGBUILD
community/open-vm-tools/PKGBUILD
community/vdrift/PKGBUILD
community/xboard/PKGBUILD
core/openssh/PKGBUILD
extra/boost/PKGBUILD
extra/dconf/PKGBUILD
extra/elfutils/PKGBUILD
extra/gconf/PKGBUILD
extra/gnome-control-center/PKGBUILD
extra/gnome-disk-utility/PKGBUILD
extra/gnome-menus/PKGBUILD
extra/gnome-panel/PKGBUILD
extra/gnome-power-manager/PKGBUILD
extra/gnome-themes-standard/PKGBUILD
extra/gobject-introspection/PKGBUILD
extra/gtk3/PKGBUILD
extra/gvfs/PKGBUILD
extra/icu/PKGBUILD
extra/libgsf/PKGBUILD
extra/libimobiledevice/PKGBUILD
extra/libplist/PKGBUILD
extra/libreoffice/PKGBUILD
extra/libwebkit/PKGBUILD
extra/mutter/PKGBUILD
extra/pango/PKGBUILD
extra/php/PKGBUILD
extra/pidgin/PKGBUILD
extra/telepathy-kde-accounts-kcm/PKGBUILD
extra/telepathy-kde-approver/PKGBUILD
extra/telepathy-kde-auth-handler/PKGBUILD
extra/telepathy-kde-contact-list/PKGBUILD
extra/telepathy-kde-filetransfer-handler/PKGBUILD
extra/telepathy-kde-integration-module/PKGBUILD
extra/telepathy-kde-send-file/PKGBUILD
extra/telepathy-kde-text-ui/PKGBUILD
extra/totem-plparser/PKGBUILD
extra/virtuoso/PKGBUILD
extra/yelp/PKGBUILD
libre/unarchiver/PKGBUILD
multilib/lib32-gdk-pixbuf2/PKGBUILD
multilib/lib32-glib2/PKGBUILD
multilib/lib32-pango/PKGBUILD
testing/binutils/PKGBUILD
Diffstat (limited to 'extra/gnome-pilot')
| -rw-r--r-- | extra/gnome-pilot/PKGBUILD | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/extra/gnome-pilot/PKGBUILD b/extra/gnome-pilot/PKGBUILD index bd98ec59c..7cc25291f 100644 --- a/extra/gnome-pilot/PKGBUILD +++ b/extra/gnome-pilot/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 139311 2011-10-01 18:58:09Z ibiru $ +# $Id: PKGBUILD 157208 2012-04-26 02:01:26Z eric $ # Jan de Groot <jgc@archlinux.org> pkgname=gnome-pilot pkgver=2.91.93 -pkgrel=1 +pkgrel=2 pkgdesc="Pilot Support for Gnome" arch=(i686 x86_64 'mips64el') license=('GPL') @@ -30,6 +30,6 @@ package() { make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install install -m755 -d "${pkgdir}/usr/share/gconf/schemas" - gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" ${pkgdir}/etc/gconf/schemas/*.schemas - rm -f ${pkgdir}/etc/gconf/schemas/*.schemas + gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" "${pkgdir}"/etc/gconf/schemas/*.schemas + rm -f "${pkgdir}"/etc/gconf/schemas/*.schemas } |