[SCM] eom Debian package branch, master, updated. 3fcea7dcf39329a0462c6ef4e2bb40fbb894f856

[Mike Gabriel]

Gitweb-URL: http://git.debian.org/?p=pkg-mate/eom.git;a=commitdiff;h=3fcea7d

The following commit has been merged in the master branch:
commit 3fcea7dcf39329a0462c6ef4e2bb40fbb894f856
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Wed Feb 12 15:57:08 2014 +0100

    debian/patches: add keywords to .desktop file, fix icon folder name from /usr/share/mate-image-viewer/icons to /usr/share/eom/icons, drop obsolete patch
---
 debian/patches/00-fix-mateConf-convert-file.patch  | 22 ----------------------
 .../1001_change-application-name-to-eom.patch      | 21 +++++++++++++++++++++
 .../1002_add-keywords-to-eom-desktop-file.patch    | 12 ++++++++++++
 debian/patches/README                              |  3 +++
 debian/patches/series                              |  3 ++-
 5 files changed, 38 insertions(+), 23 deletions(-)

diff --git a/debian/patches/00-fix-mateConf-convert-file.patch b/debian/patches/00-fix-mateConf-convert-file.patch
deleted file mode 100644
index 1035fe5..0000000
--- a/debian/patches/00-fix-mateConf-convert-file.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From d4405221511fd45d8ba87fc75971db390391fbda Mon Sep 17 00:00:00 2001
-From: Stefano Karapetsas <stefano at karapetsas.com>
-Date: Sun, 7 Apr 2013 11:43:32 +0200
-Subject: [PATCH] Fix MateConf convert file
-
----
- data/eom.convert |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/data/eom.convert b/data/eom.convert
-index dcd2b02..214026e 100644
---- a/data/eom.convert
-+++ b/data/eom.convert
-@@ -1,4 +1,4 @@
--[org.mate.eom.fullscreen]
-+[org.mate.eom.full-screen]
- loop=/apps/eom/full_screen/loop
- seconds=/apps/eom/full_screen/seconds
- upscale=/apps/eom/full_screen/upscale
--- 
-1.7.10.4
-
diff --git a/debian/patches/1001_change-application-name-to-eom.patch b/debian/patches/1001_change-application-name-to-eom.patch
new file mode 100644
index 0000000..a2a2088
--- /dev/null
+++ b/debian/patches/1001_change-application-name-to-eom.patch
@@ -0,0 +1,21 @@
+Description: Fully rename mate-image-viewer to eom
+Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
+--- a/configure.ac
++++ b/configure.ac
+@@ -6,7 +6,7 @@
+ m4_define(eom_micro_version, 2)
+ m4_define(eom_version, eom_major_version.eom_minor_version.eom_micro_version)
+ 
+-AC_INIT([eom], eom_version, [http://www.mate-desktop.org], [mate-image-viewer])
++AC_INIT([eom], eom_version, [http://www.mate-desktop.org], [eom])
+ AM_INIT_AUTOMAKE([1.9 foreign no-dist-gzip dist-xz])
+ 
+ # Support silencing the build output if supported (automake-1.11+)
+--- a/man/eom.1
++++ b/man/eom.1
+@@ -25,4 +25,4 @@
+ Start a new instance instead of reusing an existing one.
+ .SH BUGS
+ If you find bugs in the 
Ieom
P program, please report
+-these on https://github.com/mate-desktop/mate-image-viewer/issues.
++these on https://github.com/mate-desktop/eom/issues.
diff --git a/debian/patches/1002_add-keywords-to-eom-desktop-file.patch b/debian/patches/1002_add-keywords-to-eom-desktop-file.patch
new file mode 100644
index 0000000..93beed1
--- /dev/null
+++ b/debian/patches/1002_add-keywords-to-eom-desktop-file.patch
@@ -0,0 +1,12 @@
+Description: Add keywords key to eom.desktop file
+Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
+--- a/data/eom.desktop.in.in
++++ b/data/eom.desktop.in.in
+@@ -8,6 +8,7 @@
+ Terminal=false
+ Type=Application
+ Categories=GTK;Graphics;RasterGraphics;Viewer;
++Keywords=image;viewer;JPEG;PNG;TIFF;SVG;MATE;photos;browse;thumbnails;rotate;
+ X-MATE-Bugzilla-Bugzilla=MATE
+ X-MATE-Bugzilla-Product=EOM
+ X-MATE-Bugzilla-Component=general
diff --git a/debian/patches/README b/debian/patches/README
new file mode 100644
index 0000000..80c1584
--- /dev/null
+++ b/debian/patches/README
@@ -0,0 +1,3 @@
+0xxx: Grabbed from upstream development.
+1xxx: Possibly relevant for upstream adoption.
+2xxx: Only relevant for official Debian release.
diff --git a/debian/patches/series b/debian/patches/series
index 05fffda..fb344dc 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
-00-fix-mateConf-convert-file.patch
+1001_change-application-name-to-eom.patch
+1002_add-keywords-to-eom-desktop-file.patch

-- 
eom Debian package