Hi, I have uploaded the attached interdiff as NMU.
Cheers, Michael
diff -u gkrellm-snmp-1.0/debian/changelog gkrellm-snmp-1.0/debian/changelog --- gkrellm-snmp-1.0/debian/changelog +++ gkrellm-snmp-1.0/debian/changelog @@ -1,3 +1,11 @@ +gkrellm-snmp (1.0-1.2) unstable; urgency=low + + * Non-maintainer upload. + * gkrellm_snmp.c: Updated with clarified license header from 1.1 release. + * debian/copyright: Updated. (Closes: #508292) + + -- Michael Banck <mba...@debian.org> Sun, 29 Nov 2009 11:48:58 +0100 + gkrellm-snmp (1.0-1.1) unstable; urgency=low * Non-maintainer upload. diff -u gkrellm-snmp-1.0/debian/copyright gkrellm-snmp-1.0/debian/copyright --- gkrellm-snmp-1.0/debian/copyright +++ gkrellm-snmp-1.0/debian/copyright @@ -7,23 +7,33 @@ Upstream Author: Christian W. Zuckschwerdt <z...@triq.net> -Copyright: Copyright (C) 2000-2006 Christian W. Zuckschwerdt <z...@triq.net> +Copyright: Copyright (C) 2000-2009 Christian W. Zuckschwerdt <z...@triq.net> License: -------------------------------------------------------------------------- -This program is free software which I release under the GNU General Public -License. You may redistribute and/or modify this program under the terms -of that 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. - -To get a copy of the GNU General Puplic License, write to the Free -Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA -02110-1301, USA. + GKrellM_SNMP 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. + + In addition, as a special exception, the copyright holders give + permission to link the code of this program with the OpenSSL library, + and distribute linked combinations including the two. + You must obey the GNU General Public License in all respects + for all of the code used other than OpenSSL. If you modify + file(s) with this exception, you may extend this exception to your + version of the file(s), but you are not obligated to do so. If you + do not wish to do so, delete this exception statement from your + version. If you delete this exception statement from all source + files in the program, then also delete it here. + + 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 GKrellM_SNMP. If not, see <http://www.gnu.org/>. On Debian GNU/Linux systems, the complete text of the GNU General Public License can be found in `/usr/share/common-licenses/GPL'. only in patch2: unchanged: --- gkrellm-snmp-1.0.orig/gkrellm_snmp.c +++ gkrellm-snmp-1.0/gkrellm_snmp.c @@ -1,22 +1,32 @@ /* SNMP reader plugin for GKrellM -| Copyright (C) 2000-2006 Christian W. Zuckschwerdt <z...@triq.net> +| Copyright (C) 2000-2009 Christian W. Zuckschwerdt <z...@triq.net> | | Author: Christian W. Zuckschwerdt <z...@triq.net> http://triq.net/ | Latest versions might be found at: http://gkrellm.net/ | -| 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. +| GKrellM_SNMP 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. | +| In addition, as a special exception, the copyright holders give +| permission to link the code of this program with the OpenSSL library, +| and distribute linked combinations including the two. +| You must obey the GNU General Public License in all respects +| for all of the code used other than OpenSSL. If you modify +| file(s) with this exception, you may extend this exception to your +| version of the file(s), but you are not obligated to do so. If you +| do not wish to do so, delete this exception statement from your +| version. If you delete this exception statement from all source +| files in the program, then also delete it here. + | 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, write to the Free Software -| Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +| along with GKrellM_SNMP. If not, see <http://www.gnu.org/>. */ /* Installation: @@ -1394,7 +1404,7 @@ "Copyright (C) 2000-2006 Christian W. Zuckschwerdt <z...@triq.net>\n" "\n" "http://triq.net/gkrellm.html\n\n"; - "Released under the GNU Public Licence" + "Released under the GNU Public Licence with OpenSSL exemption" ; static gchar *reader_title[CLIST_WIDTH] =
