[DRE-commits] [SCM] ruby-trollop.git branch, master, updated. debian/1.15-1-13-g7194ae8

[Per Andersson]

The following commit has been merged in the master branch:
commit d6d30aefc5379416d47f7ab96cdc75b3fe1abc1f
Author: Per Andersson <avtobiff at gmail.com>
Date:   Fri Apr 13 00:54:27 2012 +0200

    Remove History.txt from docs, shipped automatically.
    
    * Remove Lintian override
    * Update changelog.

diff --git a/debian/changelog b/debian/changelog
index 486b442..e8bf345 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,8 +9,7 @@ ruby-trollop (1.16.2-1) unstable; urgency=low
   * Use source format 3.0 (quilt).
   * Remove unnecessary dirs file.
   * Remove Manifest.txt from docs, no longer shipped.
-  * Override Lintian duplicate-changelog-files, we ship debian and upstream
-    changelogs.
+  * Remove History.txt from docs, shipped automatically.
 
  -- Per Andersson <avtobiff at gmail.com>  Fri, 13 Apr 2012 00:32:19 +0200
 
diff --git a/debian/docs b/debian/docs
index 181da0e..32895ff 100644
--- a/debian/docs
+++ b/debian/docs
@@ -1,3 +1,2 @@
 FAQ.txt
-History.txt
 README.txt
diff --git a/debian/lintian-overrides b/debian/lintian-overrides
deleted file mode 100644
index 9d171bf..0000000
--- a/debian/lintian-overrides
+++ /dev/null
@@ -1,2 +0,0 @@
-# We ship Debian changelog and upstream changelog.
-ruby-trollop binary: duplicate-changelog-files

-- 
ruby-trollop.git