[SCM] eom Debian package branch, master, updated. 293b1fa969e224b5ae9490179ec850a58d216d0e

[Vangelis Mouhtsis]

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

The following commit has been merged in the master branch:
commit 2a035e3234e4b0c04a304defe81dd3bd3e01b7f7
Author: Vangelis Mouhtsis <vangelis at gnugr.org>
Date:   Mon Mar 31 15:03:49 2014 +0300

    debian/patches:  Drop patches 1001_change-application-name-to-eom.patch and 1002_add-keywords-to-eom-desktop-file.patch. Both applied upstream.
---
 .../1001_change-application-name-to-eom.patch      | 22 ----------------------
 .../1002_add-keywords-to-eom-desktop-file.patch    | 13 -------------
 debian/patches/series                              |  2 --
 3 files changed, 37 deletions(-)

diff --git a/debian/patches/1001_change-application-name-to-eom.patch b/debian/patches/1001_change-application-name-to-eom.patch
deleted file mode 100644
index 757bba9..0000000
--- a/debian/patches/1001_change-application-name-to-eom.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Description: Fully rename mate-image-viewer to eom
-Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
-Forwarded: https://github.com/mate-desktop/eom/issues/43
---- 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
deleted file mode 100644
index c4e23d2..0000000
--- a/debian/patches/1002_add-keywords-to-eom-desktop-file.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Description: Add keywords key to eom.desktop file
-Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
-Forwarded: https://github.com/mate-desktop/eom/issues/42
---- 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/series b/debian/patches/series
index 995133f..83b110e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1 @@
-1001_change-application-name-to-eom.patch
-1002_add-keywords-to-eom-desktop-file.patch
 2001_omit-gfdl-licensed-help-files.patch

-- 
eom Debian package