Makefile

-# $Id: Makefile 1557 2015-08-17 07:44:52Z coelho $
+# $Id: Makefile 1579 2017-07-07 09:11:54Z coelho $
 
 #
 # PostgreSQL stuff
@@ -6,14 +6,14 @@
 
 name		= pg_comparator
 
+EXTVERSION	= 3.0
 EXTENSION	= pgcmp
 SCRIPTS		= $(name)
 MODULES		= $(EXTENSION)
-DATA_built	= $(name)
-DATA		= pgcmp--3.0.sql
+DATA		= $(EXTENSION)--$(EXTVERSION).sql
 DOCS		= README.$(name)
 
-EXTRA_CLEAN	= $(name).1 $(name).html pod2htm?.tmp
+EXTRA_CLEAN	= $(name).1 $(name).html pod2htm?.tmp $(EXTENSION).control
 
 # get postgresql extension infrastructure
 PG_CONFIG	= pg_config
@@ -36,6 +36,9 @@ pgcmp.o: jenkins.c fnv.c
 pgsql_install: install
 pgsql_uninstall: uninstall
 
+$(EXTENSION).control: $(EXTENSION).control.in
+	sed -e 's/@EXTVERSION@/$(EXTVERSION)/g' $< > $@
+
 #
 # MySQL stuff
 #

debian/changelog

-pg-comparator (2.3.0-3) UNRELEASED; urgency=medium
+pg-comparator (2.3.1-1) unstable; urgency=medium
 
+  * Team upload.
+  * New upstream release.
   * Update copyright-format URL to use HTTPS.
+  * Bump Standards-Version to 4.1.3, no changes.
+  * Refresh patches.
 
- -- Bas Couwenberg <sebastic@debian.org>  Sun, 21 Jan 2018 10:23:08 +0100
+ -- Bas Couwenberg <sebastic@debian.org>  Sun, 18 Mar 2018 17:26:45 +0100
 
 pg-comparator (2.3.0-2) unstable; urgency=medium
 

debian/control

@@ -5,7 +5,7 @@ Section: database
 Priority: optional
 Build-Depends: debhelper (>= 9),
                postgresql-server-dev-all
-Standards-Version: 4.1.1
+Standards-Version: 4.1.3
 Vcs-Browser: https://anonscm.debian.org/cgit/pkg-grass/pg_comparator.git
 Vcs-Git: https://anonscm.debian.org/git/pkg-grass/pg_comparator.git
 Homepage: http://www.coelho.net/pg_comparator/

debian/patches/against-typo.patch

-Description: Fix 'agains' typo, replace with 'against'.
-Author: Bas Couwenberg <sebastic@debian.org>
-Forwarded: http://pgfoundry.org/tracker/index.php?func=detail&aid=1011537&group_id=1000037&atid=232
-
---- a/pg_comparator
-+++ b/pg_comparator
-@@ -240,7 +240,7 @@ when synchronizing, by chunks of the spe
- 
- Name prefix, possibly schema qualified, used for generated comparison tables
- by appending numbers to it. Consider changing the prefix if you expect several
--comparisons to run concurrently agains the same database.
-+comparisons to run concurrently against the same database.
- 
- Default is C<pgc_cmp>. Cheksum tables is named C<pgc_cmp_1_0> and
- C<pgc_cmp_2_0>, and summary tables are named by increasing the last number.

debian/patches/allows-to-typo.patch

@@ -13,12 +13,3 @@ Forwarded: http://pgfoundry.org/tracker/?func=detail&group_id=1000037&aid=101144
  Short one-letter options are also available, usually with the first letter
  of the option name.
  
-@@ -1195,7 +1195,7 @@ Add an option to avoid IN (x,y,...) synt
- to hold values and use a JOIN on that. I'm not sure about the performance
- implications, though.
- 
--Allow to generate the SQL update script without applying it.
-+Allow generating the SQL update script without applying it.
- 
- Option to generate more compact updates, i.e. only update attributes with
- different values.

debian/patches/below-typo.patch

