consolidate multiple ALTER TABLE statements for efficiency, modernize deb packaging...

diff --git a/DBSchema.pm b/DBSchema.pm
index ddd899d..c55b823 100644 (file)
--- a/DBSchema.pm
+++ b/DBSchema.pm
@@ -522,7 +522,7 @@ items/projects below under BUGS.
 
 Copyright (c) 2000-2007 Ivan Kohler
 Copyright (c) 2000 Mail Abuse Prevention System LLC
-Copyright (c) 2007-2010 Freeside Internet Services, Inc.
+Copyright (c) 2007-2013 Freeside Internet Services, Inc.
 All rights reserved.
 This program is free software; you can redistribute it and/or modify it under
 the same terms as Perl itself.

diff --git a/DBSchema/DBD/Pg.pm b/DBSchema/DBD/Pg.pm
index c441633..730f638 100644 (file)
--- a/DBSchema/DBD/Pg.pm
+++ b/DBSchema/DBD/Pg.pm
@@ -349,7 +349,7 @@ Ivan Kohler <ivan-dbix-dbschema@420.am>
 
 Copyright (c) 2000 Ivan Kohler
 Copyright (c) 2000 Mail Abuse Prevention System LLC
-Copyright (c) 2009-2010 Freeside Internet Services, Inc.
+Copyright (c) 2009-2013 Freeside Internet Services, Inc.
 All rights reserved.
 This program is free software; you can redistribute it and/or modify it under
 the same terms as Perl itself.

diff --git a/DBSchema/DBD/mysql.pm b/DBSchema/DBD/mysql.pm
index 966996c..c04a3d6 100644 (file)
--- a/DBSchema/DBD/mysql.pm
+++ b/DBSchema/DBD/mysql.pm
@@ -197,7 +197,7 @@ Ivan Kohler <ivan-dbix-dbschema@420.am>
 
 Copyright (c) 2000 Ivan Kohler
 Copyright (c) 2000 Mail Abuse Prevention System LLC
-Copyright (c) 2007-2011 Freeside Internet Services, Inc.
+Copyright (c) 2007-2013 Freeside Internet Services, Inc.
 All rights reserved.
 This program is free software; you can redistribute it and/or modify it under
 the same terms as Perl itself.

diff --git a/DBSchema/Table.pm b/DBSchema/Table.pm
index ab5f83f..020d904 100644 (file)
--- a/DBSchema/Table.pm
+++ b/DBSchema/Table.pm
@@ -623,6 +623,7 @@ sub sql_alter_table {
 
   my $table = $self->name;
 
+  my @at = ()
   my @r = ();
   my @r_later = ();
   my $tempnum = 1;
@@ -768,7 +769,7 @@ with no indices.
 
 Copyright (c) 2000-2007 Ivan Kohler
 Copyright (c) 2000 Mail Abuse Prevention System LLC
-Copyright (c) 2007-2010 Freeside Internet Services, Inc.
+Copyright (c) 2007-2013 Freeside Internet Services, Inc.
 All rights reserved.
 This program is free software; you can redistribute it and/or modify it under
 the same terms as Perl itself.

diff --git a/README b/README
index c380d53..c865469 100644 (file)
--- a/README
+++ b/README
@@ -2,7 +2,7 @@ DBIx::DBSchema
 
 Copyright (c) 2000-2007 Ivan Kohler
 Copyright (c) 2000 Mail Abuse Prevention System LLC
-Copyright (c) 2007-2011 Freeside Internet Services, Inc.
+Copyright (c) 2007-2013 Freeside Internet Services, Inc.
 All rights reserved.
 This program is free software; you can redistribute it and/or modify it under
 the same terms as Perl itself.

diff --git a/debian/changelog b/debian/changelog
index 26adb58..8c74256 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 libdbix-dbschema-perl (0.41~01-1) UNRELEASED; urgency=low
 
   * new upstream (test) release
+  * Modernize deb packaging
 
  -- Ivan Kohler <ivan-debian@420.am>  Sat, 26 Oct 2013 13:32:11 -0700
 

diff --git a/debian/control b/debian/control
index 02f92c0..3271a2e 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,7 @@
 Source: libdbix-dbschema-perl
 Section: perl
 Priority: optional
-Build-Depends: debhelper (>= 4), perl (>= 5.8)
+Build-Depends: debhelper (>= 7), perl (>= 5.8)
 Maintainer: Ivan Kohler <ivan-debian@420.am>
 Standards-Version: 3.5.1
 

diff --git a/debian/copyright b/debian/copyright
index 27676cb..1441d59 100644 (file)
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,8 +1,9 @@
 This is the debian package for the DBIx::DBSchema module.
 It was created by Ivan Kohler <ivan-debian@420.am> using dh-make-perl.
 
-Copyright (c) 2000,2001 Ivan Kohler
+Copyright (c) 2000-2007 Ivan Kohler
 Copyright (c) 2000 Mail Abuse Prevention System LLC
+Copyright (c) 2007-2013 Freeside Internet Services, Inc.
 All rights reserved.
 This program is free software; you can redistribute it and/or modify it under
 the same terms as Perl itself.

diff --git a/debian/rules b/debian/rules
index 3bed994..2d33f6a 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -1,87 +1,4 @@
 #!/usr/bin/make -f
-#-*- makefile -*-
-# Made with the aid of dh_make, by Craig Small
-# Sample debian/rules that uses debhelper. GNU copyright 1997 by Joey Hess.
-# Some lines taken from debmake, by Christoph Lameter.
 
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
-
-PACKAGE=$(shell dh_listpackages)
-
-ifndef PERL
-PERL = /usr/bin/perl
-endif
-
-ifndef DESTDIR
-DESTDIR=..
-endif
-TMP     =`pwd`/debian/$(PACKAGE)
-
-build: build-stamp
-build-stamp:
-       dh_testdir
-
-       
-       # Add here commands to compile the package.
-       $(PERL) Makefile.PL INSTALLDIRS=vendor
-       $(MAKE) OPTIMIZE="-O2 -g -Wall"
-
-       touch build-stamp
-
-clean:
-       dh_testdir
-       dh_testroot
-       rm -f build-stamp
-
-       # Add here commands to clean up after the build process.
-       -$(MAKE) realclean
-
-       dh_clean
-
-install: 
-       dh_testdir
-       dh_testroot
-       dh_clean -k
-       dh_installdirs
-
-       # Add here commands to install the package into debian/tmp.
-       #$(MAKE) install DESTDIR=`pwd`/debian/tmp
-       $(MAKE) install PREFIX=$(TMP)/usr
-
-
-# Build architecture-dependent files here.
-binary-arch: build install
-# We have nothing to do by default.
-
-# Build architecture-independent files here.
-binary-indep: build install
-#      dh_testversion
-       dh_testdir
-       dh_testroot
-       dh_installdocs README
-       dh_installexamples
-       dh_installmenu
-#      dh_installemacsen
-#      dh_installinit
-       dh_installcron
-       dh_installman
-#      dh_undocumented
-       dh_installchangelogs Changes
-       dh_link
-       dh_strip
-       dh_compress
-       dh_fixperms
-#      dh_makeshlibs
-       dh_installdeb
-       dh_perl 
-       dh_shlibdeps
-       dh_gencontrol
-       dh_md5sums
-       dh_builddeb --destdir=$(DESTDIR)
-
-source diff:                                                                  
-       @echo >&2 'source and diff are obsolete - use dpkg-source -b'; false
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary
+%:
+       dh $@