# HG changeset patch # User Paul Boddie # Date 1265326974 -3600 # Node ID 6b30c9cd97db68c18d18865f6f729cfc916bc637 # Parent b85b3395e6f7d04c063c4d64293e4fce9809eefc Fixed the packaging infrastructure, renaming the python-desktop directory to python-sqlliterals. Added Debian Lenny support. Changed the setup.py script to not try and import sqlliterals. diff -r b85b3395e6f7 -r 6b30c9cd97db README.txt --- a/README.txt Mon Sep 28 21:11:58 2009 +0200 +++ b/README.txt Fri Feb 05 00:42:54 2010 +0100 @@ -54,7 +54,7 @@ Update the release notes (see above). Update the package information. Check the release information in the PKG-INFO file. -Check the setup.py file. +Check the setup.py file (including the package version). Tag, export. Archive, upload. Update PyPI entry. diff -r b85b3395e6f7 -r 6b30c9cd97db packages/debian-lenny/python-sqlliterals/debian/changelog --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/packages/debian-lenny/python-sqlliterals/debian/changelog Fri Feb 05 00:42:54 2010 +0100 @@ -0,0 +1,12 @@ +sqlliterals (0.2.1-1) lenny; urgency=low + + * Fixed packaging infrastructure, adding Debian Lenny + support. + + -- Paul Boddie Fri, 05 Feb 2010 00:36:40 +0100 + +sqlliterals (0.2.1-0ubuntu1) gutsy; urgency=low + + * Added packaging infrastructure and setup script. + + -- Paul Boddie Sun, 18 Jan 2009 18:42:07 +0100 diff -r b85b3395e6f7 -r 6b30c9cd97db packages/debian-lenny/python-sqlliterals/debian/compat --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/packages/debian-lenny/python-sqlliterals/debian/compat Fri Feb 05 00:42:54 2010 +0100 @@ -0,0 +1,1 @@ +5 diff -r b85b3395e6f7 -r 6b30c9cd97db packages/debian-lenny/python-sqlliterals/debian/control --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/packages/debian-lenny/python-sqlliterals/debian/control Fri Feb 05 00:42:54 2010 +0100 @@ -0,0 +1,16 @@ +Source: sqlliterals +Section: python +Priority: optional +Maintainer: Paul Boddie +Build-Depends: debhelper (>= 5.0.38), python-all-dev (>= 2.3.5-11), python-central (>= 0.5.6) +XS-Python-Version: all +Standards-Version: 3.7.2.1 + +Package: python-sqlliterals +Architecture: all +Depends: ${python:Depends}, python-pyparsing (>= 1.4.2-1.1ubuntu1) +XB-Python-Version: ${python:Versions} +Description: SQL statement tokenisation for the detection of literal regions + The sqlliterals distribution consists of a package containing two different + implementations of SQL statement tokenisation for the detection of literal + regions in such statements. diff -r b85b3395e6f7 -r 6b30c9cd97db packages/debian-lenny/python-sqlliterals/debian/copyright --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/packages/debian-lenny/python-sqlliterals/debian/copyright Fri Feb 05 00:42:54 2010 +0100 @@ -0,0 +1,32 @@ +Package creator: + + Paul Boddie + +The origin of the package is: + + http://www.python.org/pypi/sqlliterals + +Package author: + + Paul Boddie + +Copyright: + +Licence Agreement for sqlliterals +--------------------------------- + +Copyright (C) 2007, 2009 Paul Boddie + +This library is free software; you can redistribute it and/or +modify it under the terms of the GNU Lesser General Public +License as published by the Free Software Foundation; either +version 2.1 of the License, or (at your option) any later version. + +This library is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +Lesser General Public License for more details. + +You should have received a copy of the GNU Lesser General Public +License along with this library; if not, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA diff -r b85b3395e6f7 -r 6b30c9cd97db packages/debian-lenny/python-sqlliterals/debian/docs --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/packages/debian-lenny/python-sqlliterals/debian/docs Fri Feb 05 00:42:54 2010 +0100 @@ -0,0 +1,2 @@ +README.txt +docs diff -r b85b3395e6f7 -r 6b30c9cd97db packages/debian-lenny/python-sqlliterals/debian/rules --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/packages/debian-lenny/python-sqlliterals/debian/rules Fri Feb 05 00:42:54 2010 +0100 @@ -0,0 +1,66 @@ +#!/usr/bin/make -f +# A debian/rules file using python-central. + +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 + +export DH_COMPAT=5 + +PYVERS=$(shell pyversions -vr) + +build: build-stamp + +build-stamp: $(PYVERS:%=build-python%) build-python-scripts + touch $@ + +build-python%: + python$* setup.py build_py + touch $@ + +build-python-scripts: + #python setup.py build_scripts + #touch $@ + +clean: + dh_testdir + dh_testroot + rm -f *-stamp + rm -rf build + find . -name '*.py[co]' | xargs rm -f + dh_clean + +install: build install-prereq $(PYVERS:%=install-python%) install-python-scripts + # Script fixing would appear here. + +install-prereq: + dh_testdir + dh_testroot + dh_clean -k + +install-python%: + python$* setup.py install_lib --install-dir $(CURDIR)/debian/python-sqlliterals/usr/lib/python$*/site-packages + +install-python-scripts: + #python setup.py install_scripts --install-dir $(CURDIR)/debian/python-sqlliterals/usr/bin + +# Build architecture-independent files here. + +binary-indep: install + #tools/apidocs.sh + dh_testdir -i + dh_testroot -i + dh_pycentral -i + dh_installdocs -i + dh_fixperms -i + dh_installdeb -i + dh_gencontrol -i + dh_md5sums -i + dh_builddeb -i + +# Build architecture-dependent files here. + +binary-arch: + # Empty rule for this package. + +binary: binary-indep binary-arch +.PHONY: build clean binary-arch binary-indep binary install diff -r b85b3395e6f7 -r 6b30c9cd97db packages/ubuntu-gutsy/python-desktop/debian/changelog --- a/packages/ubuntu-gutsy/python-desktop/debian/changelog Mon Sep 28 21:11:58 2009 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,5 +0,0 @@ -sqlliterals (0.2.1-0ubuntu1) gutsy; urgency=low - - * Added packaging infrastructure and setup script. - - -- Paul Boddie Sun, 18 Jan 2009 18:42:07 +0100 diff -r b85b3395e6f7 -r 6b30c9cd97db packages/ubuntu-gutsy/python-desktop/debian/compat --- a/packages/ubuntu-gutsy/python-desktop/debian/compat Mon Sep 28 21:11:58 2009 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -5 diff -r b85b3395e6f7 -r 6b30c9cd97db packages/ubuntu-gutsy/python-desktop/debian/control --- a/packages/ubuntu-gutsy/python-desktop/debian/control Mon Sep 28 21:11:58 2009 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,16 +0,0 @@ -Source: sqlliterals -Section: python -Priority: optional -Maintainer: Paul Boddie -Build-Depends: debhelper (>= 5.0.38), python-all-dev (>= 2.3.5-11), python-central (>= 0.5.6) -XS-Python-Version: all -Standards-Version: 3.7.2.1 - -Package: python-sqlliterals -Architecture: all -Depends: ${python:Depends}, python-pyparsing (>= 1.4.2-1.1ubuntu1) -XB-Python-Version: ${python:Versions} -Description: SQL statement tokenisation for the detection of literal regions - The sqlliterals distribution consists of a package containing two different - implementations of SQL statement tokenisation for the detection of literal - regions in such statements. diff -r b85b3395e6f7 -r 6b30c9cd97db packages/ubuntu-gutsy/python-desktop/debian/copyright --- a/packages/ubuntu-gutsy/python-desktop/debian/copyright Mon Sep 28 21:11:58 2009 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,32 +0,0 @@ -Package creator: - - Paul Boddie - -The origin of the package is: - - http://www.python.org/pypi/sqlliterals - -Package author: - - Paul Boddie - -Copyright: - -Licence Agreement for sqlliterals ---------------------------------- - -Copyright (C) 2007, 2009 Paul Boddie - -This library is free software; you can redistribute it and/or -modify it under the terms of the GNU Lesser General Public -License as published by the Free Software Foundation; either -version 2.1 of the License, or (at your option) any later version. - -This library is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -Lesser General Public License for more details. - -You should have received a copy of the GNU Lesser General Public -License along with this library; if not, write to the Free Software -Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA diff -r b85b3395e6f7 -r 6b30c9cd97db packages/ubuntu-gutsy/python-desktop/debian/docs --- a/packages/ubuntu-gutsy/python-desktop/debian/docs Mon Sep 28 21:11:58 2009 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,2 +0,0 @@ -README.txt -docs diff -r b85b3395e6f7 -r 6b30c9cd97db packages/ubuntu-gutsy/python-desktop/debian/rules --- a/packages/ubuntu-gutsy/python-desktop/debian/rules Mon Sep 28 21:11:58 2009 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,66 +0,0 @@ -#!/usr/bin/make -f -# A debian/rules file using python-central. - -# Uncomment this to turn on verbose mode. -#export DH_VERBOSE=1 - -export DH_COMPAT=5 - -PYVERS=$(shell pyversions -vr) - -build: build-stamp - -build-stamp: $(PYVERS:%=build-python%) build-python-scripts - touch $@ - -build-python%: - python$* setup.py build_py - touch $@ - -build-python-scripts: - #python setup.py build_scripts - #touch $@ - -clean: - dh_testdir - dh_testroot - rm -f *-stamp - rm -rf build - find . -name '*.py[co]' | xargs rm -f - dh_clean - -install: build install-prereq $(PYVERS:%=install-python%) install-python-scripts - # Script fixing would appear here. - -install-prereq: - dh_testdir - dh_testroot - dh_clean -k - -install-python%: - python$* setup.py install_lib --install-dir $(CURDIR)/debian/python-sqlliterals/usr/lib/python$*/site-packages - -install-python-scripts: - #python setup.py install_scripts --install-dir $(CURDIR)/debian/python-sqlliterals/usr/bin - -# Build architecture-independent files here. - -binary-indep: install - #tools/apidocs.sh - dh_testdir -i - dh_testroot -i - dh_pycentral -i - dh_installdocs -i - dh_fixperms -i - dh_installdeb -i - dh_gencontrol -i - dh_md5sums -i - dh_builddeb -i - -# Build architecture-dependent files here. - -binary-arch: - # Empty rule for this package. - -binary: binary-indep binary-arch -.PHONY: build clean binary-arch binary-indep binary install diff -r b85b3395e6f7 -r 6b30c9cd97db packages/ubuntu-gutsy/python-sqlliterals/debian/changelog --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/packages/ubuntu-gutsy/python-sqlliterals/debian/changelog Fri Feb 05 00:42:54 2010 +0100 @@ -0,0 +1,12 @@ +sqlliterals (0.2.1-1) gutsy; urgency=low + + * Fixed packaging infrastructure, adding Debian Lenny + support. + + -- Paul Boddie Fri, 05 Feb 2010 00:37:38 +0100 + +sqlliterals (0.2.1-0ubuntu1) gutsy; urgency=low + + * Added packaging infrastructure and setup script. + + -- Paul Boddie Sun, 18 Jan 2009 18:42:07 +0100 diff -r b85b3395e6f7 -r 6b30c9cd97db packages/ubuntu-gutsy/python-sqlliterals/debian/compat --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/packages/ubuntu-gutsy/python-sqlliterals/debian/compat Fri Feb 05 00:42:54 2010 +0100 @@ -0,0 +1,1 @@ +5 diff -r b85b3395e6f7 -r 6b30c9cd97db packages/ubuntu-gutsy/python-sqlliterals/debian/control --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/packages/ubuntu-gutsy/python-sqlliterals/debian/control Fri Feb 05 00:42:54 2010 +0100 @@ -0,0 +1,16 @@ +Source: sqlliterals +Section: python +Priority: optional +Maintainer: Paul Boddie +Build-Depends: debhelper (>= 5.0.38), python-all-dev (>= 2.3.5-11), python-central (>= 0.5.6) +XS-Python-Version: all +Standards-Version: 3.7.2.1 + +Package: python-sqlliterals +Architecture: all +Depends: ${python:Depends}, python-pyparsing (>= 1.4.2-1.1ubuntu1) +XB-Python-Version: ${python:Versions} +Description: SQL statement tokenisation for the detection of literal regions + The sqlliterals distribution consists of a package containing two different + implementations of SQL statement tokenisation for the detection of literal + regions in such statements. diff -r b85b3395e6f7 -r 6b30c9cd97db packages/ubuntu-gutsy/python-sqlliterals/debian/copyright --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/packages/ubuntu-gutsy/python-sqlliterals/debian/copyright Fri Feb 05 00:42:54 2010 +0100 @@ -0,0 +1,32 @@ +Package creator: + + Paul Boddie + +The origin of the package is: + + http://www.python.org/pypi/sqlliterals + +Package author: + + Paul Boddie + +Copyright: + +Licence Agreement for sqlliterals +--------------------------------- + +Copyright (C) 2007, 2009 Paul Boddie + +This library is free software; you can redistribute it and/or +modify it under the terms of the GNU Lesser General Public +License as published by the Free Software Foundation; either +version 2.1 of the License, or (at your option) any later version. + +This library is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +Lesser General Public License for more details. + +You should have received a copy of the GNU Lesser General Public +License along with this library; if not, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA diff -r b85b3395e6f7 -r 6b30c9cd97db packages/ubuntu-gutsy/python-sqlliterals/debian/docs --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/packages/ubuntu-gutsy/python-sqlliterals/debian/docs Fri Feb 05 00:42:54 2010 +0100 @@ -0,0 +1,2 @@ +README.txt +docs diff -r b85b3395e6f7 -r 6b30c9cd97db packages/ubuntu-gutsy/python-sqlliterals/debian/rules --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/packages/ubuntu-gutsy/python-sqlliterals/debian/rules Fri Feb 05 00:42:54 2010 +0100 @@ -0,0 +1,66 @@ +#!/usr/bin/make -f +# A debian/rules file using python-central. + +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 + +export DH_COMPAT=5 + +PYVERS=$(shell pyversions -vr) + +build: build-stamp + +build-stamp: $(PYVERS:%=build-python%) build-python-scripts + touch $@ + +build-python%: + python$* setup.py build_py + touch $@ + +build-python-scripts: + #python setup.py build_scripts + #touch $@ + +clean: + dh_testdir + dh_testroot + rm -f *-stamp + rm -rf build + find . -name '*.py[co]' | xargs rm -f + dh_clean + +install: build install-prereq $(PYVERS:%=install-python%) install-python-scripts + # Script fixing would appear here. + +install-prereq: + dh_testdir + dh_testroot + dh_clean -k + +install-python%: + python$* setup.py install_lib --install-dir $(CURDIR)/debian/python-sqlliterals/usr/lib/python$*/site-packages + +install-python-scripts: + #python setup.py install_scripts --install-dir $(CURDIR)/debian/python-sqlliterals/usr/bin + +# Build architecture-independent files here. + +binary-indep: install + #tools/apidocs.sh + dh_testdir -i + dh_testroot -i + dh_pycentral -i + dh_installdocs -i + dh_fixperms -i + dh_installdeb -i + dh_gencontrol -i + dh_md5sums -i + dh_builddeb -i + +# Build architecture-dependent files here. + +binary-arch: + # Empty rule for this package. + +binary: binary-indep binary-arch +.PHONY: build clean binary-arch binary-indep binary install diff -r b85b3395e6f7 -r 6b30c9cd97db setup.py --- a/setup.py Mon Sep 28 21:11:58 2009 +0200 +++ b/setup.py Fri Feb 05 00:42:54 2010 +0100 @@ -2,14 +2,12 @@ from distutils.core import setup -import sqlliterals - setup( name = "sqlliterals", description = "SQL statement tokenisation for the detection of literal regions.", author = "Paul Boddie", author_email = "paul@boddie.org.uk", url = "http://www.python.org/pypi/sqlliterals", - version = sqlliterals.__version__, + version = "0.2.1", packages = ["sqlliterals"] )