Bug#169101: cluttered .diff.gz

[Matthew Wilcox <willy@debian.org>]

Package: gcc-3.2
Version: 3.2.1ds5-0pre6
Severity: minor

I was just reviewing the .diff.gz to prove a point (Debian diverges
significantly from upstream!  Does not!  Does too!  Does not!) and I
noticed several files were present in CVS conflict version; ie:

+++ gcc-3.2-3.2.1ds5/debian/.#changelog.1.6
+++ gcc-3.2-3.2.1ds5/debian/.#control.1.5
+++ gcc-3.2-3.2.1ds5/debian/.#fastjar.postinst.1.1
+++ gcc-3.2-3.2.1ds5/debian/.#gij-3.1.postinst.1.1
+++ gcc-3.2-3.2.1ds5/debian/.#rules.conf.1.4
+++ gcc-3.2-3.2.1ds5/debian/.#rules.defs.1.7
+++ gcc-3.2-3.2.1ds5/debian/.#rules.patch.1.7
+++ gcc-3.2-3.2.1ds5/debian/.#rules.unpack.1.4
+++ gcc-3.2-3.2.1ds5/debian/.#rules2.1.7
+++ gcc-3.2-3.2.1ds5/debian/.#rules.unpack.1.2
+++ gcc-3.2-3.2.1ds5/debian/.#changelog.1.11
+++ gcc-3.2-3.2.1ds5/debian/.#changelog.1.13
+++ gcc-3.2-3.2.1ds5/debian/.#rules.patch.1.5
+++ gcc-3.2-3.2.1ds5/debian/.#changelog.1.16

Deleting these files shaves 140k off the size of the .diff.gz:

-rw-r--r--    1 willy    willy     1738751 Nov 14 09:39 gcc-3.2_3.2.1ds5-0pre6-willy.diff.gz
-rw-r--r--    1 willy    willy     1884666 Nov 14 09:26 gcc-3.2_3.2.1ds5-0pre6.diff.gz

-- 
Revolutions do not require corporate support.