install ChangeLog file as changelog and remove the one installed by make install.

diff --git a/debian/changelog b/debian/changelog
index f4d82ec58ea59f7f0d3510b71b43c7327c1c2e3d..7cf0b7e18370bc9a8934506ef85a743cb74750a4 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,12 +3,12 @@ midori (0.3.3-0.1) UNRELEASED; urgency=low
   * Non-maintainer upload.
   * New upstream release.
   * debian/rules:
-    - ignore ChangeLog in dh_installchangelogs since make install already
-      installs it.
+    - install ChangeLog file as changelog and remove the one installed by make
+      install.
   * debian/control:
     - drop dpkg PreDepends.
 
- -- Yves-Alexis Perez <corsac@debian.org>  Tue, 15 Mar 2011 19:29:35 +0100
+ -- Yves-Alexis Perez <corsac@debian.org>  Tue, 15 Mar 2011 22:21:42 +0100
 
 midori (0.3.2-0.1) unstable; urgency=low
 

diff --git a/debian/rules b/debian/rules
index d0136d206cb1631a6ffd390af2d3808803b71645..a6d60298af9eb68e4cc1f2e4f3a2b43d3cf2198f 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -71,4 +71,5 @@ override_dh_strip:
        $(CMD) --dbg-package=midori-dbg
 
 override_dh_installchangelogs:
-       dh_installchangelogs -X ChangeLog
+       rm -f debian/tmp/usr/share/doc/ChangeLog
+       dh_installchangelogs ChangeLog