Merge tag 'upstream/3.1'

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

diff --git a/debian/rules b/debian/rules
index f55ee4ace36389d4cc5aee320f25df0c5967c245..47faed4e29eaa068aa0b3b35377da5e1ef124d60 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -17,12 +17,14 @@ clean:
        $(checkdir)
        $(checkroot)
        -rm -rf $(TMP) debian/files debian/stamp-*
+       $(MAKE) -f /usr/share/quilt/quilt.make unpatch
 
 build: build-arch build-indep
 build-arch: debian/stamp-build
 build-indep: debian/stamp-build
 debian/stamp-build:
-       # uhm, build for a binary-indep package?  Don't try to be funny ;)
+       # only thing to do is apply the patches ...
+       $(MAKE) -f /usr/share/quilt/quilt.make patch
        touch debian/stamp-build
 
 
@@ -37,21 +39,12 @@ debian/stamp-install: build
                usr/share/doc/$(PKG)/examples
        #       usr/share/doc/$(PKG)/contrib
        $(INSTALL_SCRIPT) t-prot   $(TMP)/usr/bin
-       patch $(TMP)/usr/bin/t-prot \
-               contrib/t-prot-r*-mutt15*.diff
-       -rm -f $(TMP)/usr/bin/t-prot.orig
        $(INSTALL_FILE)   t-prot.1 $(TMP)/usr/share/man/man1
        $(INSTALL_FILE) debian/Muttrc     $(TMP)/etc/t-prot
        $(INSTALL_FILE) debian/footers/*  $(TMP)/etc/t-prot/footers
        $(INSTALL_FILE) contrib/t-prot.sl $(TMP)/usr/share/slrn/macros
-       patch $(TMP)/usr/share/slrn/macros/t-prot.sl \
-               contrib/t-prot.sl-slang2.diff
-       -rm -f $(TMP)/usr/share/slrn/macros/t-prot.sl.orig
 
        $(INSTALL_FILE) TODO README $(TMP)/usr/share/doc/$(PKG)
-       #$(INSTALL_FILE) contrib/README.patches contrib/t-prot-r*-gol.diff \
-       #       \
-       #       $(TMP)/usr/share/doc/$(PKG)/contrib
        $(INSTALL_FILE) contrib/filter_innd.pl contrib/README.examples \
                $(TMP)/usr/share/doc/$(PKG)/examples
        $(INSTALL_FILE) ChangeLog \