Install UPDATING file, and other /u/s/d cleanups.

diff --git a/debian/changelog b/debian/changelog
index 9fa3880116c10455d42d681f69c29d04e117ccfe..b17189726329a0ebe00fc07afa000519905973cc 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 mutt (1.5.12) UNRELEASED; urgency=low
 
 mutt (1.5.12) UNRELEASED; urgency=low
 

-  * New upstream release.
+  * New upstream release. Ship upstream's UPDATING file as NEWS.gz in
+    /usr/share/doc/mutt.

 
  -- Adeodato Simó <dato@net.com.org.es>  Sat, 15 Jul 2006 01:14:33 +0200
 
 
  -- Adeodato Simó <dato@net.com.org.es>  Sat, 15 Jul 2006 01:14:33 +0200
 

diff --git a/debian/mutt.docs b/debian/mutt.docs
index 58ac1f318476c195143d7a054c56c0cef870f08d..6127f7694479d63080c144f0fa47bac2b0e3b72e 100644 (file)
--- a/debian/mutt.docs
+++ b/debian/mutt.docs
@@ -1,10 +1,11 @@
 debian/extra/README.SMIME
 debian/tmp/README.Patches
 debian/tmp/usr/share/doc/NEWS
 debian/extra/README.SMIME
 debian/tmp/README.Patches
 debian/tmp/usr/share/doc/NEWS

+debian/tmp/usr/share/doc/NEWS.old

 debian/tmp/usr/share/doc/TODO
 debian/tmp/usr/share/doc/README
 debian/tmp/usr/share/doc/README.SSL
 debian/tmp/usr/share/doc/README.SECURITY
 debian/tmp/usr/share/doc/PGP-Notes.txt
 debian/tmp/usr/share/doc/TODO
 debian/tmp/usr/share/doc/README
 debian/tmp/usr/share/doc/README.SSL
 debian/tmp/usr/share/doc/README.SECURITY
 debian/tmp/usr/share/doc/PGP-Notes.txt

-debian/tmp/usr/share/doc/ChangeLog.old
+debian/tmp/usr/share/doc/changelog.old

 debian/tmp/usr/share/doc/manual.txt
 debian/tmp/usr/share/doc/manual.txt

diff --git a/debian/rules b/debian/rules
index f685c0cd4b70dbfe4c927e937f5b5746068d1202..e14021554f8f0f4947c6e6e91c126d3c865f2b39 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -144,8 +144,11 @@ debian/tmp/install-stamp:
        dh_clean
        cd $(objdir) && $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
        
        dh_clean
        cd $(objdir) && $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
        

-       rm -rf debian/tmp/usr/share/doc/samples/iconv
-       rm -rf debian/tmp/usr/share/doc/samples/ca-bundle.crt
+       cd debian/tmp/usr/share/doc; \
+       rm -rf samples/iconv samples/ca-bundle.crt; \
+       mv NEWS NEWS.old; \
+       mv ChangeLog.old changelog.old; \
+       cp $(CURDIR)/UPDATING NEWS

        
        chmod +x debian/extra/lib/*
        chmod +x debian/header.awk
        
        chmod +x debian/extra/lib/*
        chmod +x debian/header.awk