Merge branch 'upstream'

[pkg/t-prot.git] / debian / rules

diff --git a/debian/rules b/debian/rules
index b6de4d8b5efd35464eca4a6cd4e5f50113bff6ec..0141fe757b8837099d5e57a4c7d943f12912ec45 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -31,20 +31,18 @@ install: build
        #       usr/share/doc/$(PACKAGE)/contrib
        $(INSTALL_SCRIPT) t-prot   $(TMP)/usr/bin
        cd $(TMP)/usr/bin/ && patch t-prot \
-               $(TMP)/../../contrib/t-prot-r*-mutt156.diff
-       cd $(TMP)/usr/bin/ && patch t-prot \
-               $(TMP)/../../contrib/t-prot-r*-gpg125.diff
-       rm $(TMP)/usr/bin/t-prot.orig
+               $(TMP)/../../contrib/t-prot-r*-mutt157.diff
+       -rm -f $(TMP)/usr/bin/t-prot.orig
        $(INSTALL_FILE)   t-prot.1 $(TMP)/usr/share/man/man1
        $(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