From e6a7d63ae0f029448c1ef1afe6e64747144ceec6 Mon Sep 17 00:00:00 2001 From: Ryan Kavanagh Date: Mon, 15 Feb 2010 16:34:10 -0500 Subject: [PATCH] Switched merge_changelog to merge-changelog --- debian/control | 2 +- debian/copyright | 2 +- merge_changelog => merge-changelog | 6 ++++-- setup.py | 2 +- 4 files changed, 7 insertions(+), 5 deletions(-) rename merge_changelog => merge-changelog (96%) diff --git a/debian/control b/debian/control index bf8c0b3..f30077c 100644 --- a/debian/control +++ b/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. diff --git a/debian/copyright b/debian/copyright index 10881e4..a0ee397 100644 --- a/debian/copyright +++ b/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 diff --git a/merge_changelog b/merge-changelog similarity index 96% rename from merge_changelog rename to merge-changelog index 6d76c6a..5c2d140 100755 --- a/merge_changelog +++ b/merge-changelog @@ -3,6 +3,8 @@ # Copyright ? 2008 Canonical Ltd. # Author: Scott James Remnant . # Hacked up by: Bryce Harrington +# Change merge_changelog to merge-changelog: Ryan Kavanagh +# # # 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 + print '''Usage: merge-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. diff --git a/setup.py b/setup.py index 485a26e..7894064 100755 --- a/setup.py +++ b/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',