Package: gadfly
Version: 1.0.0-3
Severity: wishlist
Tags: patch

below is a patch that changes the way that gadfly is packaged. here are
the changes that this patch makes:

  * Trying to shorten the descriptions.
  * Split up the packages differently.
    - Binaries are in gadfly pacakge.
    - Python modules are in pythonX.X-gadfly.
  * Removing Conflicts:/Replaces: with python-kwparsing, as it hasn't
    existed since hamm or so.
  * Fix wierd kjbuckets version scheme.

this patch primarily tries to create a python2.1-gadfly and a
python2.2-gadfly. i have tested it and verified that it works.

diff -urN gadfly.orig/debian/control gadfly/debian/control
--- gadfly.orig/debian/control  2003-02-04 20:59:25.000000000 -0600
+++ gadfly/debian/control       2003-02-15 20:54:48.000000000 -0600
@@ -7,28 +7,82 @@
 
 Package: gadfly
 Architecture: all
+Depends: python-gadfly
+Description: Server and interactive shell for Gadfly SQL database
+ Gadfly is a relational database management system which uses a large
+ subset of very standard SQL as its query language. The underlying
+ engine consists of Python modules. Gadfly stores the active database
+ in memory, with logging to a file system for recovery from system or
+ software failures (but not for disk failures).
+ .
+ This package contains an interactive shell and a server for use with
+ the Gadfly SQL database.
+
+Package: python-gadfly
+Architecture: all
+Depends: python2.2-gadfly
+Recommends: python-kjbuckets
+Description: SQL database and parser generator for Python [dummy package]
+ Gadfly is a relational database management system which uses a large
+ subset of very standard SQL as its query language. The underlying
+ engine consists of Python modules. Gadfly stores the active database
+ in memory, with logging to a file system for recovery from system or
+ software failures (but not for disk failures).
+ .
+ kwParser, included as part of the Gadfly package, is a parser
+ generator for Python. It transforms an abstract specification of a
+ language grammar (for example, the CORBA Interface Definition
+ Language), together with "interpretation functions" that define the
+ semantics of the language, into a compiler or translator or
+ interpreter.
+ .
+ This Debian package is an empty dummy package that always depends on
+ a package built for Debian's default Python version.
+
+Package: python2.1-gadfly
+Architecture: all
+Depends: ${python:Depends}
+Recommends: python2.1-kjbuckets
+Description: SQL database and parser generator for Python 2.1
+ Gadfly is a relational database management system which uses a large
+ subset of very standard SQL as its query language. The underlying
+ engine consists of Python modules. Gadfly stores the active database
+ in memory, with logging to a file system for recovery from system or
+ software failures (but not for disk failures).
+ .
+ kwParser, included as part of the Gadfly package, is a parser
+ generator for Python. It transforms an abstract specification of a
+ language grammar (for example, the CORBA Interface Definition
+ Language), together with "interpretation functions" that define the
+ semantics of the language, into a compiler or translator or
+ interpreter.
+ .
+ This Debian package is built for Python 2.1.
+
+Package: python2.2-gadfly
+Architecture: all
 Depends: ${python:Depends}
 Recommends: python2.2-kjbuckets
-Replaces: python-kwparsing
-Conflicts: python-kwparsing
-Description: SQL database and parser generator in Python
- Gadfly is a relational database management system which uses a
- large subset of very standard SQL as its query language and Python
- modules and optional Python/C extension modules as its underlying
- engine.  Gadfly stores the active database in memory, with recovery
- logging to a file system. It supports an optional TCP/IP based
- client server mode and log based failure recovery for system or
+Replaces: gadfly (<< 1.0.0-3)
+Description: SQL database and parser generator for Python 2.2
+ Gadfly is a relational database management system which uses a large
+ subset of very standard SQL as its query language. The underlying
+ engine consists of Python modules. Gadfly stores the active database
+ in memory, with logging to a file system for recovery from system or
  software failures (but not for disk failures).
  .
  kwParser, included as part of the Gadfly package, is a parser
- generator for Python.  It transforms an abstract specification of a
- language grammar (for example the CORBA Interface Definition Language)
- together with "interpretation functions" that define the semantics of
- the language into a compiler or translator or interpreter.
+ generator for Python. It transforms an abstract specification of a
+ language grammar (for example, the CORBA Interface Definition
+ Language), together with "interpretation functions" that define the
+ semantics of the language, into a compiler or translator or
+ interpreter.
+ .
+ This Debian package is built for Python 2.2.
 
 Package: python-kjbuckets
 Architecture: all
-Depends: ${python:Depends}
+Depends: python2.2-kjbuckets
 Description: Set and graph data types for Python [dummy package]
  kjbuckets is a C extension to the Python interpreter which
  defines set and graph data types, as well as an alternative
