[SCM] atril Debian package branch, master, updated. debian/1.8.0+dfsg1-4-8-g00b426f

[Mike Gabriel]

Gitweb-URL: http://git.debian.org/?p=pkg-mate/atril.git;a=commitdiff;h=11df606

The following commit has been merged in the master branch:
commit 11df606b6b87ca65124c1ddfc49a2718b7994a4f
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Mon Sep 29 10:47:44 2014 +0200

    debian/patches: Drop -1001_add-keywords-key-to-desktop-files.patch. Applied upstream. Drop -1002_FTBFS-atril-with-clang.patch. Applied upstream.
---
 .../patches/1001_add-keywords-key-to-desktop-files.patch | 11 -----------
 debian/patches/1002_FTBFS-atril-with-clang.patch         | 16 ----------------
 debian/patches/series                                    |  2 --
 3 files changed, 29 deletions(-)

diff --git a/debian/patches/1001_add-keywords-key-to-desktop-files.patch b/debian/patches/1001_add-keywords-key-to-desktop-files.patch
deleted file mode 100644
index c825795..0000000
--- a/debian/patches/1001_add-keywords-key-to-desktop-files.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-Description: Add keywords key to .desktop files
-Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
-Forwarded: https://github.com/mate-desktop/atril/issues/78 
---- a/data/atril.desktop.in.in
-+++ b/data/atril.desktop.in.in
-@@ -14,4 +14,5 @@
- X-MATE-Bugzilla-Component=BugBuddyBugs
- X-MATE-Bugzilla-Version=@VERSION@
- Categories=GTK;Office;Viewer;
-+Keywords=MATE;document;viewer;pdf;dvi;ps;xps;tiff;pixbuf;djvu;comics;
- MimeType=@ATRIL_MIME_TYPES@
diff --git a/debian/patches/1002_FTBFS-atril-with-clang.patch b/debian/patches/1002_FTBFS-atril-with-clang.patch
deleted file mode 100644
index 51ad018..0000000
--- a/debian/patches/1002_FTBFS-atril-with-clang.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Description: Fix FTBFS of atril when build with the clang compiler
-Author: Alexander <sanek23994 at gmail.com>
-Forwarded: https://github.com/mate-desktop/atril/issues/82
-Origin: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=753344
-
---- a/libview/ev-view.c	2014-03-01 15:53:25.000000000 +0400
-+++ b/libview/ev-view.c	2014-06-30 22:25:35.306279684 +0400
-@@ -840,7 +840,7 @@
- }
- 
- #if !GTK_CHECK_VERSION (3, 0, 0)
--ev_view_set_scroll_adjustments (GtkLayout      *layout,
-+void ev_view_set_scroll_adjustments (GtkLayout      *layout,
- 				GtkAdjustment  *hadjustment,
- 				GtkAdjustment  *vadjustment)
- {
diff --git a/debian/patches/series b/debian/patches/series
index eccd113..83b110e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1 @@
-1001_add-keywords-key-to-desktop-files.patch
-1002_FTBFS-atril-with-clang.patch
 2001_omit-gfdl-licensed-help-files.patch

-- 
atril Debian package