[SCM] mate-file-manager Debian package branch, master, updated. 97a2a35cd4b19258e2ffd1ea960809dc2bc4a5d3
Mike Gabriel
sunweaver at alioth.debian.org
Thu Aug 15 22:43:50 UTC 2013
Gitweb-URL: http://git.debian.org/?p=pkg-mate/mate-file-manager.git;a=commitdiff;h=97a2a35
The following commit has been merged in the master branch:
commit 97a2a35cd4b19258e2ffd1ea960809dc2bc4a5d3
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date: Fri Aug 16 00:43:11 2013 +0200
add /debian packaging folder as provided by upstream internal packaging repos
---
debian/caja-common.install | 7 +
debian/caja.install | 4 +
debian/changelog | 190 ++++++++++++++++++++
debian/compat | 1 +
debian/control | 121 +++++++++++++
debian/copyright | 43 +++++
debian/gir1.2-caja.install | 2 +
debian/libcaja-extension-dev.install | 4 +
debian/libcaja-extension.install | 2 +
debian/patches/00-fix-radio-buttons.patch | 120 +++++++++++++
debian/patches/01-fix-default-sort-order.patch | 21 +++
debian/patches/02-fix-spatial-mode.patch | 21 +++
.../03-fix-for-x-caja-desktop-windows.patch | 22 +++
debian/patches/04-fix-binary-check.patch | 23 +++
debian/patches/05-fix-binary-check-2.patch | 43 +++++
debian/patches/series | 6 +
debian/rules | 22 +++
debian/source/format | 1 +
debian/watch | 3 +
19 files changed, 656 insertions(+)
diff --git a/debian/caja-common.install b/debian/caja-common.install
new file mode 100644
index 0000000..9030d55
--- /dev/null
+++ b/debian/caja-common.install
@@ -0,0 +1,7 @@
+usr/share/dbus-1/
+usr/share/glib-2.0/
+usr/share/icons/
+usr/share/locale/
+usr/share/MateConf/
+usr/share/mime/
+usr/share/pixmaps/
diff --git a/debian/caja.install b/debian/caja.install
new file mode 100644
index 0000000..8d4d811
--- /dev/null
+++ b/debian/caja.install
@@ -0,0 +1,4 @@
+usr/bin/
+usr/share/applications/
+usr/share/caja/
+usr/share/man/
diff --git a/debian/changelog b/debian/changelog
new file mode 100644
index 0000000..a4fc1f4
--- /dev/null
+++ b/debian/changelog
@@ -0,0 +1,190 @@
+mate-file-manager (1.6.1-4) UNRELEASED; urgency=low
+
+ * Add gvfs to Depends.
+
+ -- Stefano Karapetsas <stefano at karapetsas.com> Fri, 12 Jul 2013 20:33:32 +0200
+
+mate-file-manager (1.6.1-3) unstable; urgency=low
+
+ * Cherry pick upstream patch:
+ 05-fix-binary-check-2.patch
+
+ -- Stefano Karapetsas <stefano at karapetsas.com> Wed, 08 May 2013 23:28:39 +0200
+
+mate-file-manager (1.6.1-2) unstable; urgency=low
+
+ * Cherry pick upstream patches:
+ 00-fix-radio-buttons.patch
+ 01-fix-default-sort-order.patch
+ 02-fix-spatial-mode.patch
+ 03-fix-for-x-caja-desktop-windows.patch
+ 04-fix-binary-check.patch
+
+ -- Stefano Karapetsas <stefano at karapetsas.com> Tue, 07 May 2013 12:31:38 +0200
+
+mate-file-manager (1.6.1-1) unstable; urgency=low
+
+ * New upstream bugfix release.
+
+ -- Stefano Karapetsas <stefano at karapetsas.com> Thu, 11 Apr 2013 19:45:50 +0200
+
+mate-file-manager (1.6.0-2) unstable; urgency=low
+
+ * Add patch to fix scrolling issue.
+
+ -- Stefano Karapetsas <stefano at karapetsas.com> Wed, 10 Apr 2013 10:12:40 +0200
+
+mate-file-manager (1.6.0-1) unstable; urgency=low
+
+ * New upstream release.
+
+ -- Stefano Karapetsas <stefano at karapetsas.com> Sun, 31 Mar 2013 16:48:38 +0200
+
+mate-file-manager (1.5.5-1) unstable; urgency=low
+
+ * New upstream development release.
+
+ -- Stefano Karapetsas <stefano at karapetsas.com> Sun, 10 Mar 2013 19:01:07 +0100
+
+mate-file-manager (1.5.4-1) unstable; urgency=low
+
+ * New upstream development release.
+
+ -- Stefano Karapetsas <stefano at karapetsas.com> Sun, 24 Feb 2013 14:32:35 +0100
+
+mate-file-manager (1.5.3-1) unstable; urgency=low
+
+ * New upstream development release.
+
+ -- Stefano Karapetsas <stefano at karapetsas.com> Thu, 07 Feb 2013 23:55:50 +0100
+
+mate-file-manager (1.5.2-1) unstable; urgency=low
+
+ * New upstream development release.
+
+ -- Stefano Karapetsas <stefano at karapetsas.com> Tue, 04 Dec 2012 00:20:22 +0100
+
+mate-file-manager (1.5.1-1) unstable; urgency=low
+
+ * New upstream development release.
+
+ -- Stefano Karapetsas <stefano at karapetsas.com> Sun, 25 Nov 2012 00:37:35 +0100
+
+mate-file-manager (1.5.0-1) unstable; urgency=low
+
+ * New upstream development release.
+
+ -- Stefano Karapetsas <stefano at karapetsas.com> Wed, 10 Oct 2012 20:02:32 +0200
+
+mate-file-manager (1.4.0-1) unstable; urgency=low
+
+ * New upstream release.
+
+ -- Steve Zesch <stevezesch2 at gmail.com> Fri, 13 Jul 2012 19:10:40 -0400
+
+mate-file-manager (1.3.0-1) unstable; urgency=low
+
+ * New upstream development release.
+ * Add meld and engrampa to suggested packages.
+
+ -- Stefano Karapetsas <stefano at karapetsas.com> Sat, 16 Jun 2012 00:14:29 +0200
+
+mate-file-manager (1.2.1-1) unstable; urgency=low
+
+ * New upstream release.
+ * Removed acconfig.h and replaced it with AH_TEMPLATE and AC_DEFINE.
+
+ -- Steve Zesch <stevezesch2 at gmail.com> Tue, 03 Apr 2012 21:15:15 -0400
+
+mate-file-manager (1.2.0-2) unstable; urgency=low
+
+ * Rebuild for precise.
+
+ -- Stefano Karapetsas <stefano at karapetsas.com> Thu, 29 Mar 2012 10:52:34 +0200
+
+mate-file-manager (1.2.0-1) unstable; urgency=low
+
+ * New upstream release.
+ * Removed mate-file-manager binary (empty) package. Use caja.
+
+ -- Stefano Karapetsas <stefano at karapetsas.com> Thu, 23 Feb 2012 01:32:23 +0100
+
+mate-file-manager (1.1.2-1) unstable; urgency=low
+
+ * New upstream bugfix release.
+
+ -- Stefano Karapetsas <stefano at karapetsas.com> Thu, 05 Jan 2012 13:57:58 +0100
+
+mate-file-manager (1.1.1-1) unstable; urgency=low
+
+ * New upstream release.
+
+ -- Stefano Karapetsas <stefano at karapetsas.com> Mon, 26 Dec 2011 20:31:22 +0100
+
+mate-file-manager (1.1.0-2) unstable; urgency=low
+
+ * Removed .la file.
+
+ -- Stefano Karapetsas <stefano at karapetsas.com> Sat, 10 Dec 2011 00:50:08 +0100
+
+mate-file-manager (1.1.0-1) unstable; urgency=low
+
+ * New upstream release.
+ * Add gir package.
+
+ -- Stefano Karapetsas <stefano at karapetsas.com> Thu, 08 Dec 2011 21:53:14 +0100
+
+mate-file-manager (2011.12.01-1) unstable; urgency=low
+
+ * New upstream release.
+ * Add caja-dbg and caja-common packages.
+ * Switch to autogen.sh.
+ * Add debian/watch file and get-orig-source in debian/rules.
+
+ -- Stefano Karapetsas <stefano at karapetsas.com> Wed, 07 Dec 2011 22:58:52 +0100
+
+mate-file-manager (1.0.3-1) unstable; urgency=low
+
+ * New upstream release.
+
+ -- Stefano Karapetsas <stefano at karapetsas.com> Thu, 10 Nov 2011 23:23:14 +0100
+
+mate-file-manager (1.0.0-2) unstable; urgency=low
+
+ * File manager moved to caja package.
+ * Library files moved to libcaja-extension package.
+ * Include files moved to libcaja-extension-deve package.
+ * Added appropriate depends to gir1.2-caja package.
+
+ -- Stefano Karapetsas <stefano at karapetsas.com> Fri, 04 Nov 2011 20:29:14 +0100
+
+mate-file-manager (1.0.0-1) unstable; urgency=low
+
+ * New upstream release
+
+ -- Clement Lefebvre <root at linuxmint.com> Thu, 03 Nov 2011 18:14:55 +0000
+
+mate-file-manager (2011.11.03) unstable; urgency=low
+
+ * 2011.11.03
+
+ -- Clement Lefebvre <root at linuxmint.com> Thu, 03 Nov 2011 12:11:36 +0000
+
+mate-file-manager (2011.10.30-1) unstable; urgency=low
+
+ * New upstream release.
+
+ -- Stefano Karapetsas <stefano at karapetsas.com> Sun, 30 Oct 2011 15:16:27 +0100
+
+mate-file-manager (2011.10.18-2) unstable; urgency=low
+
+ * Fixed debian folder.
+
+ -- Stefano Karapetsas <stefano at karapetsas.com> Sat, 29 Oct 2011 00:45:25 +0200
+
+mate-file-manager (2011.10.18-1) unstable; urgency=low
+
+ * New upstream release.
+
+ -- Stefano Karapetsas <stefano at karapetsas.com> Fri, 21 Oct 2011 02:26:02 +0200
+
diff --git a/debian/compat b/debian/compat
new file mode 100644
index 0000000..45a4fb7
--- /dev/null
+++ b/debian/compat
@@ -0,0 +1 @@
+8
diff --git a/debian/control b/debian/control
new file mode 100644
index 0000000..2c92da6
--- /dev/null
+++ b/debian/control
@@ -0,0 +1,121 @@
+Source: mate-file-manager
+Section: utils
+Priority: optional
+Maintainer: Stefano Karapetsas <stefano at karapetsas.com>
+Uploaders: Steve Zesch <stevezesch2 at gmail.com>
+Build-Depends: debhelper (>= 8),
+ cdbs,
+ quilt,
+ libglib2.0-dev,
+ libmatedesktop-dev,
+ libpango1.0-dev,
+ libgtk2.0-dev,
+ libxml2-dev,
+ libexif-dev,
+ libexempi-dev,
+ libgail-dev,
+ libunique-dev,
+ libdbus-glib-1-dev,
+ intltool,
+ gtk-doc-tools,
+ libxt-dev,
+ libx11-dev,
+ libselinux1-dev,
+ libxrender-dev,
+ libxext-dev,
+ x11proto-core-dev,
+ shared-mime-info,
+ libstartup-notification0-dev,
+ mate-common,
+ gobject-introspection,
+ gir1.2-atk-1.0,
+ gir1.2-freedesktop,
+ gir1.2-gdkpixbuf-2.0,
+ gir1.2-glib-2.0,
+ gir1.2-gtk-2.0,
+ gir1.2-pango-1.0,
+ libgirepository1.0-dev
+Standards-Version: 3.9.3
+Homepage: http://www.mate-desktop.org/
+
+Package: caja
+Architecture: any
+Depends: ${shlibs:Depends},
+ ${misc:Depends},
+ shared-mime-info,
+ desktop-file-utils,
+ libglib2.0-data,
+ mate-desktop,
+ gvfs,
+ libcaja-extension (= ${binary:Version}),
+ caja-common (= ${source:Version})
+Suggests: gstreamer0.10-tools,
+ meld,
+ engrampa
+Description: file manager for the MATE desktop
+ Caja is the official file manager for the MATE desktop. It allows
+ to browse directories, preview files and launch applications associated
+ with them. It is also responsible for handling the icons on the MATE
+ desktop. It works on local and remote filesystems.
+
+Package: caja-common
+Architecture: all
+Depends: ${misc:Depends}
+Breaks: caja (<= 1.0.3-1)
+Replaces: caja (<= 1.0.3-1)
+Description: file manager for the MATE desktop (common files)
+ Caja is the official file manager for the MATE desktop. It allows
+ to browse directories, preview files and launch applications associated
+ with them. It is also responsible for handling the icons on the MATE
+ desktop. It works on local and remote filesystems.
+ .
+ This package contains the architecture independent files.
+
+Package: caja-dbg
+Section: debug
+Priority: extra
+Architecture: any
+Depends: ${misc:Depends},
+ caja (= ${binary:Version}),
+ libcaja-extension (= ${binary:Version})
+Description: file manager for the MATE desktop (debugging symbols)
+ This package contains debugging symbols for caja and the
+ libcaja-extension library. It is provided to help debugging problems.
+ The debugging symbols are installed in /usr/lib/debug and will
+ automatically be used by gdb.
+
+Package: libcaja-extension
+Section: libs
+Architecture: any
+Depends: ${shlibs:Depends},
+ ${misc:Depends}
+Description: libraries for caja components
+ Caja is the official file manager for the MATE desktop.
+ .
+ This package contains a few runtime libraries needed by caja's
+ extensions.
+
+Package: libcaja-extension-dev
+Section: libdevel
+Architecture: any
+Depends: ${shlibs:Depends},
+ ${misc:Depends},
+ libcaja-extension (= ${binary:Version}),
+ libgtk2.0-dev
+Description: libraries for caja components (development files)
+ Caja is the official file manager for the MATE desktop.
+ .
+ This package contains the development files for the libraries needed
+ by caja's extensions.
+
+Package: gir1.2-caja
+Architecture: any
+Depends: ${gir:Depends},
+ ${misc:Depends},
+ ${shlibs:Depends}
+Description: GObject introspection data for the caja library
+ Caja is the official file manager and graphical shell for the
+ MATE desktop.
+ .
+ It can be used by packages using the GIRepository format to generate
+ dynamic bindings.
diff --git a/debian/copyright b/debian/copyright
new file mode 100644
index 0000000..5874a52
--- /dev/null
+++ b/debian/copyright
@@ -0,0 +1,43 @@
+This work was packaged for Debian by:
+
+ Stefano Karapetsas <stefano at karapetsas.com> on Fri, 21 Oct 2011 02:26:02 +0200
+
+It was downloaded from:
+
+ <https://github.com/Perberos/Mate-Desktop-Environment>
+
+Upstream Author:
+
+ Perberos <perberos at gmail.com>
+
+Copyright:
+
+ Copyright (C) 2011 Perberos
+
+License:
+
+ This package is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ This package is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>
+
+On Debian systems, the complete text of the GNU General
+Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".
+
+The Debian packaging is:
+
+ Copyright (C) 2011 Stefano Karapetsas <stefano at karapetsas.com>
+
+you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
+
diff --git a/debian/gir1.2-caja.install b/debian/gir1.2-caja.install
new file mode 100644
index 0000000..059814f
--- /dev/null
+++ b/debian/gir1.2-caja.install
@@ -0,0 +1,2 @@
+usr/lib/girepository-1.0
+usr/share/gir-1.0
diff --git a/debian/libcaja-extension-dev.install b/debian/libcaja-extension-dev.install
new file mode 100644
index 0000000..6d1c52f
--- /dev/null
+++ b/debian/libcaja-extension-dev.install
@@ -0,0 +1,4 @@
+usr/include/
+usr/lib/*.so
+usr/lib/pkgconfig/
+usr/share/gtk-doc/
diff --git a/debian/libcaja-extension.install b/debian/libcaja-extension.install
new file mode 100644
index 0000000..149d1d0
--- /dev/null
+++ b/debian/libcaja-extension.install
@@ -0,0 +1,2 @@
+usr/lib/*.so.*
+usr/lib/caja/
\ No newline at end of file
diff --git a/debian/patches/00-fix-radio-buttons.patch b/debian/patches/00-fix-radio-buttons.patch
new file mode 100644
index 0000000..63643c0
--- /dev/null
+++ b/debian/patches/00-fix-radio-buttons.patch
@@ -0,0 +1,120 @@
+From 0491e02f9023ec71a12c3b873b7f60e40b01c8fc Mon Sep 17 00:00:00 2001
+From: Stefano Karapetsas <stefano at karapetsas.com>
+Date: Fri, 12 Apr 2013 15:30:09 +0000
+Subject: Fix radio buttons and GSettings in preferences window
+
+Closes: https://github.com/mate-desktop/mate-file-manager/issues/104
+Patch from: https://git.gnome.org/browse/nautilus/commit/?id=f200bfb
+---
+diff --git a/src/caja-file-management-properties.c b/src/caja-file-management-properties.c
+index 3db0d05..1de7952 100644
+--- a/src/caja-file-management-properties.c
++++ b/src/caja-file-management-properties.c
+@@ -839,49 +839,37 @@ bind_builder_uint_enum (GtkBuilder *builder,
+ binding, g_free);
+ }
+
+-typedef struct {
+- GtkWidget *button;
+- const char *value;
+- const char *key;
+- GSettings *settings;
+-} RadioBinding;
+-
+-static void
+-radio_binding_setting_changed (GSettings *settings,
+- const gchar *key,
+- gpointer user_data)
++static GVariant *
++radio_mapping_set (const GValue *gvalue,
++ const GVariantType *expected_type,
++ gpointer user_data)
+ {
+- RadioBinding *binding = user_data;
+- char *value;
++ const gchar *widget_value = user_data;
++ GVariant *retval = NULL;
+
+- value = g_settings_get_string (settings, key);
+-
+- if (strcmp (value, binding->value) == 0) {
+- /* This will unset the currently active, no need
+- to do that manually */
+- gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (binding->button), TRUE);
++ if (g_value_get_boolean (gvalue)) {
++ retval = g_variant_new_string (widget_value);
+ }
+- g_free (value);
++ return retval;
+ }
+
+-static void
+-radio_binding_button_toggled (GtkToggleButton *toggle_button,
+- RadioBinding *binding)
++static gboolean
++radio_mapping_get (GValue *gvalue,
++ GVariant *variant,
++ gpointer user_data)
+ {
+- if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (binding->button))) {
+- g_settings_set_string (binding->settings, binding->key, binding->value);
++ const gchar *widget_value = user_data;
++ const gchar *value;
++ value = g_variant_get_string (variant, NULL);
++
++ if (g_strcmp0 (value, widget_value) == 0) {
++ g_value_set_boolean (gvalue, TRUE);
++ } else {
++ g_value_set_boolean (gvalue, FALSE);
+ }
+-}
+
+-static void
+-free_radio_binding (gpointer data,
+- GClosure *closure)
+-{
+- RadioBinding *binding = data;
+-
+- g_object_unref (binding->settings);
+- g_free (binding);
+-}
++ return TRUE;
++ }
+
+ static void
+ bind_builder_radio (GtkBuilder *builder,
+@@ -892,27 +880,15 @@ bind_builder_radio (GtkBuilder *builder,
+ {
+ GtkWidget *button;
+ int i;
+- char *detailed_signal;
+- RadioBinding *binding;
+-
+- detailed_signal = g_strdup_printf ("changed::%s", prefs);
+
+ for (i = 0; widget_names[i] != NULL; i++) {
+ button = GTK_WIDGET (gtk_builder_get_object (builder, widget_names[i]));
+
+- binding = g_new (RadioBinding, 1);
+- binding->button = button;
+- binding->value = values[i];
+- binding->key = prefs;
+- binding->settings = g_object_ref (settings);
+-
+- g_signal_connect (settings, detailed_signal,
+- G_CALLBACK(radio_binding_setting_changed),
+- binding);
+-
+- g_signal_connect_data (G_OBJECT (button), "toggled",
+- G_CALLBACK (radio_binding_button_toggled),
+- binding, free_radio_binding, 0);
++ g_settings_bind_with_mapping (settings, prefs,
++ button, "active",
++ G_SETTINGS_BIND_DEFAULT,
++ radio_mapping_get, radio_mapping_set,
++ (gpointer) values[i], NULL);
+ }
+ }
+
+--
+cgit
diff --git a/debian/patches/01-fix-default-sort-order.patch b/debian/patches/01-fix-default-sort-order.patch
new file mode 100644
index 0000000..3fa032e
--- /dev/null
+++ b/debian/patches/01-fix-default-sort-order.patch
@@ -0,0 +1,21 @@
+From 4dc7209110b89326be44b8399ddbb5b4131d12a5 Mon Sep 17 00:00:00 2001
+From: Stefano Karapetsas <stefano at karapetsas.com>
+Date: Fri, 12 Apr 2013 21:14:14 +0000
+Subject: Fix default sort order in preferences window
+
+Closes #106 (https://github.com/mate-desktop/mate-file-manager/issues/106)
+---
+diff --git a/src/caja-file-management-properties.c b/src/caja-file-management-properties.c
+index 1de7952..066befa 100644
+--- a/src/caja-file-management-properties.c
++++ b/src/caja-file-management-properties.c
+@@ -94,7 +94,6 @@ static const char * const zoom_values[] =
+
+ static const char * const sort_order_values[] =
+ {
+- "manually",
+ "name",
+ "directory",
+ "size",
+--
+cgit
diff --git a/debian/patches/02-fix-spatial-mode.patch b/debian/patches/02-fix-spatial-mode.patch
new file mode 100644
index 0000000..c64359f
--- /dev/null
+++ b/debian/patches/02-fix-spatial-mode.patch
@@ -0,0 +1,21 @@
+From 2bc333f790580a6279b1817270d1fc634da7decf Mon Sep 17 00:00:00 2001
+From: Dan Bravender <dan.bravender at gmail.com>
+Date: Sun, 14 Apr 2013 16:37:11 +0000
+Subject: Fixes #94 - default for target_navigation needs to be FALSE for spatial mode to work
+
+---
+diff --git a/src/caja-window-manage-views.c b/src/caja-window-manage-views.c
+index 02b7fac..c2c5b5f 100644
+--- a/src/caja-window-manage-views.c
++++ b/src/caja-window-manage-views.c
+@@ -527,7 +527,7 @@ caja_window_slot_open_location_full (CajaWindowSlot *slot,
+ char *old_uri, *new_uri;
+ int new_slot_position;
+ GList *l;
+- gboolean target_navigation, target_same;
++ gboolean target_navigation = FALSE, target_same = FALSE;
+ gboolean is_desktop;
+
+ window = slot->pane->window;
+--
+cgit
diff --git a/debian/patches/03-fix-for-x-caja-desktop-windows.patch b/debian/patches/03-fix-for-x-caja-desktop-windows.patch
new file mode 100644
index 0000000..9ca611e
--- /dev/null
+++ b/debian/patches/03-fix-for-x-caja-desktop-windows.patch
@@ -0,0 +1,22 @@
+From d116bf8ba8be698869fef81b30d576bcacf3234c Mon Sep 17 00:00:00 2001
+From: Stefano Karapetsas <stefano at karapetsas.com>
+Date: Mon, 29 Apr 2013 10:41:32 +0000
+Subject: Fix for x-caja-desktop windows at login
+
+Use --no-default-window in Exec field
+---
+diff --git a/data/caja.desktop.in.in b/data/caja.desktop.in.in
+index 8e19a81..c975198 100644
+--- a/data/caja.desktop.in.in
++++ b/data/caja.desktop.in.in
+@@ -1,7 +1,7 @@
+ [Desktop Entry]
+ _Name=Caja
+ _GenericName=File Manager
+-Exec=caja
++Exec=caja -n
+ Icon=system-file-manager
+ Terminal=false
+ Type=Application
+--
+cgit
diff --git a/debian/patches/04-fix-binary-check.patch b/debian/patches/04-fix-binary-check.patch
new file mode 100644
index 0000000..04782bf
--- /dev/null
+++ b/debian/patches/04-fix-binary-check.patch
@@ -0,0 +1,23 @@
+From 2ba883533e92099322f595085d7ce4941226913f Mon Sep 17 00:00:00 2001
+From: Scott Balneaves <sbalneav at mate-desktop.org>
+Date: Wed, 17 Apr 2013 14:54:23 +0000
+Subject: Possible fix for Issue #111
+
+---
+diff --git a/libcaja-private/caja-file.c b/libcaja-private/caja-file.c
+index 1958faf..6c252e3 100644
+--- a/libcaja-private/caja-file.c
++++ b/libcaja-private/caja-file.c
+@@ -7158,6 +7158,10 @@ caja_file_is_binary (CajaFile *file)
+ */
+
+ fp = g_fopen (g_file_get_path (caja_file_get_location (file)), "r");
++ if (fp == NULL)
++ {
++ return FALSE;
++ }
+ for (i = 0; i < 4096; i++) {
+ c = fgetc(fp);
+ if (c == EOF) {
+--
+cgit
diff --git a/debian/patches/05-fix-binary-check-2.patch b/debian/patches/05-fix-binary-check-2.patch
new file mode 100644
index 0000000..1d17f68
--- /dev/null
+++ b/debian/patches/05-fix-binary-check-2.patch
@@ -0,0 +1,43 @@
+From d92c2754681b24ed5afcbb0d9458297e6101254e Mon Sep 17 00:00:00 2001
+From: Scott Balneaves <sbalneav at mate-desktop.org>
+Date: Wed, 08 May 2013 01:24:00 +0000
+Subject: Fix for #111
+
+---
+diff --git a/libcaja-private/caja-file.c b/libcaja-private/caja-file.c
+index 6c252e3..84d799f 100644
+--- a/libcaja-private/caja-file.c
++++ b/libcaja-private/caja-file.c
+@@ -7149,7 +7149,7 @@ caja_file_is_binary (CajaFile *file)
+
+ gboolean is_binary = FALSE;
+ int c;
+- int i;
++ int i = 0;
+ FILE *fp;
+
+ /* Check the first 4096 bytes of the files. If these contains a 0,
+@@ -7162,15 +7162,17 @@ caja_file_is_binary (CajaFile *file)
+ {
+ return FALSE;
+ }
+- for (i = 0; i < 4096; i++) {
+- c = fgetc(fp);
+- if (c == EOF) {
++
++ while (!feof (fp)) {
++ if (i > 4096) {
+ break;
+ }
+- else if (c == 0) {
++ c = fgetc(fp);
++ if (c == 0) {
+ is_binary = TRUE;
+ break;
+ }
++ i++;
+ }
+ fclose(fp);
+
+--
+cgit
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..d64a451
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,6 @@
+00-fix-radio-buttons.patch
+01-fix-default-sort-order.patch
+02-fix-spatial-mode.patch
+03-fix-for-x-caja-desktop-windows.patch
+04-fix-binary-check.patch
+05-fix-binary-check-2.patch
diff --git a/debian/rules b/debian/rules
new file mode 100755
index 0000000..3e922c6
--- /dev/null
+++ b/debian/rules
@@ -0,0 +1,22 @@
+#!/usr/bin/make -f
+
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/rules/utils.mk
+include /usr/share/cdbs/1/class/autotools.mk
+
+DEB_DH_INSTALL_ARGS += --list-missing
+
+DEB_CONFIGURE_SCRIPT := ./autogen.sh
+
+DEB_CONFIGURE_EXTRA_FLAGS += --libexecdir=/usr/lib/caja \
+ --disable-update-mimedb \
+ --disable-static \
+ --localstatedir=/var \
+ --enable-unique \
+ --enable-introspection
+
+binary-post-install/caja::
+ dh_installmime -p$(cdbs_curpkg)
+
+get-orig-source:
+ uscan --noconf --force-download --rename --download-current-version --destdir=..
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 0000000..163aaf8
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)
diff --git a/debian/watch b/debian/watch
new file mode 100644
index 0000000..040422c
--- /dev/null
+++ b/debian/watch
@@ -0,0 +1,3 @@
+version=3
+opts=filenamemangle=s/.*\/mate-file-manager-?([\d\.-]+)\.tar\.gz/mate-file-manager-$1.tar.gz/ \
+https://github.com/mate-desktop/mate-file-manager/tags .*/archive/mate-file-manager-?([\d\.]+).tar.gz
--
mate-file-manager Debian package
More information about the pkg-mate-commits
mailing list