Bug-Debian: http://bugs.debian.org/788335
---
This patch is meant to apply on top of the changes that I posted
to Bug#786747 "new upstream stable version Kannel 1.4.4".
debian/changelog | 1 +
debian/copyright | 86 +++++++++++++++++++++++++++++++++++---------------------
2 files changed, 55 insertions(+), 32 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 0e52ab1..d60a31d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -17,6 +17,7 @@ kannel (1.4.4-0~procomp1) UNRELEASED; urgency=low
+ Include /usr/bin/decode_emimsg in the kannel package.
+ Although the sqlbox and opensmppbox add-ons are now part of the
source tree, this version of the packaging does not build them.
+ * Update debian/copyright from LICENSE. Closes: bug#788335.
--
diff --git a/debian/copyright b/debian/copyright
index 16f8e21..b3864ae 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -5,35 +5,57 @@ This is Kannel, originally packaged for Debian by Lars
Wirzenius
Original author is the Kannel project, see http://www.kannel.org,
run by Wapit Ltd, see http://www.wapit.com.
-Copyright (c) 1998 WAPIT OY LTD.
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-
-1. Redistributions of source code must retain the above copyright notice,
-this list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in the
-documentation and/or other materials provided with the distribution.
-
-3. All advertising materials mentioning features or use of this software
-must display the following acknowledgement: This product includes software
-developed by WAPIT OY LTD.
-
-4. The name of the author may not be used to endorse or promote products
-derived from this software without specific prior written permission.
-
-
-THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
-IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
-INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
-USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
-ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+====================================================================
+The Kannel Software License, Version 1.0
+
+Copyright (c) 2001-2014 Kannel Group
+Copyright (c) 1998-2001 WapIT Ltd.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+1. Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in
+ the documentation and/or other materials provided with the
+ distribution.
+
+3. The end-user documentation included with the redistribution,
+ if any, must include the following acknowledgment:
+ "This product includes software developed by the
+ Kannel Group (http://www.kannel.org/)."
+ Alternately, this acknowledgment may appear in the software itself,
+ if and wherever such third-party acknowledgments normally appear.
+
+4. The names "Kannel" and "Kannel Group" must not be used to
+ endorse or promote products derived from this software without
+ prior written permission. For written permission, please
+ contact o...@kannel.org.
+
+5. Products derived from this software may not be called "Kannel",
+ nor may "Kannel" appear in their name, without prior written
+ permission of the Kannel Group.
+
+THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE KANNEL GROUP OR ITS CONTRIBUTORS
+BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
+OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT
+OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
+OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
+EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+====================================================================
+
+This software consists of voluntary contributions made by many
+individuals on behalf of the Kannel Group. For more information on
+the Kannel Group, please see <http://www.kannel.org/>.
+
+Portions of this software are based upon software originally written at
+WapIT Ltd., Helsinki, Finland for the Kannel project.
--
1.9.1
--
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
