Date: Wednesday, October 12, 2016 @ 12:47:16
  Author: bgyorgy
Revision: 192056

archrelease: copy trunk to community-i686, community-x86_64

Added:
  caja/repos/community-i686/PKGBUILD
    (from rev 192055, caja/trunk/PKGBUILD)
  caja/repos/community-x86_64/PKGBUILD
    (from rev 192055, caja/trunk/PKGBUILD)
Deleted:
  caja/repos/community-i686/PKGBUILD
  caja/repos/community-x86_64/PKGBUILD

---------------------------+
 /PKGBUILD                 |   82 ++++++++++++++++++++++++++++++++++++++++++++
 community-i686/PKGBUILD   |   38 --------------------
 community-x86_64/PKGBUILD |   38 --------------------
 3 files changed, 82 insertions(+), 76 deletions(-)

Deleted: community-i686/PKGBUILD
===================================================================
--- community-i686/PKGBUILD     2016-10-12 12:47:10 UTC (rev 192055)
+++ community-i686/PKGBUILD     2016-10-12 12:47:16 UTC (rev 192056)
@@ -1,38 +0,0 @@
-# Contributor: Martin Wimpress <c...@flexion.org>
-
-_ver=1.16
-_pkgbase=caja
-pkgname=${_pkgbase}
-pkgver=${_ver}.0
-pkgrel=1
-pkgdesc="File manager for the MATE desktop (GTK2 version)"
-url="http://mate-desktop.org";
-arch=('i686' 'x86_64')
-license=('GPL')
-depends=('exempi' 'gvfs' 'libexif' 'libsm' 'libunique' 'mate-desktop')
-makedepends=('gobject-introspection' 'intltool')
-optdepends=('gstreamer: automatic media playback when mouseover')
-groups=('mate')
-conflicts=("${_pkgbase}-gtk3")
-source=("http://pub.mate-desktop.org/releases/${_ver}/${_pkgbase}-${pkgver}.tar.xz";)
-sha1sums=('5d46c0ec4f8b757f85cb2da1c501e5cdfa16a042')
-
-build() {
-    cd "${srcdir}/${_pkgbase}-${pkgver}"
-    ./configure \
-        --prefix=/usr \
-        --libexecdir=/usr/lib/${_pkgbase} \
-        --with-gtk=2.0 \
-        --enable-introspection \
-        --disable-update-mimedb
-
-    #https://bugzilla.gnome.org/show_bug.cgi?id=656231
-    sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
-
-    make
-}
-
-package() {
-    cd "${srcdir}/${_pkgbase}-${pkgver}"
-    make DESTDIR="${pkgdir}" install
-}

Copied: caja/repos/community-i686/PKGBUILD (from rev 192055, 
caja/trunk/PKGBUILD)
===================================================================
--- community-i686/PKGBUILD                             (rev 0)
+++ community-i686/PKGBUILD     2016-10-12 12:47:16 UTC (rev 192056)
@@ -0,0 +1,41 @@
+# Contributor: Martin Wimpress <c...@flexion.org>
+
+_ver=1.16
+_pkgbase=caja
+pkgname=${_pkgbase}
+pkgver=${_ver}.0
+pkgrel=2
+pkgdesc="File manager for the MATE desktop (GTK2 version)"
+url="http://mate-desktop.org";
+arch=('i686' 'x86_64')
+license=('GPL')
+depends=('exempi' 'gvfs' 'libexif' 'libsm' 'libunique' 'mate-desktop')
+makedepends=('gobject-introspection' 'intltool')
+optdepends=('gstreamer: automatic media playback when mouseover')
+groups=('mate')
+conflicts=("${_pkgbase}-gtk3")
+source=("http://pub.mate-desktop.org/releases/${_ver}/${_pkgbase}-${pkgver}.tar.xz";)
+sha1sums=('5d46c0ec4f8b757f85cb2da1c501e5cdfa16a042')
+
+build() {
+    cd "${srcdir}/${_pkgbase}-${pkgver}"
+    ./configure \
+        --prefix=/usr \
+        --libexecdir=/usr/lib/${_pkgbase} \
+        --with-gtk=2.0 \
+        --enable-introspection \
+        --disable-update-mimedb
+
+    #https://bugzilla.gnome.org/show_bug.cgi?id=656231
+    sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
+
+    make
+}
+
+package() {
+    cd "${srcdir}/${_pkgbase}-${pkgver}"
+    make DESTDIR="${pkgdir}" install
+
+    # Remove D-Bus activation file to avoid conflict with nautilus-desktop
+    rm -r "$pkgdir/usr/share/dbus-1/"
+}

