~spiv/bzr-builddeb/use-dpkg-mergechangelogs

  • Committer: Andrew Bennetts
  • Date: 2011-07-25 06:26:46 UTC
  • Revision ID: andrew.bennetts@canonical.com-20110725062646-oofmrmfmywavk6ww
Workaround bug 815700 in dpkg-mergechangelogs (it emits slightly non-standard conflict markers), and link to bug 815704 in an XXX comment in a test.
Filename Latest Rev Last Changed Committer Comment Size
..
default.conf 57 17 years ago James Westby * Mark the package as being native so that it wi 25 bytes Diff Download File