diff -urN gadfly.orig/debian/doc-base gadfly/debian/doc-base
--- gadfly.orig/debian/doc-base 2003-02-04 20:59:25.000000000 -0600
+++ gadfly/debian/doc-base      1969-12-31 18:00:00.000000000 -0600
@@ -1,12 +0,0 @@
-Document: gadfly
-Title: Gadfly - SQL Database in Python
-Author: Aaron Watters
-Abstract: Gadfly is a SQL database implemented entirely in
- Python, including a DB-API compatible interface, network
- client and server, etc.  It stores its data in memory,
- which makes it unsuitable for large data sets, but quite
- fast on smaller ones.
-Section: Apps/Databases
-
-Format: text
-Files: /usr/share/doc/gadfly/*.txt
diff -urN gadfly.orig/debian/gadfly.dirs gadfly/debian/gadfly.dirs
--- gadfly.orig/debian/gadfly.dirs      1969-12-31 18:00:00.000000000 -0600
+++ gadfly/debian/gadfly.dirs   2003-02-05 18:09:31.000000000 -0600
@@ -0,0 +1 @@
+usr/bin
diff -urN gadfly.orig/debian/python2.1-gadfly.dirs 
gadfly/debian/python2.1-gadfly.dirs
--- gadfly.orig/debian/python2.1-gadfly.dirs    1969-12-31 18:00:00.000000000 
-0600
+++ gadfly/debian/python2.1-gadfly.dirs 2003-02-05 18:10:07.000000000 -0600
@@ -0,0 +1 @@
+usr/lib/python2.1/site-packages/gadfly
diff -urN gadfly.orig/debian/python2.1-gadfly.doc-base 
gadfly/debian/python2.1-gadfly.doc-base
--- gadfly.orig/debian/python2.1-gadfly.doc-base        1969-12-31 
18:00:00.000000000 -0600
+++ gadfly/debian/python2.1-gadfly.doc-base     2003-02-06 13:25:28.000000000 
-0600
@@ -0,0 +1,12 @@
+Document: python2.1-gadfly
+Title: Gadfly - SQL Database in Python
+Author: Aaron Watters
+Abstract: Gadfly is a SQL database implemented entirely in
+ Python, including a DB-API compatible interface, network
+ client and server, etc.  It stores its data in memory,
+ which makes it unsuitable for large data sets, but quite
+ fast on smaller ones.
+Section: Apps/Databases
+
+Format: text
+Files: /usr/share/doc/python2.1-gadfly/*.txt
diff -urN gadfly.orig/debian/python2.2-gadfly.dirs 
gadfly/debian/python2.2-gadfly.dirs
--- gadfly.orig/debian/python2.2-gadfly.dirs    1969-12-31 18:00:00.000000000 
-0600
+++ gadfly/debian/python2.2-gadfly.dirs 2003-02-05 18:10:31.000000000 -0600
@@ -0,0 +1 @@
+usr/lib/python2.2/site-packages/gadfly
diff -urN gadfly.orig/debian/python2.2-gadfly.doc-base 
gadfly/debian/python2.2-gadfly.doc-base
--- gadfly.orig/debian/python2.2-gadfly.doc-base        1969-12-31 
18:00:00.000000000 -0600
+++ gadfly/debian/python2.2-gadfly.doc-base     2003-02-06 13:25:26.000000000 
-0600
@@ -0,0 +1,12 @@
+Document: python2.2-gadfly
+Title: Gadfly - SQL Database in Python
+Author: Aaron Watters
+Abstract: Gadfly is a SQL database implemented entirely in
+ Python, including a DB-API compatible interface, network
+ client and server, etc.  It stores its data in memory,
+ which makes it unsuitable for large data sets, but quite
+ fast on smaller ones.
+Section: Apps/Databases
+
+Format: text
+Files: /usr/share/doc/python2.2-gadfly/*.txt
diff -urN gadfly.orig/debian/rules gadfly/debian/rules
--- gadfly.orig/debian/rules    2003-02-04 20:59:25.000000000 -0600
+++ gadfly/debian/rules 2003-02-15 20:59:57.000000000 -0600
@@ -3,14 +3,19 @@
 PYTHON2.1=/usr/bin/python2.1
 PYTHON2.2=/usr/bin/python2.2
 
-kjb_version=2.2+gadfly$${Source-Version}
+# change this when default Python version increases
+PYTHON=$(PYTHON2.2)
+PYNAME=python2.2
+
+kjb_version=1:$${Source-Version}
 
 build:
 
 build-indep: build-indep-stamp
 build-indep-stamp:
        dh_testdir
-       $(PYTHON2.2) setup.py build
+       $(PYTHON2.1) setup.py build \
+       && $(PYTHON2.2) setup.py build
        > $@
 
 build-arch: build-arch-stamp
@@ -24,44 +29,72 @@
        dh_testdir
        dh_testroot
        rm -f build-indep-stamp build-arch-stamp
-       $(PYTHON2.2) setup.py clean --all
+       $(PYTHON2.1) setup.py clean --all \
+       && $(PYTHON2.2) setup.py clean --all
        cd kjbuckets && $(PYTHON2.1) setup.py clean --all \
                     && $(PYTHON2.2) setup.py clean --all
        dh_clean
 
 binary: binary-indep binary-arch
 
+# python-gadfly & gadfly & python-kjbuckets (default)
 binary-indep: build-indep
        dh_testdir -i
        dh_testroot -i
        dh_clean -i -k
        dh_installdirs -i
-       $(PYTHON2.2) setup.py install --root debian/gadfly --no-compile
-       dh_link -ppython-kjbuckets usr/share/doc/python2.2-kjbuckets \
-                                  usr/share/doc/python-kjbuckets
-       dh_installchangelogs -i CHANGES.txt
+
+       # python2.1-gadfly
+       $(PYTHON2.1) setup.py install_lib --install-dir \
+               debian/python2.1-gadfly/usr/lib/python2.1/site-packages \
+               --no-compile
+       dh_installdocs -ppython2.1-gadfly -Xinstallation -Xkjbuckets \
+               -Xstructure -Xgfplus TODO.txt doc/*.txt
+       dh_installexamples -ppython2.1-gadfly doc/demo/kjParsing/*
+       dh_gencontrol -ppython2.1-gadfly
+
+       # python2.2-gadfly
+       $(PYTHON2.2) setup.py install_lib --install-dir \
+               debian/python2.2-gadfly/usr/lib/python2.2/site-packages \
+               --no-compile
+       dh_installdocs -ppython2.2-gadfly -Xinstallation -Xkjbuckets \
+               -Xstructure -Xgfplus TODO.txt doc/*.txt
+       dh_installexamples -ppython2.2-gadfly doc/demo/kjParsing/*
+       dh_gencontrol -ppython2.2-gadfly
+
+       # gadfly
+       $(PYTHON) setup.py install_scripts --install-dir debian/gadfly/usr/bin
        dh_installdocs -pgadfly -Xinstallation -Xkjbuckets -Xstructure \
-                               TODO.txt doc/*.txt
-       dh_installexamples -pgadfly doc/demo/kjParsing/*
+               -Xgadfly -XkwParsing TODO.txt doc/*.txt
+       dh_gencontrol -pgadfly
+
+       # python-kjbuckets (default)
+       dh_link -ppython-kjbuckets usr/share/doc/$(PYNAME)-kjbuckets \
+               usr/share/doc/python-kjbuckets
+       dh_gencontrol -ppython-kjbuckets -- -v'$(kjb_version)'
+
+       # python-gadfly
+       dh_gencontrol -ppython-gadfly
+
+       dh_installchangelogs -i CHANGES.txt
        dh_compress -i -X.py
        perl debian/dh_fixpythonscripts -i
        dh_fixperms -i
        dh_python -i
        dh_installdeb -i
-       dh_gencontrol -pgadfly
-       dh_gencontrol -ppython-kjbuckets -- -v'$(kjb_version)'
        dh_md5sums -i
        dh_builddeb -i
 
+# python-kjbuckets (version-specific)
 binary-arch: build-arch
        dh_testdir -a
        dh_testroot -a
        dh_clean -a -k
        dh_installdirs -a
        cd kjbuckets && $(PYTHON2.1) setup.py install \
-                               --root $(CURDIR)/debian/python2.1-kjbuckets \
-                    && $(PYTHON2.2) setup.py install \
-                               --root $(CURDIR)/debian/python2.2-kjbuckets
+               --root $(CURDIR)/debian/python2.1-kjbuckets \
+               && $(PYTHON2.2) setup.py install \
+               --root $(CURDIR)/debian/python2.2-kjbuckets
        dh_installchangelogs -a CHANGES.txt
        dh_installdocs -a -A doc/kjbuckets.txt
        dh_installexamples -a -A doc/demo/kjbuckets/*

-- System Information:
Debian Release: testing/unstable
Architecture: i386
Kernel: Linux homer 2.4.20 #1 Wed Jan 8 06:07:58 CST 2003 i686
Locale: LANG=C, LC_CTYPE=C

Versions of packages gadfly depends on:
ii  python-gadfly                 1.0.0-3    SQL database and parser generator 

-- no debconf information


Reply via email to