Deleted: community-x86_64/PKGBUILD
===================================================================
--- community-x86_64/PKGBUILD   2016-10-12 12:47:10 UTC (rev 192055)
+++ community-x86_64/PKGBUILD   2016-10-12 12:47:16 UTC (rev 192056)
@@ -1,38 +0,0 @@
-# Contributor: Martin Wimpress <c...@flexion.org>
-
-_ver=1.16
-_pkgbase=caja
-pkgname=${_pkgbase}
-pkgver=${_ver}.0
-pkgrel=1
-pkgdesc="File manager for the MATE desktop (GTK2 version)"
-url="http://mate-desktop.org";
-arch=('i686' 'x86_64')
-license=('GPL')
-depends=('exempi' 'gvfs' 'libexif' 'libsm' 'libunique' 'mate-desktop')
-makedepends=('gobject-introspection' 'intltool')
-optdepends=('gstreamer: automatic media playback when mouseover')
-groups=('mate')
-conflicts=("${_pkgbase}-gtk3")
-source=("http://pub.mate-desktop.org/releases/${_ver}/${_pkgbase}-${pkgver}.tar.xz";)
-sha1sums=('5d46c0ec4f8b757f85cb2da1c501e5cdfa16a042')
-
-build() {
-    cd "${srcdir}/${_pkgbase}-${pkgver}"
-    ./configure \
-        --prefix=/usr \
-        --libexecdir=/usr/lib/${_pkgbase} \
-        --with-gtk=2.0 \
-        --enable-introspection \
-        --disable-update-mimedb
-
-    #https://bugzilla.gnome.org/show_bug.cgi?id=656231
-    sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
-
-    make
-}
-
-package() {
-    cd "${srcdir}/${_pkgbase}-${pkgver}"
-    make DESTDIR="${pkgdir}" install
-}

Copied: caja/repos/community-x86_64/PKGBUILD (from rev 192055, 
caja/trunk/PKGBUILD)
===================================================================
--- community-x86_64/PKGBUILD                           (rev 0)
+++ community-x86_64/PKGBUILD   2016-10-12 12:47:16 UTC (rev 192056)
@@ -0,0 +1,41 @@
+# Contributor: Martin Wimpress <c...@flexion.org>
+
+_ver=1.16
+_pkgbase=caja
+pkgname=${_pkgbase}
+pkgver=${_ver}.0
+pkgrel=2
+pkgdesc="File manager for the MATE desktop (GTK2 version)"
+url="http://mate-desktop.org";
+arch=('i686' 'x86_64')
+license=('GPL')
+depends=('exempi' 'gvfs' 'libexif' 'libsm' 'libunique' 'mate-desktop')
+makedepends=('gobject-introspection' 'intltool')
+optdepends=('gstreamer: automatic media playback when mouseover')
+groups=('mate')
+conflicts=("${_pkgbase}-gtk3")
+source=("http://pub.mate-desktop.org/releases/${_ver}/${_pkgbase}-${pkgver}.tar.xz";)
+sha1sums=('5d46c0ec4f8b757f85cb2da1c501e5cdfa16a042')
+
+build() {
+    cd "${srcdir}/${_pkgbase}-${pkgver}"
+    ./configure \
+        --prefix=/usr \
+        --libexecdir=/usr/lib/${_pkgbase} \
+        --with-gtk=2.0 \
+        --enable-introspection \
+        --disable-update-mimedb
+
+    #https://bugzilla.gnome.org/show_bug.cgi?id=656231
+    sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
+
+    make
+}
+
+package() {
+    cd "${srcdir}/${_pkgbase}-${pkgver}"
+    make DESTDIR="${pkgdir}" install
+
+    # Remove D-Bus activation file to avoid conflict with nautilus-desktop
+    rm -r "$pkgdir/usr/share/dbus-1/"
+}

Reply via email to