-Description: Fix 'bellow' typo, replace with 'below'.
-Author: Bas Couwenberg <sebastic@debian.org>
-Forwarded: http://pgfoundry.org/tracker/index.php?func=detail&aid=1011537&group_id=1000037&atid=232
-
---- a/pg_comparator
-+++ b/pg_comparator
-@@ -4,7 +4,7 @@
- #
- # HELP 1: pg_comparator --man
- # HELP 2: pod2text pg_comparator
--# HELP 3: read pod stuff bellow with your favorite text viewer
-+# HELP 3: read pod stuff below with your favorite text viewer
- #
- 
- use strict;   # I don't like perl
-@@ -404,7 +404,7 @@ that does not necessary mean anything us
- 
-   [driver://][login[:pass]@][host][:port]/[base/[[schema.]table[?key[:cols]]]]
- 
--See the EXAMPLES section bellow, and also the C<--source-*> options above.
-+See the EXAMPLES section below, and also the C<--source-*> options above.
- 
- Note that some default value used by DBI drivers may be changed with
- driver-specific environment variables, and that DBI also provides its own

debian/patches/extension-control.patch

@@ -3,39 +3,15 @@ Description: Add extension control file.
   make[1]: *** No rule to make target 'pgcmp.control', needed by 'all'.  Stop.
 Author: Bas Couwenberg <sebastic@debian.org>
 
+--- a/pgcmp.control
++++ /dev/null
+@@ -1,3 +0,0 @@
+-# pg_comparator extension
+-comment = 'pg_comparator extension'
+-default_version = 3.0
 --- /dev/null
 +++ b/pgcmp.control.in
 @@ -0,0 +1,3 @@
 +# pg_comparator extension
 +comment = 'pg_comparator extension'
 +default_version = @EXTVERSION@
---- a/Makefile
-+++ b/Makefile
-@@ -6,13 +6,15 @@
- 
- name		= pg_comparator
- 
-+EXTVERSION      = 3.0
-+
- EXTENSION	= pgcmp
- SCRIPTS		= $(name)
- MODULES		= $(EXTENSION)
--DATA		= pgcmp--3.0.sql
-+DATA		= $(EXTENSION)--$(EXTVERSION).sql
- DOCS		= README.$(name)
- 
--EXTRA_CLEAN	= $(name).1 $(name).html pod2htm?.tmp
-+EXTRA_CLEAN	= $(name).1 $(name).html pod2htm?.tmp $(EXTENSION).control
- 
- # get postgresql extension infrastructure
- PG_CONFIG	= pg_config
-@@ -35,6 +37,9 @@ pgcmp.o: jenkins.c fnv.c
- pgsql_install: install
- pgsql_uninstall: uninstall
- 
-+$(EXTENSION).control: $(EXTENSION).control.in
-+	sed -e 's/@EXTVERSION@/$(EXTVERSION)/g' $< > $@
-+
- #
- # MySQL stuff
- #

debian/patches/make-clean.patch

-Description: Don't remove pg_comparator script in clean target.
- It's a script, not data that needs to be built (and removed on clean).
-Author: Bas Couwenberg <sebastic@debian.org>
-
---- a/Makefile
-+++ b/Makefile
-@@ -9,7 +9,6 @@ name		= pg_comparator
- EXTENSION	= pgcmp
- SCRIPTS		= $(name)
- MODULES		= $(EXTENSION)
--DATA_built	= $(name)
- DATA		= pgcmp--3.0.sql
- DOCS		= README.$(name)
- 

debian/patches/minimum-typo.patch

-Description: Fix 'mimimum' typo, replace with 'minimum'.
-Author: Bas Couwenberg <sebastic@debian.org>
-Forwarded: http://pgfoundry.org/tracker/index.php?func=detail&aid=1011629&group_id=1000037&atid=232
-
---- a/pg_comparator
-+++ b/pg_comparator
-@@ -203,7 +203,7 @@ option is ignored, otherwise the effort
- the table size is known.
- 
- Default is to compute the maximum number of reported differences based on
--the C<--max-ratio> option, with a mimimum of 100 differences allowed.
-+the C<--max-ratio> option, with a minimum of 100 differences allowed.
- 
- =item C<--max-levels=0>
- 

debian/patches/series

 allows-to-typo.patch
-against-typo.patch
-below-typo.patch
-minimum-typo.patch
-make-clean.patch
 extension-control.patch
 checksum-typo.patch

pg_comparator

 #!/usr/bin/env perl
 #
-# $Id: pg_comparator.pl 1569 2017-07-07 04:28:00Z coelho $
+# $Id: pg_comparator.pl 1582 2017-07-07 10:21:41Z coelho $
 #
 # HELP 1: pg_comparator --man
 # HELP 2: pod2text pg_comparator
-# HELP 3: read pod stuff bellow with your favorite text viewer
+# HELP 3: read pod stuff below with your favorite text viewer
 #
 
 use strict;   # I don't like perl
@@ -203,7 +203,7 @@ option is ignored, otherwise the effort is computed with the ratio once
 the table size is known.
 
 Default is to compute the maximum number of reported differences based on
-the C<--max-ratio> option, with a mimimum of 100 differences allowed.
+the C<--max-ratio> option, with a minimum of 100 differences allowed.
 
 =item C<--max-levels=0>
 
@@ -240,7 +240,7 @@ when synchronizing, by chunks of the specified size.
 
 Name prefix, possibly schema qualified, used for generated comparison tables
 by appending numbers to it. Consider changing the prefix if you expect several
-comparisons to run concurrently agains the same database.
+comparisons to run concurrently against the same database.
 
 Default is C<pgc_cmp>. Cheksum tables is named C<pgc_cmp_1_0> and
 C<pgc_cmp_2_0>, and summary tables are named by increasing the last number.
@@ -404,7 +404,7 @@ that does not necessary mean anything useful.
 
   [driver://][login[:pass]@][host][:port]/[base/[[schema.]table[?key[:cols]]]]
 
-See the EXAMPLES section bellow, and also the C<--source-*> options above.
+See the EXAMPLES section below, and also the C<--source-*> options above.
 
 Note that some default value used by DBI drivers may be changed with
 driver-specific environment variables, and that DBI also provides its own
@@ -585,7 +585,7 @@ This section describes how to install extensions (functions, casts, aggregates)
 needed by pg_comparator for the different target databases.
 
 First, get pg_comparator
-L<sources|http://www.coelho.net/pg_comparator/pg_comparator-2.3.0.tgz>.
+L<sources|http://www.coelho.net/pg_comparator/pg_comparator-2.3.1.tgz>.
 
 =head2 PostgreSQL
 
@@ -1195,7 +1195,7 @@ Add an option to avoid IN (x,y,...) syntax, maybe with a temporary table
 to hold values and use a JOIN on that. I'm not sure about the performance
 implications, though.
 
-Allow to generate the SQL update script without applying it.
+Allow generating the SQL update script without applying it.
 
 Option to generate more compact updates, i.e. only update attributes with
 different values.
@@ -1208,15 +1208,19 @@ L<github repos|https://github.com/zx80/pg_comparator>.
 
 =over 4
 
+=item B<version 2.3.1> (r1582 on 2017-07-07)
+
+Fix spelling errors in the documentation, reported by I<Bas Couwenberg>.
+Fix distribution C<Makefile>.
+
 =item B<version 2.3.0> (r1569 on 2017-07-07)
 
 Add new L</"INSTALL"> Section.
 Turn cast, functions and aggregates into a PostgreSQL extension.
 Fix C<--where> handling when C<--tcs> is used, reported by I<Kenneth Hammink>.
 Add C<--pg-text-cast> option to work around missing implicit casts, issue
-reported by Saulius Grigaitis.
+reported by I<Saulius Grigaitis>.
 Documentation updates.
-
 The I<release> validation was run successfully
 on PostgreSQL 9.6.3 and MySQL 5.7.18.
 
@@ -1513,8 +1517,8 @@ saying so. See my webpage for current address.
 
 =cut
 
-my $script_version = '2.3.0 (r1569)';
-my $revision = '$Revision: 1569 $';
+my $script_version = '2.3.1 (r1582)';
+my $revision = '$Revision: 1582 $';
 $revision =~ tr/0-9//cd;
 
 ################################################################# SOME DEFAULTS

pgcmp.control

+# pg_comparator extension
+comment = 'pg_comparator extension'
+default_version = 3.0