[SCM] pluma Debian package branch, master, updated. e15637c24798db059d385c3968f891007c881e4b

Thu Apr 17 12:13:14 UTC 2014

Gitweb-URL: http://git.debian.org/?p=pkg-mate/pluma.git;a=commitdiff;h=96210e1

The following commit has been merged in the master branch:
commit 96210e1bcc50cde26ede837d592404fe2f02a676
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Thu Apr 17 13:45:01 2014 +0200

    debian/patches: Drop 0001_fix-ftbfs-due-to-gettext.patch. Was cherry-picked from upstream and is included in this release. Drop 1001_add-keywords-to-desktop-file.patch. Applied upstream. Drop 1002_typo-fix-whether.patch. Applied upstream. Drop 1003_dont-install-usr-bin-mate-text-editor.patch. Applied upstream. Update 2002_omit-gfdl-licensed-help-files.patch. Update 2003_omit-non-linux-build-files.patch
---
 debian/patches/0001_fix-ftbfs-due-to-gettext.patch | 13 ------
 .../1001_add-keywords-to-desktop-file.patch        | 13 ------
 debian/patches/1002_typo-fix-whether.patch         | 47 ----------------------
 ...003_dont-install-usr-bin-mate-text-editor.patch | 15 -------
 debian/patches/2001_fully-rename-application.patch | 18 ---------
 .../2002_omit-gfdl-licensed-help-files.patch       |  2 +-
 .../patches/2003_omit-non-linux-build-files.patch  |  6 +--
 debian/patches/series                              |  5 ---
 8 files changed, 4 insertions(+), 115 deletions(-)

