Switched merge_changelog to merge-changelog

debian/control

@@ -45,7 +45,7 @@ Description: useful tools for Ubuntu developers
   - lp-set-dup - sets the "duplicate of" bug of a bug and its dups.
   - manage-credentials - manage Launchpad token credentials.
   - massfile - fill multiple bugs using a template.
-  - merge_changelog - manually merges two Debian changelogs with the same base
+  - merge-changelog - manually merges two Debian changelogs with the same base
     version.
   - mk-sbuild-lv - script to create LVM snapshot chroots via schroot and
     sbuild.

debian/copyright

@@ -69,7 +69,7 @@ On Debian and Ubuntu systems, the complete text of the GNU General Public
 License v2 can be found in `/usr/share/common-licenses/GPL-2'.
 
 dch-repeat, get-branches, get-build-deps, grab-attachments, grab-merge,
-hugdaylist, manage-credentials, massfile, merge_changelog, mk-sbuild-lv,
+hugdaylist, manage-credentials, massfile, merge-changelog, mk-sbuild-lv,
 pbuilder-dist-simple, ppaput, pull-debian-debdiff, pull-debian-source,
 pull-lp-source, pull-revu-source, setup-packaging-environment,
 suspicious-source, ubuntu-build and what-patch are licensed under the GNU

merge-changelog

@@ -3,6 +3,8 @@
 # Copyright ? 2008 Canonical Ltd.
 # Author: Scott James Remnant <scott at ubuntu.com>.
 # Hacked up by: Bryce Harrington <bryce at ubuntu.com>
+# Change merge_changelog to merge-changelog: Ryan Kavanagh
+#                                            <ryanakca@kubuntu.org>
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of version 3 of the GNU General Public License as
@@ -22,9 +24,9 @@ from stat import *
 from textwrap import fill
 
 def usage():
-    print '''Usage: merge_changelog <left changelog> <right changelog>
+    print '''Usage: merge-changelog <left changelog> <right changelog>
 
-merge_changelog takes two changelogs that once shared a common source, 
+merge-changelog takes two changelogs that once shared a common source, 
 merges them back together, and prints the merged result to stdout.  This
 is useful if you need to manually merge a ubuntu package with a new
 Debian release of the package.

setup.py

@@ -29,7 +29,7 @@ setup(name='ubuntu-dev-tools',
                'lp-shell',
                'manage-credentials',
                'massfile',
-               'merge_changelog',
+               'merge-changelog',
                'mk-sbuild',
                'pbuilder-dist',
                'pbuilder-dist-simple',