New upstream release [1.4.4] + changelog summary.

5 files changed, 22 insertions, 77 deletions

diff --git a/debian/changelog b/debian/changelog
index 5c38a51..f1e914b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,17 @@
+clipit (1.4.4-0.1) UNRELEASED; urgency=medium
+
+  * TODO: https://github.com/CristianHenzel/ClipIt/issues/87
+
+  * Non-maintainer upload.
+  * New upstream release [June 2018].
+  * Updated Homepage URL.
+  * Vcs URLs to Salsa.
+  * Removed "menu" file.
+  * debhelper & compat to version 11.
+  * watch: check GitHub for releases.
+
+ -- Dmitry Smirnov <onlyjob@debian.org>  Fri, 29 Jun 2018 09:32:03 +1000
+
 clipit (1.4.2-1.2) unstable; urgency=medium
 
   * Non-maintainer upload.
@@ -21,7 +35,7 @@ clipit (1.4.2-1.1) unstable; urgency=medium
 clipit (1.4.2-1) unstable; urgency=low
 
   * New upstream version 1.4.2
-  * Delete patch glib-single-include.patch it is fixed in the new version 
+  * Delete patch glib-single-include.patch it is fixed in the new version
   * Set myself as maintainer. closes: #718681
   * Update debhelper to version 9
   * Update standards version to 3.9.4
diff --git a/debian/clean b/debian/clean
new file mode 100644
index 0000000..54a6877
--- /dev/null
+++ b/debian/clean
@@ -0,0 +1,2 @@
+m4/intltool.m4
+po/Makefile.in.in
diff --git a/debian/copyright b/debian/copyright
index c063d69..074f463 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,10 +1,10 @@
-Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: clipit
 Upstream-Contact: Cristian Henzel <oss@rspwn.com>
 Source: http://sourceforge.net/projects/gtkclipit/
 
 Files: *
-Copyright: 2010, Cristian Henzel <oss@rspwn.com>
+Copyright: 2010-2012 Cristian Henzel <oss@rspwn.com>
            2007-2008, Gilberto "Xyhthyx" Miralla <xyhthyx@gmail.com>
 License: GPL-3+
 
@@ -13,7 +13,7 @@ Copyright: 2002, Red Hat, Inc.
            1998, 2001 Tim Janik
 License: LGPL-2+
 
-Files: src/eggaccelerators.h 
+Files: src/eggaccelerators.h
 Copyright: 2002, Red Hat, Inc.
 License: LGPL-2+
 
@@ -45,8 +45,7 @@ Files: debian/*
 Copyright: 2010, Cristian Henzel <oss@rspwn.com>
            2013, Jackson Doak <noskcaj@ubuntu.com>
 License: GPL-3+
- See `/usr/share/common-licenses/GPL-3'.
- 
+
 License: LGPL-2+
  This library is free software; you can redistribute it and/or
  modify it under the terms of the GNU Library General Public
@@ -68,7 +67,7 @@ License: LGPL-2+
 License: GPL-3+
  This package is free software; you can redistribute it and/or modify
  it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 3 of the License, or 
+ the Free Software Foundation; either version 3 of the License, or
  (at your option) any later version.
  .
  This package is distributed in the hope that it will be useful,
diff --git a/debian/patches/series b/debian/patches/series
index 853844e..e69de29 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +0,0 @@
-utf8-ellipsize.patch
diff --git a/debian/patches/utf8-ellipsize.patch b/debian/patches/utf8-ellipsize.patch
deleted file mode 100644
index 85a336c..0000000
--- a/debian/patches/utf8-ellipsize.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-From 2c7c9d604b5a317ec7794e441c2c936055513a3c Mon Sep 17 00:00:00 2001
-From: ZEN <ZEN-ROOT@users.noreply.github.com>
-Date: Mon, 9 Jun 2014 16:46:49 +0300
-Subject: [PATCH] Fixed work with utf8 strings
-
-From 497351fcb27e4b3c779a83f154fd0b085fbbe268 Mon Sep 17 00:00:00 2001
-From: ZEN <admin@linuxhub.ru>
-Date: Sun, 22 Nov 2015 01:17:08 +0200
-Subject: [PATCH] Fixed comparison of string length by using the 'str_len'
- variable instead of 'string->len' Refactored the code from merge #30. Now by
- default working with string in utf8 mode.
-
---- a/src/utils.c
-+++ b/src/utils.c
-@@ -68,25 +68,35 @@
- /* Ellipsize a string according to the settings */
- GString *ellipsize_string(GString *string)
- {
--	if (string->len > prefs.item_length)
--	{
--		switch (prefs.ellipsize)
--		{
--			case PANGO_ELLIPSIZE_START:
--				string = g_string_erase(string, 0, string->len-(prefs.item_length));
--				string = g_string_prepend(string, "...");
--				break;
--			case PANGO_ELLIPSIZE_MIDDLE:
--				string = g_string_erase(string, (prefs.item_length/2), string->len-(prefs.item_length));
--				string = g_string_insert(string, (string->len/2), "...");
--				break;
--			case PANGO_ELLIPSIZE_END:
--				string = g_string_truncate(string, prefs.item_length);
--				string = g_string_append(string, "...");
--				break;
--		}
--	}
--	return string;
-+    gchar *start = NULL,
-+          *end   = NULL;
-+
-+    gint str_len = g_utf8_strlen(string->str, -1);
-+    if (str_len > prefs.item_length)
-+    {
-+        switch (prefs.ellipsize)
-+        {
-+            case PANGO_ELLIPSIZE_START:
-+                end = g_utf8_substring(string->str, str_len - prefs.item_length, str_len);
-+                g_string_printf(string, "...%s", end);
-+            break;
-+            case PANGO_ELLIPSIZE_MIDDLE:
-+                start = g_utf8_substring(string->str, 0, prefs.item_length/2);
-+                end = g_utf8_substring(string->str, str_len - prefs.item_length/2, str_len);
-+                g_string_printf(string, "%s...%s", start, end);
-+            break;
-+            case PANGO_ELLIPSIZE_END:
-+                start = g_utf8_substring(string->str, 0, prefs.item_length);
-+                g_string_assign(string, start);
-+                string = g_string_append(string, "...");
-+            break;
-+        }
-+    }
-+
-+    g_free(start);
-+    g_free(end);
-+
-+    return string;
- }
- 
- /* Remove newlines from string */