[gummi] 02/03: added upgrade_datadir.patch

daniel at danielstender.com daniel at danielstender.com
Mon Dec 28 18:04:52 UTC 2015


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

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

commit 2a92cbcf55d03abe1afba823683bd2f48f0859e8
Author: Daniel Stender <debian at danielstender.com>
Date:   Mon Dec 28 18:45:37 2015 +0100

    added upgrade_datadir.patch
---
 debian/changelog                     |  3 ++-
 debian/patches/series                |  1 +
 debian/patches/upgrade_datadir.patch | 18 ++++++++++++++++++
 3 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 53c3f3c..5690fd5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,9 @@
 gummi (0.6.5-7) UNRELEASED; urgency=medium
 
   * Added add-missing-chooser-title.patch (Closes: #785605).
+  * Added upgrade_datadir.patch (Closes: #808791).
 
- -- Daniel Stender <debian at danielstender.com>  Mon, 28 Dec 2015 17:47:32 +0100
+ -- Daniel Stender <debian at danielstender.com>  Mon, 28 Dec 2015 18:44:59 +0100
 
 gummi (0.6.5-6) unstable; urgency=medium
 
diff --git a/debian/patches/series b/debian/patches/series
index 75f1e74..3cab938 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
+upgrade_datadir.patch
 add-missing-chooser-title.patch
 gummi.desktop.patch
 automake-subdirs.patch
diff --git a/debian/patches/upgrade_datadir.patch b/debian/patches/upgrade_datadir.patch
new file mode 100644
index 0000000..0ba939d
--- /dev/null
+++ b/debian/patches/upgrade_datadir.patch
@@ -0,0 +1,18 @@
+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



More information about the debian-science-commits mailing list