Imported Debian patch 2.0-1

diff --git a/debian/NEWS.Debian b/debian/NEWS.Debian
index 0502a7e72820c002795282296bf6041dedc6fbd1..145df3f4fc62648ce836a31abdc0139fd48d01f4 100644 (file)
--- a/debian/NEWS.Debian
+++ b/debian/NEWS.Debian
@@ -1,13 +1,3 @@
-t-prot (1.96-1) unstable; urgency=low
-
-  * This is a v2.0 pre-release. It contains a switch from inline locale strings
-    to the Locale::gettext perl module. Pretty please report any things you
-    notice with this release soon so it can be fixed for the upcoming v2.0
-    release. This isn't targeted at sarge because of this, and will only flow
-    in if gnupg 1.4.0 is allowed into sarge (my personal rules for it).
-
- -- Gerfried Fuchs <alfie@debian.org>  Tue, 15 Feb 2005 15:12:57 +0100
-
 t-prot (1.47-2) unstable; urgency=medium
 
   * The automatic addition to /etc/Muttrc was removed due to a policy

diff --git a/debian/changelog b/debian/changelog
index 8f487654ee6ad1080786879460a9d401953262eb..55992ccf9c04a4d182c5d3ec81658ce1e4f9cdaf 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+t-prot (2.0-1) unstable; urgency=low
+
+  * New upstream release.
+  * Added README.examples to examples files, removed BUGS file from docs (not
+    there anymore).
+  * Removed the sarge transition note from NEWS.Debian, not needed anymore.
+
+ -- Gerfried Fuchs <alfie@debian.org>  Mon, 30 May 2005 16:31:29 +0200
+
 t-prot (1.99.1+2.0-rc2-1) unstable; urgency=low
 
   * New upstream release: Bugfixes for inn and multipart handling.

diff --git a/debian/copyright b/debian/copyright
index 4c76507fc647e84f7c6d95eef76b8cd5f1e583aa..ccc0e78b0ba23ef446364c6ac5ee7f829aa5a130 100644 (file)
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,15 +1,45 @@
-This package was debianized by Gerfried Fuchs <alfie@debian.org> on
+This package was initially debianized by Gerfried Fuchs <alfie@debian.org> on
 Tue, 29 Jan 2002 15:55:21 +0100.
 
-It was downloaded
-    from http://www.escape.de/users/tolot/mutt/t-prot/downloads/
+It was downloaded from:
+=======================
+<http://www.escape.de/users/tolot/mutt/t-prot/downloads/>
 
 Upstream Author:
+================
     Jochen Striepe <t-prot@tolot.escape.de>
 
 Copyright:
-       This  is free software; you may use the source to whatever
-       you like.  Just keep  in  mind  to  mention  the  original
-       source  of  the  script  and  the manpage when you give it
-       away. There is NO warranty; not even  for  MERCHANTABILITY
-       or FITNESS FOR A PARTICULAR PURPOSE.
+==========
+       All of the documentation and software included in the  t-prot  releases
+       is copyrighted by Jochen Striepe.
+
+       Copyright (C) 2001-2005 Jochen Striepe. All rights reserved.
+
+       Redistribution  and  use,  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.  All  advertising materials mentioning features or use of this soft-
+       ware must display the following acknowledgement:
+
+         This product includes software developed by Jochen Striepe  and  oth-
+       ers.
+
+       3. Neither the name of the author nor the names of any contributors may
+       be used to endorse or promote products derived from this software with-
+       out specific prior written permission.
+
+       THIS  SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+       ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED  TO,  THE
+       IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PUR-
+       POSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR  OR  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 BUSI-
+       NESS 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.

diff --git a/debian/rules b/debian/rules
index 12362a8a628d59dda03d1e060e8c33a717979641..0141fe757b8837099d5e57a4c7d943f12912ec45 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -37,12 +37,12 @@ install: build
        $(INSTALL_FILE) debian/Muttrc.t-prot $(TMP)/etc
        $(INSTALL_FILE) contrib/t-prot.sl $(TMP)/usr/share/slrn/macros
 
-       $(INSTALL_FILE) BUGS TODO README $(TMP)/usr/share/doc/$(PACKAGE)
+       $(INSTALL_FILE) TODO README $(TMP)/usr/share/doc/$(PACKAGE)
        #$(INSTALL_FILE) contrib/README.patches contrib/t-prot-r*-gol.diff \
        #       contrib/t-prot-r*-indentms.diff \
        #       $(TMP)/usr/share/doc/$(PACKAGE)/contrib
-       cp -pR contrib/muttrc.t-prot contrib/filter_innd.pl debian/footers \
-               debian/README.footers \
+       cp -pR contrib/muttrc.t-prot contrib/filter_innd.pl \
+               contrib/README.examples debian/footers debian/README.footers \
                $(TMP)/usr/share/doc/$(PACKAGE)/examples
        $(INSTALL_FILE) ChangeLog \
                $(TMP)/usr/share/doc/$(PACKAGE)/changelog