diff -Nru xfce4-notes-plugin-1.8.1/debian/changelog xfce4-notes-plugin-1.8.1/debian/changelog --- xfce4-notes-plugin-1.8.1/debian/changelog 2018-06-26 05:56:15.000000000 +0000 +++ xfce4-notes-plugin-1.8.1/debian/changelog 2018-12-17 21:05:07.000000000 +0000 @@ -1,8 +1,21 @@ -xfce4-notes-plugin (1.8.1-1build1) devel; urgency=medium +xfce4-notes-plugin (1.8.1-2) unstable; urgency=medium - * No-change rebuild against libxfconf-0-3. + * Moved the package to git on salsa.debian.org + * Updated the maintainer address to debian-xfce@lists.debian.org + closes: #899742 + * d/gbp.conf added, following DEP-14 + * run wrap-and-sort + * d/watch: use HTTPS protocol + * New upstream version 1.8.1 + * d/control: drop Lionel from uploaders, thanks! + * d/control: update standards version to 4.2.1 + * d/control: use HTTPS protocol for Homepage field + * d/control: drop breaks/replaces for old versions + * update debhelper compat to 10 + * d/patches imported in gbp pq + * d/copyright updated - -- Unit 193 Tue, 26 Jun 2018 01:56:15 -0400 + -- Yves-Alexis Perez Mon, 17 Dec 2018 22:05:07 +0100 xfce4-notes-plugin (1.8.1-1) unstable; urgency=medium diff -Nru xfce4-notes-plugin-1.8.1/debian/compat xfce4-notes-plugin-1.8.1/debian/compat --- xfce4-notes-plugin-1.8.1/debian/compat 2013-05-25 14:44:04.000000000 +0000 +++ xfce4-notes-plugin-1.8.1/debian/compat 2018-12-17 21:05:07.000000000 +0000 @@ -1 +1 @@ -9 +10 diff -Nru xfce4-notes-plugin-1.8.1/debian/control xfce4-notes-plugin-1.8.1/debian/control --- xfce4-notes-plugin-1.8.1/debian/control 2015-05-04 14:13:37.000000000 +0000 +++ xfce4-notes-plugin-1.8.1/debian/control 2018-12-17 21:05:07.000000000 +0000 @@ -1,24 +1,32 @@ Source: xfce4-notes-plugin Section: xfce Priority: optional -Maintainer: Debian Xfce Maintainers -Uploaders: Yves-Alexis Perez , Lionel Le Folgoc -Build-Depends: autotools-dev, debhelper (>= 9), xfce4-panel-dev, libxml2-dev, - libxml-parser-perl, intltool, libx11-dev, pkg-config, libgtk2.0-dev, - libxfce4ui-1-dev, libxfconf-0-dev, libunique-dev, xfce4-dev-tools, automake, - libtool, autotools-dev -Standards-Version: 3.9.6 -Homepage: http://goodies.xfce.org/projects/panel-plugins/xfce4-notes-plugin -Vcs-Svn: svn://anonscm.debian.org/pkg-xfce/goodies/trunk/xfce4-notes-plugin/ -Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-xfce/goodies/trunk/xfce4-notes-plugin/ +Maintainer: Debian Xfce Maintainers +Uploaders: Yves-Alexis Perez +Build-Depends: automake, + debhelper (>= 10), + intltool, + libgtk2.0-dev, + libtool, + libunique-dev, + libx11-dev, + libxfce4ui-1-dev, + libxfconf-0-dev, + libxml-parser-perl, + libxml2-dev, + pkg-config, + xfce4-dev-tools, + xfce4-panel-dev +Standards-Version: 4.2.1 +Homepage: https://goodies.xfce.org/projects/panel-plugins/xfce4-notes-plugin +Vcs-Git: https://salsa.debian.org/xfce-team/goodies/xfce4-notes-plugin.git +Vcs-Browser: https://salsa.debian.org/xfce-team/goodies/xfce4-notes-plugin Package: xfce4-notes Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends} -Replaces: xfce4-notes-plugin (<< 1.7.2-1) -Conflicts: xfce4-notes-plugin (<< 1.7.2-1) +Depends: ${misc:Depends}, ${shlibs:Depends} Description: Notes application for the Xfce4 desktop - The notes tool provides you a simple text editor in a little window for the + The notes tool provides you a simple text editor in a little window for the Xfce 4 desktop. Notes are especially useful for temporary stuff. . It supports multiple notes through a notebook. Click on the upper left @@ -26,9 +34,9 @@ Package: xfce4-notes-plugin Architecture: any -Depends: xfce4-notes, ${shlibs:Depends}, ${misc:Depends} +Depends: xfce4-notes, ${misc:Depends}, ${shlibs:Depends} Description: Notes plugin for the Xfce4 desktop - The notes tool provides you a simple text editor in a little window for the + The notes tool provides you a simple text editor in a little window for the Xfce 4 desktop. Notes are especially useful for temporary stuff. . It supports multiple notes through a notebook. Click on the upper left diff -Nru xfce4-notes-plugin-1.8.1/debian/copyright xfce4-notes-plugin-1.8.1/debian/copyright --- xfce4-notes-plugin-1.8.1/debian/copyright 2014-10-15 19:15:30.000000000 +0000 +++ xfce4-notes-plugin-1.8.1/debian/copyright 2018-12-17 21:05:07.000000000 +0000 @@ -1,25 +1,64 @@ -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: xfce4-notes-plugin Source: http://goodies.xfce.org/projects/panel-plugins/xfce4-notes-plugin Files: * -Copyright: 2006-2009, Mike Massonnet +Copyright: 2006-2018 Xfce License: GPL-2+ -Files: panel-plugin/panel-plugin.c -Copyright: 2003, Jakob Henriksson - 2006-2008, Mike Massonnet +Files: lib/application.c + lib/application.vala + lib/ext-gdk.c + lib/ext-gdk.h + lib/hypertextview.c + lib/hypertextview.vala + lib/icon-button.c + lib/icon-button.vala + lib/note.c + lib/note.vala + lib/theme-gtkcss.c + lib/theme-gtkcss.vala + lib/theme-gtkrc.c + lib/theme-gtkrc.h + lib/theme.c + lib/theme.vala + lib/window-monitor.c + lib/window-monitor.vala + lib/window.c + lib/window.vala + src/main-panel-plugin.c + src/main-panel-plugin.vala + src/main-popup.c + src/main-status-icon.c + src/main-status-icon.vala + src/xfce-autostart.c + src/xfce-autostart.h +Copyright: 2006-2013, Mike Massonnet + 2009, Mike Massonnet + 2009-2010, Mike Massonnet + 2010, Mike Massonnet License: GPL-2+ - + +Files: src/defines.h + src/main-settings-dialog.c +Copyright: 2008-2010, Mike Massonnet +License: GPL-2+ + +Files: lib/popup.c + lib/popup.h +Copyright: 2002-2006, Olivier Fourdan + 2009-2010, Mike Massonnet +License: GPL-2+ + Files: debian/* -Copyright: 2003, Andrew Lau +Copyright: 2003-2018 Xfce development team License: GPL-2+ -License: GPL-2+ +License: GPL-2+ This program 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 2 of the License, or (at your option) any later version. - . + . On Debian systems, the complete text of the GNU General Public License can be found in the file /usr/share/common-licenses/GPL-2. diff -Nru xfce4-notes-plugin-1.8.1/debian/gbp.conf xfce4-notes-plugin-1.8.1/debian/gbp.conf --- xfce4-notes-plugin-1.8.1/debian/gbp.conf 1970-01-01 00:00:00.000000000 +0000 +++ xfce4-notes-plugin-1.8.1/debian/gbp.conf 2018-12-17 21:05:07.000000000 +0000 @@ -0,0 +1,4 @@ +[DEFAULT] +pristine-tar = True +debian-branch = debian/master +upstream-branch = upstream/latest diff -Nru xfce4-notes-plugin-1.8.1/debian/patches/01_fix_format-string.patch xfce4-notes-plugin-1.8.1/debian/patches/01_fix_format-string.patch --- xfce4-notes-plugin-1.8.1/debian/patches/01_fix_format-string.patch 2015-05-04 14:29:04.000000000 +0000 +++ xfce4-notes-plugin-1.8.1/debian/patches/01_fix_format-string.patch 2018-12-17 21:05:07.000000000 +0000 @@ -1,6 +1,17 @@ +From: Yves-Alexis Perez +Date: Mon, 17 Dec 2018 22:01:52 +0100 +Subject: Fix multiple format string errors + +--- + lib/application.c | 8 ++++---- + lib/window.c | 2 +- + 2 files changed, 5 insertions(+), 5 deletions(-) + +diff --git a/lib/application.c b/lib/application.c +index febdd25..35a0ed0 100644 --- a/lib/application.c +++ b/lib/application.c -@@ -352,7 +352,7 @@ static void xnp_application_update_notes +@@ -352,7 +352,7 @@ static void xnp_application_update_notes_path (XnpApplication* self) { XfconfChannel* _tmp16_; const gchar* _tmp17_; _tmp9_ = _ ("Select notes path"); @@ -9,7 +20,7 @@ g_object_ref_sink (_tmp10_); error_dialog = _tmp10_; _tmp11_ = error_dialog; -@@ -419,7 +419,7 @@ static void xnp_application_update_notes +@@ -419,7 +419,7 @@ static void xnp_application_update_notes_path (XnpApplication* self) { XfconfChannel* _tmp35_; const gchar* _tmp36_; _tmp27_ = _ ("Select notes path"); @@ -18,7 +29,7 @@ g_object_ref_sink (_tmp28_); error_dialog = _tmp28_; _tmp29_ = error_dialog; -@@ -2082,7 +2082,7 @@ static void xnp_application_delete_windo +@@ -2082,7 +2082,7 @@ static void xnp_application_delete_window (XnpApplication* self, XnpWindow* wind gint _tmp9_; _tmp3_ = window; _tmp4_ = _ ("Are you sure you want to delete this group?"); @@ -27,7 +38,7 @@ g_object_ref_sink (_tmp5_); dialog = _tmp5_; _tmp6_ = dialog; -@@ -2721,7 +2721,7 @@ void xnp_application_open_settings_dialo +@@ -2721,7 +2721,7 @@ void xnp_application_open_settings_dialog (XnpApplication* self) { e = _inner_error_; _inner_error_ = NULL; _tmp0_ = _ ("Unable to open the settings dialog"); @@ -36,9 +47,11 @@ g_object_ref_sink (_tmp1_); error_dialog = _tmp1_; _tmp2_ = error_dialog; +diff --git a/lib/window.c b/lib/window.c +index bc1e743..1d8a8f1 100644 --- a/lib/window.c +++ b/lib/window.c -@@ -3542,7 +3542,7 @@ void xnp_window_delete_note (XnpWindow* +@@ -3542,7 +3542,7 @@ void xnp_window_delete_note (XnpWindow* self, gint page) { GtkMessageDialog* _tmp13_; gint _tmp14_; _tmp9_ = _ ("Are you sure you want to delete this note?"); diff -Nru xfce4-notes-plugin-1.8.1/debian/rules xfce4-notes-plugin-1.8.1/debian/rules --- xfce4-notes-plugin-1.8.1/debian/rules 2015-05-04 14:36:19.000000000 +0000 +++ xfce4-notes-plugin-1.8.1/debian/rules 2018-12-17 21:05:07.000000000 +0000 @@ -14,4 +14,4 @@ dh_makeshlibs -n -X /usr/lib/xfce4/panel/plugins %: - dh $@ --with autotools_dev --parallel + dh $@ diff -Nru xfce4-notes-plugin-1.8.1/debian/watch xfce4-notes-plugin-1.8.1/debian/watch --- xfce4-notes-plugin-1.8.1/debian/watch 2009-08-03 16:42:10.000000000 +0000 +++ xfce4-notes-plugin-1.8.1/debian/watch 2018-12-17 21:05:07.000000000 +0000 @@ -1,3 +1,3 @@ version=3 -http://archive.xfce.org/src/panel-plugins/xfce4-notes-plugin/([\d\.]+)/ \ +https://archive.xfce.org/src/panel-plugins/xfce4-notes-plugin/([\d\.]+)/ \ xfce4-notes-plugin-([\d\.]+)\.tar\.(?:gz|bz2) diff -Nru xfce4-notes-plugin-1.8.1/debian/xfce4-notes-plugin.install xfce4-notes-plugin-1.8.1/debian/xfce4-notes-plugin.install --- xfce4-notes-plugin-1.8.1/debian/xfce4-notes-plugin.install 2009-12-21 22:03:22.000000000 +0000 +++ xfce4-notes-plugin-1.8.1/debian/xfce4-notes-plugin.install 2018-12-17 21:05:07.000000000 +0000 @@ -1,2 +1,2 @@ -usr/share/xfce4 usr/lib +usr/share/xfce4