Control: tags 803286 + pending
Dear maintainer,
I've prepared an NMU for mtpaint (versioned as 3.40-2.2) and
uploaded it to unstable. I am attaching the debdiff to this bug
report.
Regards,
Markus
diff -Nru mtpaint-3.40/debian/changelog mtpaint-3.40/debian/changelog
--- mtpaint-3.40/debian/changelog 2015-12-16 06:10:31.000000000 +0100
+++ mtpaint-3.40/debian/changelog 2016-03-07 14:02:46.000000000 +0100
@@ -1,3 +1,15 @@
+mtpaint (3.40-2.2) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Remove unnecessary build-dependency on libgif4. (Closes: #803286)
+ * Refresh giflib5.diff because it did not apply cleanly.
+ * Remove quilt from Build-Depends because source format 3.0 uses quilt by
+ default.
+ * Fix Lintian warning dep5-copyright-license-name-not-unique. In fact all
+ files are licensed under GPL-3+ now.
+
+ -- Markus Koschany <a...@debian.org> Mon, 07 Mar 2016 13:46:16 +0100
+
mtpaint (3.40-2.1) unstable; urgency=medium
* Non-maintainer upload.
diff -Nru mtpaint-3.40/debian/control mtpaint-3.40/debian/control
--- mtpaint-3.40/debian/control 2014-07-20 13:25:14.000000000 +0200
+++ mtpaint-3.40/debian/control 2016-03-07 14:02:46.000000000 +0100
@@ -5,14 +5,12 @@
Build-Depends: debhelper (>= 7.0.50~),
libpng-dev,
zlib1g-dev,
- libgif4,
libjpeg-dev,
libtiff-dev,
gettext,
pkg-config,
libgtk2.0-dev,
- libgif-dev,
- quilt
+ libgif-dev
Standards-Version: 3.9.5
Homepage: http://mtpaint.sourceforge.net/
diff -Nru mtpaint-3.40/debian/copyright mtpaint-3.40/debian/copyright
--- mtpaint-3.40/debian/copyright 2012-01-03 15:23:20.000000000 +0100
+++ mtpaint-3.40/debian/copyright 2016-03-07 14:02:46.000000000 +0100
@@ -6,24 +6,7 @@
Files: *
Copyright: 2004-2007, Mark Tyler <markty...@users.sourceforge.net>
Dmitry Groshev <wjag...@users.sourceforge.net>
-License: GPL-3
- 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 3 of the License, or
- (at your option) any later version.
- .
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- .
- You should have received a copy of the GNU General Public
- License along with this package; if not, write to the Free
- Software Foundation, Inc., 51 Franklin St, Fifth Floor,
- Boston, MA 02110-1301 USA
- .
- On Debian systems, the full text of the GNU General Public
- License version 3 can be found in the file `/usr/share/common-licenses/GPL-3'.
+License: GPL-3+
Files: po/*.po
Copyright: 2005, Myrk Tyler <markty...@users.sourceforge.net>
@@ -32,38 +15,21 @@
2006, Simek <gosi...@gmail.com>
2006, Tutku Dalmaz <tutkudal...@gmail.com>
2006, Wei-Lun Chao <chaowei...@pcmail.com.tw>
- 2007, Norihiro YONEDA <a...@avis.ne.jp>
- 2008, Sergei Irupin <biblel...@gmail.com>
- 2007, Jozef Riha <jose1...@gmail.com>
- 2008, Cecc <puppyli...@sohu.com>
-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.
- .
- This program is distributed in the hope that it will be
- useful, but WITHOUT ANY WARRANTY; without even the implied
- warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE. See the GNU General Public License for more
- details.
- .
- You should have received a copy of the GNU General Public
- License along with this package; if not, write to the Free
- Software Foundation, Inc., 51 Franklin St, Fifth Floor,
- Boston, MA 02110-1301 USA
- .
- On Debian systems, the full text of the GNU General Public
- License version 2 can be found in the file `/usr/share/common-licenses/GPL-2'.
+ 2007, Norihiro YONEDA <a...@avis.ne.jp>
+ 2008, Sergei Irupin <biblel...@gmail.com>
+ 2007, Jozef Riha <jose1...@gmail.com>
+ 2008, Cecc <puppyli...@sohu.com>
+License: GPL-3+
Files: debian/*
Copyright: 2011, Muammar El Khatib <muam...@debian.org>
-License: GPL-3
+License: GPL-3+
+
+License: GPL-3+
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 3 of the License, or (at your option) any later
version.
.
This program is distributed in the hope that it will be
diff -Nru mtpaint-3.40/debian/patches/giflib5.diff mtpaint-3.40/debian/patches/giflib5.diff
--- mtpaint-3.40/debian/patches/giflib5.diff 2015-12-16 06:10:57.000000000 +0100
+++ mtpaint-3.40/debian/patches/giflib5.diff 2016-03-07 14:02:46.000000000 +0100
@@ -1,8 +1,17 @@
-Index: b/src/png.c
+From: Matthias Klose <d...@debian.org>
+Date: Mon, 7 Mar 2016 13:49:51 +0100
+Subject: giflib5
+
===================================================================
+---
+ src/png.c | 16 ++++++++--------
+ 1 file changed, 8 insertions(+), 8 deletions(-)
+
+diff --git a/src/png.c b/src/png.c
+index 2b30821..734f783 100644
--- a/src/png.c
+++ b/src/png.c
-@@ -1510,7 +1510,7 @@ static int load_gif_frames(char *file_na
+@@ -1510,7 +1510,7 @@ static int load_gif_frames(char *file_name, ani_settings *ani)
int res, val, disposal, bpp, cmask, lastzero = FALSE;
@@ -11,7 +20,7 @@
/* Init state structure */
memset(&stat, 0, sizeof(stat));
-@@ -1608,7 +1608,7 @@ static int load_gif_frames(char *file_na
+@@ -1608,7 +1608,7 @@ static int load_gif_frames(char *file_name, ani_settings *ani)
}
res = 1;
fail: mem_free_chanlist(w_set.img);
@@ -20,7 +29,7 @@
return (res);
}
-@@ -1621,7 +1621,7 @@ static int load_gif(char *file_name, ls_
+@@ -1621,7 +1621,7 @@ static int load_gif(char *file_name, ls_settings *settings)
int delay = settings->gif_delay, trans = -1;//, disposal = 0;
@@ -29,7 +38,7 @@
/* Get global palette */
settings->colors = convert_gif_palette(settings->pal, giffy->SColorMap);
-@@ -1659,7 +1659,7 @@ static int load_gif(char *file_name, ls_
+@@ -1659,7 +1659,7 @@ static int load_gif(char *file_name, ls_settings *settings)
}
}
res = 1;
@@ -38,7 +47,7 @@
return (res);
}
-@@ -1682,10 +1682,10 @@ static int save_gif(char *file_name, ls_
+@@ -1682,10 +1682,10 @@ static int save_gif(char *file_name, ls_settings *settings)
nc |= nc >> 1; nc |= nc >> 2; nc |= nc >> 4;
nc += !nc + 1; // No less than 2 colors
@@ -51,7 +60,7 @@
if (!giffy) goto fail0;
for (i = 0; i < settings->colors; i++)
-@@ -1725,14 +1725,14 @@ static int save_gif(char *file_name, ls_
+@@ -1725,14 +1725,14 @@ static int save_gif(char *file_name, ls_settings *settings)
if (!settings->silent) progress_end();
msg = 0;
diff -Nru mtpaint-3.40/debian/rules mtpaint-3.40/debian/rules
--- mtpaint-3.40/debian/rules 2014-07-20 13:26:52.000000000 +0200
+++ mtpaint-3.40/debian/rules 2016-03-07 14:02:46.000000000 +0100
@@ -1,6 +1,6 @@
#!/usr/bin/make -f
%:
- dh --with quilt $@
+ dh $@
override_dh_auto_configure:
./configure gtk2 cflags GIF jpeg tiff intl man --prefix=/usr \
