[gummi] 06/15: dropped upgrade_datadir.patch

[Daniel Stender]

This is an automated email from the git hooks/post-receive script.

danstender-guest pushed a commit to branch master
in repository gummi.

commit 7067a71feb08e6411b8c35bc5abbe99e4dc776a3
Author: Daniel Stender <debian at danielstender.com>
Date:   Wed Jan 27 20:55:32 2016 +0100

    dropped upgrade_datadir.patch
---
 debian/changelog                     |  3 ++-
 debian/patches/series                |  1 -
 debian/patches/upgrade_datadir.patch | 18 ------------------
 3 files changed, 2 insertions(+), 20 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index c220e3b..16fda60 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,8 +4,9 @@ gummi (0.6.6-1) UNRELEASED; urgency=medium
   * Dropped:
     + no-predictable-tmpfiles.patch (CVE-2015-7758 solved by upstream).
     + gummi.desktop.patch (applied upstream).
+    + upgrade_datadir.patch (applied upstream).
 
- -- Daniel Stender <debian at danielstender.com>  Wed, 27 Jan 2016 20:53:40 +0100
+ -- Daniel Stender <debian at danielstender.com>  Wed, 27 Jan 2016 20:55:00 +0100
 
 gummi (0.6.5-7) unstable; urgency=medium
 
diff --git a/debian/patches/series b/debian/patches/series
index 22b9e91..901cd31 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
-upgrade_datadir.patch
 add-missing-chooser-title.patch
 automake-subdirs.patch
 libgthread-2.0_link.patch
diff --git a/debian/patches/upgrade_datadir.patch b/debian/patches/upgrade_datadir.patch
deleted file mode 100644
index 0ba939d..0000000
--- a/debian/patches/upgrade_datadir.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Description: replace outdated uses of $(DATADIRNAME) with $(datadir)
-Author: Mathieu Trudel-Lapierre <mathieu-tl at ubuntu.com>
-Bug: https://bugs.debian.org/808791
-Reviewed-by: Daniel Stender <debian at danielstender.com>
-Last-Update: 2015-12-28
-
---- a/po/Makefile.in.in
-+++ b/po/Makefile.in.in
-@@ -33,8 +33,7 @@ exec_prefix = @exec_prefix@
- datadir = @datadir@
- datarootdir = @datarootdir@
- libdir = @libdir@
--DATADIRNAME = @DATADIRNAME@
--itlocaledir = $(prefix)/$(DATADIRNAME)/locale
-+itlocaledir = $(datadir)/locale
- subdir = po
- install_sh = @install_sh@
- # Automake >= 1.8 provides @mkdir_p at .

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/gummi.git