Hi! I am attaching the bare minimum diff for the NMU. I plan to upload this soon unless of course you ask for something else.
Kinds regards, Lisandro.
--
1: Una computadora sirve:
* Para tratar de dominar el mundo, un caso conocido de esto fue el de
Skinet
Damian Nadales
http://mx.grulic.org.ar/lurker/message/20080307.141449.a70fb2fc.es.html
Lisandro Damián Nicanor Pérez Meyer
http://perezmeyer.com.ar/
http://perezmeyer.blogspot.com/
diff --git a/debian/changelog b/debian/changelog index a96b4bb..6e76c86 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,13 @@ +glabels (3.4.1-1.1) unstable; urgency=medium + + * Non-maintainer upload. + * New upstream release. + - Fixes char usage on architectures on which it's unsigned + (Closes: #909692). + - Refresh patches. + + -- Lisandro Damián Nicanor Pérez Meyer <lisan...@debian.org> Wed, 03 Oct 2018 15:09:10 -0300 + glabels (3.4.0-2) unstable; urgency=medium * Cherry-pick from upstream: diff --git a/debian/patches/0003-Ignore-license.page.patch b/debian/patches/0003-Ignore-license.page.patch index 5b4fdaf..098f8de 100644 --- a/debian/patches/0003-Ignore-license.page.patch +++ b/debian/patches/0003-Ignore-license.page.patch @@ -7,11 +7,9 @@ Forwarded: not-needed help/Makefile.am | 1 - 1 file changed, 1 deletion(-) -diff --git a/help/Makefile.am b/help/Makefile.am -index 1185a90..1427128 100644 --- a/help/Makefile.am +++ b/help/Makefile.am -@@ -34,7 +34,6 @@ DOC_PAGES = \ +@@ -32,7 +32,6 @@ HELP_FILES = \ editprop.page \ index.page \ labelprop.page \ diff --git a/debian/patches/add-missing-prototype b/debian/patches/add-missing-prototype index 74979c4..9ae8be0 100644 --- a/debian/patches/add-missing-prototype +++ b/debian/patches/add-missing-prototype @@ -3,15 +3,17 @@ Subject: Added missing function prototype to header. Origin: upstream, https://github.com/jimevins/glabels/commit/01c80fc941cf5c8bf0d2b64a6a58cc3b5138f932 Bug-Debian: http://bugs.debian.org/855604 -diff --git a/src/prefs-model.h b/src/prefs-model.h -index 72efa84..10316a1 100644 +--- + src/prefs-model.h | 1 + + 1 file changed, 1 insertion(+) + --- a/src/prefs-model.h +++ b/src/prefs-model.h -@@ -59,6 +59,7 @@ GType gl_prefs_model_get_type (void) G_GNUC_CONST; - - glPrefsModel *gl_prefs_model_new (void); +@@ -54,6 +54,7 @@ struct _glPrefsModelClass { + gpointer user_data); + }; +glPrefsModel *gl_prefs_model_new_null (void); - void gl_prefs_model_set_units (glPrefsModel *this, - lglUnits units); + GType gl_prefs_model_get_type (void) G_GNUC_CONST; +
signature.asc
Description: This is a digitally signed message part.
