[arch-commits] Commit in caja/trunk (3 files)

[Martin Wimpress]

    Date: Thursday, June 11, 2015 @ 23:31:46
  Author: flexiondotorg
Revision: 135206

upgpkg: caja 1.10.1-1 - New upstream release

Modified:
  caja/trunk/PKGBUILD
Deleted:
  caja/trunk/0001_expand_list_columns_in_file_management_preferences.diff
  caja/trunk/0002_set_default_window_size_for_file_management_preferences.diff

-------------------------------------------------------------------+
 0001_expand_list_columns_in_file_management_preferences.diff      |   21 ----------
 0002_set_default_window_size_for_file_management_preferences.diff |   13 ------
 PKGBUILD                                                          |   20 +--------
 3 files changed, 4 insertions(+), 50 deletions(-)

Deleted: 0001_expand_list_columns_in_file_management_preferences.diff
===================================================================
--- 0001_expand_list_columns_in_file_management_preferences.diff	2015-06-11 21:18:13 UTC (rev 135205)
+++ 0001_expand_list_columns_in_file_management_preferences.diff	2015-06-11 21:31:46 UTC (rev 135206)
@@ -1,21 +0,0 @@
-diff --git a/src/caja-file-management-properties.ui b/src/caja-file-management-properties.ui
-index cca1a36..68c9c94 100644
---- a/src/caja-file-management-properties.ui
-+++ b/src/caja-file-management-properties.ui
-@@ -1522,14 +1522,14 @@
-                         </child>
-                       </object>
-                       <packing>
--                        <property name="expand">False</property>
-+                        <property name="expand">True</property>
-                         <property name="fill">True</property>
-                         <property name="position">1</property>
-                       </packing>
-                     </child>
-                   </object>
-                   <packing>
--                    <property name="expand">False</property>
-+                    <property name="expand">True</property>
-                     <property name="fill">True</property>
-                     <property name="position">0</property>
-                   </packing>

Deleted: 0002_set_default_window_size_for_file_management_preferences.diff
===================================================================
--- 0002_set_default_window_size_for_file_management_preferences.diff	2015-06-11 21:18:13 UTC (rev 135205)
+++ 0002_set_default_window_size_for_file_management_preferences.diff	2015-06-11 21:31:46 UTC (rev 135206)
@@ -1,13 +0,0 @@
-diff --git a/src/caja-file-management-properties.ui b/src/caja-file-management-properties.ui
-index 68c9c94..05f9446 100644
---- a/src/caja-file-management-properties.ui
-+++ b/src/caja-file-management-properties.ui
-@@ -271,6 +271,8 @@
-     <property name="border_width">5</property>
-     <property name="title" translatable="yes">File Management Preferences</property>
-     <property name="window_position">center</property>
-+    <property name="default_width">600</property>
-+    <property name="default_height">600</property>
-     <property name="type_hint">dialog</property>
-     <child internal-child="vbox">
-       <object class="GtkVBox" id="dialog-vbox1">

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-06-11 21:18:13 UTC (rev 135205)
+++ PKGBUILD	2015-06-11 21:31:46 UTC (rev 135206)
@@ -3,8 +3,8 @@
 _ver=1.10
 _pkgbase=caja
 pkgname=${_pkgbase}
-pkgver=${_ver}.0
-pkgrel=3
+pkgver=${_ver}.1
+pkgrel=1
 pkgdesc="File manager for the MATE desktop (GTK2 version)"
 url="http://mate-desktop.org"
 arch=('i686' 'x86_64')
@@ -17,22 +17,10 @@
             'gvfs-smb: To connect to Samba/Windows shares')
 groups=('mate')
 conflicts=("${_pkgbase}-gtk3")
-source=("http://pub.mate-desktop.org/releases/${_ver}/${_pkgbase}-${pkgver}.tar.xz"
-        "0001_expand_list_columns_in_file_management_preferences.diff"
-        "0002_set_default_window_size_for_file_management_preferences.diff")
-sha1sums=('a8d9c4a479a2fea7bd2eda707e0fd4025f85f229'
-          '3ae81639efe4dbbda0b6a41c2e1872996c76705d'
-          'c0c7d0e71c9fb4d5bc448f0d1ee1a0bb4aacbb86')
+source=("http://pub.mate-desktop.org/releases/${_ver}/${_pkgbase}-${pkgver}.tar.xz")
+sha1sums=('28880462ba21ce5ae1260b05b04cfc67cc4aa58a')
 install=${_pkgbase}.install
 
-prepare() {
-    # UI fixes for GTK3.
-    #  - https://github.com/mate-desktop/caja/pull/401/commits
-    cd "${srcdir}/${_pkgbase}-${pkgver}"
-    patch -Np1 -i "${srcdir}/0001_expand_list_columns_in_file_management_preferences.diff"
-    patch -Np1 -i "${srcdir}/0002_set_default_window_size_for_file_management_preferences.diff"
-}
-
 build() {
     cd "${srcdir}/${_pkgbase}-${pkgver}"
     ./configure \