[SCM] Debian packaging of libmysql-diff-perl branch, master, updated. debian/0.43-1-7-gf02839d

gregor herrmann gregoa at debian.org
Fri Apr 6 15:15:51 UTC 2012


The following commit has been merged in the master branch:
commit c8d3b68d323a83b8cc903a65c5cdbdbe0e4fdb60
Author: gregor herrmann <gregoa at debian.org>
Date:   Fri Apr 6 17:08:33 2012 +0200

    Rename mysqldiff script to mysql-schema-diff.
    
    Closes: #663182

diff --git a/debian/patches/rename-script.patch b/debian/patches/rename-script.patch
new file mode 100644
index 0000000..8fca027
--- /dev/null
+++ b/debian/patches/rename-script.patch
@@ -0,0 +1,77 @@
+Description: mysqldiff is renamed to mysql-schema-diff due to a name conflict
+ change the reference to the name in the script/POD.
+ (Doing this via d/rules would be difficult since we don't want to change all strings.)
+Origin: vendor
+Bug-Debian: http://bugs.debian.org/663182
+Forwarded: not-needed
+Author: gregor herrmann <gregoa at debian.org>
+Last-Update: 2012-04-06
+
+--- a/bin/mysqldiff
++++ b/bin/mysqldiff
+@@ -2,17 +2,17 @@
+ 
+ =head1 NAME
+ 
+-mysqldiff - compare MySQL database schemas
++mysql-schema-diff - compare MySQL database schemas
+ 
+ =head1 SYNOPSIS
+ 
+-  mysqldiff [B<options>] B<database1> B<database2>
++  mysql-schema-diff [B<options>] B<database1> B<database2>
+ 
+-  mysqldiff --help
++  mysql-schema-diff --help
+ 
+ =head1 DESCRIPTION
+ 
+-F<mysqldiff> is a Perl script front-end to the
++F<mysql-schema-diff> is a Perl script front-end to the
+ L<CPAN|http://www.perl.com/CPAN> module
+ L<MySQL::Diff|http://search.cpan.org/search?module=MySQL::Diff> which
+ compares the data structures (i.e. schema / table definitions) of two
+@@ -40,28 +40,28 @@
+ =head1 EXAMPLES
+ 
+   # compare table definitions in two files
+-  mysqldiff db1.mysql db2.mysql
++  mysql-schema-diff db1.mysql db2.mysql
+ 
+   # compare table definitions in a file 'db1.mysql' with a database 'db2'
+-  mysqldiff db1.mysql db2
++  mysql-schema-diff db1.mysql db2
+ 
+   # interactively upgrade schema of database 'db1' to be like the
+   # schema described in the file 'db2.mysql'
+-  mysqldiff -A db1 db2.mysql
++  mysql-schema-diff -A db1 db2.mysql
+ 
+   # compare table definitions in two databases on a remote machine
+-  mysqldiff --host=remote.host.com --user=myaccount db1 db2
++  mysql-schema-diff --host=remote.host.com --user=myaccount db1 db2
+ 
+   # compare table definitions in a local database 'foo' with a
+   # database 'bar' on a remote machine, when a file foo already
+   # exists in the current directory
+-  mysqldiff --host2=remote.host.com --password=secret db:foo bar
++  mysql-schema-diff --host2=remote.host.com --password=secret db:foo bar
+ 
+ =head1 OPTIONS
+ 
+ =for comment FIXME - add option docs here
+ 
+-More details to come; for now run C<mysqldiff --help>.
++More details to come; for now run C<mysql-schema-diff --help>.
+ 
+ =head1 INTERNALS
+ 
+@@ -86,7 +86,7 @@
+ =item
+ 
+ Where authentication is required, the hostname, username, and password
+-given by the corresponding options are used (type C<mysqldiff --help>
++given by the corresponding options are used (type C<mysql-schema-diff --help>
+ for more information).
+ 
+ =item
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..e4cb08a
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+rename-script.patch
diff --git a/debian/rules b/debian/rules
index 54705dc..e87fff2 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,5 +1,8 @@
 #!/usr/bin/make -f
 
+PACKAGE = $(shell dh_listpackages)
+TMP     = $(CURDIR)/debian/$(PACKAGE)
+
 TEST_FILES=$(filter-out t/all.t,$(shell echo t/*.t))
 
 %:
@@ -7,3 +10,8 @@ TEST_FILES=$(filter-out t/all.t,$(shell echo t/*.t))
 
 override_dh_auto_test:
 	AUTOMATED_TESTING=1 dh_auto_test -- test_files="$(TEST_FILES)"
+
+override_dh_auto_install:
+	dh_auto_install
+	mv -v $(TMP)/usr/bin/mysqldiff $(TMP)/usr/bin/mysql-schema-diff
+	mv -v $(TMP)/usr/share/man/man1/mysqldiff.1p $(TMP)/usr/share/man/man1/mysql-schema-diff.1p

-- 
Debian packaging of libmysql-diff-perl



More information about the Pkg-perl-cvs-commits mailing list