Hi, On Saturday 24 November 2012, Adam D. Barratt wrote: > Control: tags -1 + confirmed > > On Mon, 2012-11-12 at 09:48 +0100, Thomas Friedrichsmeier wrote: > > On Sunday 11 November 2012, Julien Cristau wrote: > > > Much easier for us if the patch is included in the bug. > > > > Ok. Attaching rkward_0.5.7-3.diff.gz and the debdiff 0.5.7-2 -> 0.5.7-3. > > 0.5.7-2+deb7u1 would be a more conventional version number here, to > indicate that the upload was made "out of sequence". Other than that, > please feel free to go ahead; thanks. thanks. I've uploaded as rkward_0.5.7+deb7u1. I have incorporated the small change suggested by Laszlo Kajan to comply with machine readable copyright file syntax. For reference, I'm attaching the updated debdiff, and a second order diff of the two debdiffs. Regards Thomas
diff -u rkward-0.5.7/debian/changelog rkward-0.5.7/debian/changelog --- rkward-0.5.7/debian/changelog +++ rkward-0.5.7/debian/changelog @@ -1,3 +1,10 @@ +rkward (0.5.7-2+deb7u1) testing-proposed-updates; urgency=low + + * more accurate copyright file (thanks to Laszlo Kajan) + closes: #689982 + + -- Thomas Friedrichsmeier <tfry@users.sourceforge.net> Sat, 24 Nov 2012 13:45:00 +0100 + rkward (0.5.7-2) unstable; urgency=low * new upload to force rebuild against R 2.14.0~x on i386 diff -u rkward-0.5.7/debian/copyright rkward-0.5.7/debian/copyright --- rkward-0.5.7/debian/copyright +++ rkward-0.5.7/debian/copyright @@ -1,13 +1,80 @@ -This package was debianized by Thomas Friedrichsmeier <tfry@users.sourceforge.net> on -Tue, 26 Apr 2005 00:00:33 +0200. +Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: RKWard +Source: http://rkward.sourceforge.net -It was downloaded from http://rkward.sourceforge.net +Files: * +Copyright: 2002-2012 Thomas Friedrichsmeier and the RKWard team +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'. -Copyright: 2002 - 2010 Thomas Friedrichsmeier and the RKWard team -License: -You are free to distribute this software under the terms of the GNU General Public License. -On Debian systems, the complete text of the GNU General Public License can be found in the file `/usr/share/common-licenses/GPL'. - -Files: rkward/qwinhost.cpp.orig rkward/qwinhost.cpp rkward/qwinhost.h.orig rkward/qwinhost.h +Files: rkward/qwinhost/qwinhost.cpp.orig rkward/qwinhost/qwinhost.cpp rkward/qwinhost/qwinhost.h.orig rkward/qwinhost/qwinhost.h Copyright: (c) 2009 Nokia Corporation and/or its subsidiary(-ies). +License: LPGL-2.1 and Nokia_Exception or GPL-3 + License: LPGL-2.1 + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; + version 2.1 of the License. + . + This library 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 + Lesser General Public License for more details. + . + You should have received a copy of the GNU Lesser General Public + License along with this library; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + . + On Debian systems, the full text of the GNU Lesser General Public + License version 2.1 can be found in the file + `/usr/share/common-licenses/LGPL-2.1'. + +License: Nokia_Exception + Nokia Qt LGPL Exception version 1.0 + . + As a special exception to the GNU Lesser General Public License + version 2.1, the object code form of a "work that uses the Library" + may incorporate material from a header file that is part of the + Library. You may distribute such object code under terms of your + choice, provided that the incorporated material (i) does not exceed + more than 5% of the total size of the Library; and (ii) is limited to + numerical parameters, data structure layouts, accessors, macros, + inline functions and templates. + +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, version 3 of the License. + . + 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 program. If not, see <http://www.gnu.org/licenses/>. + . + 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'. +
5c5 < +rkward (0.5.7-3) testing-proposed-updates; urgency=low --- > +rkward (0.5.7-2+deb7u1) testing-proposed-updates; urgency=low 7c7 < + * more accurate copyright file --- > + * more accurate copyright file (thanks to Laszlo Kajan) 10c10 < + -- Thomas Friedrichsmeier <tfry@users.sourceforge.net> Sat, 10 Nov 2011 11:45:00 +0100 --- > + -- Thomas Friedrichsmeier <tfry@users.sourceforge.net> Sat, 24 Nov 2012 13:45:00 +0100 18c18 < @@ -1,13 +1,78 @@ --- > @@ -1,13 +1,80 @@ 58,59c58 < -License: LPGL-2.1 < +License: LPGL-2.1 with Nokia Qt LGPL Exception version 1.0 or GPL-3 --- > +License: LPGL-2.1 and Nokia_Exception or GPL-3 61c60 < +License: LPGL-2.1 with Nokia Qt LGPL Exception version 1.0 --- > License: LPGL-2.1 64c63 < + License as published by the Free Software Foundation; --- > + License as published by the Free Software Foundation; 66c65 < + . --- > + . 79c78,79 < + . --- > + > +License: Nokia_Exception 106a107 > +
Attachment:
signature.asc
Description: This is a digitally signed message part.