diff --git a/debian/patches/0001_fix-ftbfs-due-to-gettext.patch b/debian/patches/0001_fix-ftbfs-due-to-gettext.patch
deleted file mode 100644
index e8b5088..0000000
--- a/debian/patches/0001_fix-ftbfs-due-to-gettext.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Description: Fix FTBFS due to a non-copied po/Makefile.in.in
-Author: Stefano Karapetsas <stefano at karapetsas.com>
-Origin: http://git.mate-desktop.org/pluma/commit/?id=f9933b9afdf50f311b48749fd4b6f88323f2266
---- a/configure.ac
-+++ b/configure.ac
-@@ -157,7 +157,6 @@
- IT_PROG_INTLTOOL([0.40.0])
- GETTEXT_PACKAGE=pluma
- AC_SUBST([GETTEXT_PACKAGE])
--AM_GNU_GETTEXT_VERSION([0.17])
- AM_GLIB_GNU_GETTEXT
- AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", [Define to the Gettext package name])
- 
diff --git a/debian/patches/1001_add-keywords-to-desktop-file.patch b/debian/patches/1001_add-keywords-to-desktop-file.patch
deleted file mode 100644
index 831f1ba..0000000
--- a/debian/patches/1001_add-keywords-to-desktop-file.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Description: Add keywords to .desktop file
-Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
-Forwarded: https://github.com/mate-desktop/pluma/issues/62
---- a/data/pluma.desktop.in.in
-+++ b/data/pluma.desktop.in.in
-@@ -9,6 +9,7 @@
- MimeType=text/plain;
- Icon=accessories-text-editor
- Categories=GTK;Utility;TextEditor;
-+Keywords=text;editor;MATE;tabs;highlighting;code;multiple;files;pluggable;
- X-MATE-DocPath=pluma/pluma.xml
- _X-MATE-FullName=pluma Text Editor
- X-MATE-Bugzilla-Bugzilla=MATE
diff --git a/debian/patches/1002_typo-fix-whether.patch b/debian/patches/1002_typo-fix-whether.patch
deleted file mode 100644
index 55edb9f..0000000
--- a/debian/patches/1002_typo-fix-whether.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-Description: Fix a typo of the word "whether" at several locations
-Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
-Forwarded: https://github.com/mate-desktop/pluma/issues/63
---- a/docs/reference/html/pluma-pluma-document.html
-+++ b/docs/reference/html/pluma-pluma-document.html
-@@ -526,7 +526,7 @@
- <div class="refsect2">
- <a name="PlumaDocument--can-search-again"></a><h3>The <code class="literal">"can-search-again"</code> property</h3>
- <pre class="programlisting">  "can-search-again"         <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="type">gboolean</span></a>              : Read</pre>
--<p>Wheter it's possible to search again in the document.</p>
-+<p>Whether it's possible to search again in the document.</p>
- <p>Default value: FALSE</p>
- </div>
- <hr>
---- a/docs/reference/html/pluma-pluma-panel.html
-+++ b/docs/reference/html/pluma-pluma-panel.html
-@@ -287,7 +287,7 @@
- <pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            pluma_panel_item_is_active          (<em class="parameter"><code><a class="link" href="pluma-pluma-panel.html#PlumaPanel"><span class="type">PlumaPanel</span></a> *panel</code></em>,
-                                                          <em class="parameter"><code><a href="http://library.gnome.org/devel/gtk3/GtkWidget.html"><span class="type">GtkWidget</span></a> *item</code></em>);</pre>
- <p>
--Wheter <em class="parameter"><code>item</code></em> is the one current active in <em class="parameter"><code>panel</code></em>
-+Whether <em class="parameter"><code>item</code></em> is the one current active in <em class="parameter"><code>panel</code></em>
- </p>
- <div class="variablelist"><table border="0" class="variablelist">
- <colgroup>
---- a/pluma/pluma-document.c
-+++ b/pluma/pluma-document.c
-@@ -491,7 +491,7 @@
- 	g_object_class_install_property (object_class, PROP_CAN_SEARCH_AGAIN,
- 					 g_param_spec_boolean ("can-search-again",
- 							       "Can search again",
--							       "Wheter it's possible to search again in the document",
-+							       "Whether it's possible to search again in the document",
- 							       FALSE,
- 							       G_PARAM_READABLE |
- 							       G_PARAM_STATIC_STRINGS));
---- a/pluma/pluma-panel.c
-+++ b/pluma/pluma-panel.c
-@@ -823,7 +823,7 @@
-  * @panel: a #PlumaPanel
-  * @item: a widget contained in #PlumaPanel
-  *
-- * Wheter @item is the one current active in @panel
-+ * Whether @item is the one current active in @panel
-  *
-  * Returns: TRUE if the widget is active
-  */
diff --git a/debian/patches/1003_dont-install-usr-bin-mate-text-editor.patch b/debian/patches/1003_dont-install-usr-bin-mate-text-editor.patch
deleted file mode 100644
index 0739074..0000000
--- a/debian/patches/1003_dont-install-usr-bin-mate-text-editor.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Description: Do not create symlink mate-text-editor
-Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
-Forwarded: https://github.com/mate-desktop/pluma/issues/64
---- a/pluma/Makefile.am
-+++ b/pluma/Makefile.am
-@@ -226,9 +226,6 @@
- if PLATFORM_WIN32
- 	$(mkinstalldirs) "$(DESTDIR)$(libdir)"
- 	$(INSTALL_DATA) libpluma.a "$(DESTDIR)$(libdir)"
--else
--	rm -f $(DESTDIR)$(bindir)/mate-text-editor
--	ln -s pluma $(DESTDIR)$(bindir)/mate-text-editor
- endif
- 
- if !OS_WIN32
diff --git a/debian/patches/2001_fully-rename-application.patch b/debian/patches/2001_fully-rename-application.patch
deleted file mode 100644
index 7fe8f32..0000000
--- a/debian/patches/2001_fully-rename-application.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Description: Fully rename mate-text-editor to pluma
-Author: Mike Gabriel <mike.gabriel>
-Comment:
- This patch is only needed for the 1.6.x series of Pluma
- and it is only needed for Debian.
---- a/configure.ac
-+++ b/configure.ac
-@@ -8,8 +8,8 @@
- m4_define(pluma_version, pluma_major_version.pluma_minor_version.pluma_micro_version)
- 
- AC_INIT([pluma], [pluma_version],
--    [https://github.com/mate-desktop/mate-text-editor/issues],
--    [mate-text-editor], [http://mate-desktop.org])
-+    [https://github.com/mate-desktop/pluma/issues],
-+    [pluma], [http://mate-desktop.org])
- 
- AC_CONFIG_HEADERS(config.h)
- AC_CONFIG_SRCDIR(pluma/pluma.c)
diff --git a/debian/patches/2002_omit-gfdl-licensed-help-files.patch b/debian/patches/2002_omit-gfdl-licensed-help-files.patch
index 8512887..e0f8c62 100644
--- a/debian/patches/2002_omit-gfdl-licensed-help-files.patch
+++ b/debian/patches/2002_omit-gfdl-licensed-help-files.patch
@@ -15,7 +15,7 @@ Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
  EXTRA_DIST = 			\
 --- a/configure.ac
 +++ b/configure.ac
-@@ -523,7 +523,6 @@
+@@ -541,7 +541,6 @@
  pluma/smclient/Makefile
  pluma/osx/Makefile
  pluma/Makefile
diff --git a/debian/patches/2003_omit-non-linux-build-files.patch b/debian/patches/2003_omit-non-linux-build-files.patch
index 5f33047..de4574e 100644
--- a/debian/patches/2003_omit-non-linux-build-files.patch
+++ b/debian/patches/2003_omit-non-linux-build-files.patch
@@ -2,7 +2,7 @@ Description: Skip non-Linux build stuff on the repacked source tarball
 Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
 --- a/configure.ac
 +++ b/configure.ac
-@@ -521,7 +521,6 @@
+@@ -539,7 +539,6 @@
  docs/reference/Makefile
  pluma/dialogs/Makefile
  pluma/smclient/Makefile
@@ -10,7 +10,7 @@ Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
  pluma/Makefile
  pixmaps/Makefile
  plugin-loaders/Makefile
-@@ -551,11 +550,7 @@
+@@ -569,11 +568,7 @@
  plugins/taglist/Makefile
  plugins/time/Makefile
  po/Makefile.in
@@ -27,7 +27,7 @@ Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
 +++ b/Makefile.am
 @@ -1,7 +1,7 @@
  ## Process this file with automake to produce Makefile.in
- ACLOCAL_AMFLAGS = -I m4
+ ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
  
 -SUBDIRS = pluma pixmaps po data plugin-loaders plugins docs tests win32 osx
 +SUBDIRS = pluma pixmaps po data plugin-loaders plugins docs tests
diff --git a/debian/patches/series b/debian/patches/series
index b5e8e90..08ecf5f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,8 +1,3 @@
-0001_fix-ftbfs-due-to-gettext.patch
 0002_use-zenity-instead-of-mate-dialogs.patch
-1001_add-keywords-to-desktop-file.patch
-1002_typo-fix-whether.patch
-1003_dont-install-usr-bin-mate-text-editor.patch
-2001_fully-rename-application.patch
 2002_omit-gfdl-licensed-help-files.patch
 2003_omit-non-linux-build-files.patch

-- 
pluma Debian package

