The unified diff between revisions [bed35127..] and [a3e8e620..] is displayed below. It can also be downloaded as a raw diff.
#
#
# add_dir "debian/source"
#
# add_file "debian/source/format"
# content [1064dc0ce263680c076a1005f35ec906a5cf5a32]
#
# patch "debian/README.source"
# from [e29cfb655e1e73bdab8ff160d0cd760d7ff70d53]
# to [5b15462f496bfa1febffb4aa6b62c892ad89694a]
#
# patch "debian/changelog"
# from [102a5b4c1a05803b7d0abb6cfca7fbd12c6b5488]
# to [f0f6673700cdf78fc3d9e2dddee56b8be36e1285]
#
# patch "debian/compat"
# from [ccf271b7830882da1791852baeca1737fcbe4b90]
# to [d3964f9dad9f60363c81b688324d95b4ec7c8038]
#
# patch "debian/control"
# from [f0a89e0ba840839c647e88937e19f28be713d453]
# to [2a9e9efb7c61f8298f76aae3b24437387b6dd150]
#
# patch "debian/copyright"
# from [7eb7a19a8c189ecdf15609ee0786c645cf471565]
# to [3839db337c1740c23973ee155ec0dde5279ac64f]
#
# patch "debian/patches/bug-538643.patch"
# from [e79b9dd29b05d7076fb48037b41259b896b98b52]
# to [444dcfb2ce64f62f5c92857f4eefeb110d87ddd6]
#
# patch "debian/patches/demo_warnings.patch"
# from [82d2a6ce9f315f45ac8da5d115c9eafcf00a12b5]
# to [cf0cb0470399a594b3c14ccf548008cda40da9e1]
#
# patch "debian/rules"
# from [0d66aba89cd6f05945b13ea1e05e0b4d3f119e16]
# to [5f4bad931a9b48608bfd710cfaf5666b59bed422]
#
# patch "debian/test_installed.sh"
# from [c3be6d7e0deb550cc0bc290c5a6069db9ed90236]
# to [c02f95844c1fa3682f4c8b4cffdf1e19c3282614]
#
============================================================
--- debian/source/format 1064dc0ce263680c076a1005f35ec906a5cf5a32
+++ debian/source/format 1064dc0ce263680c076a1005f35ec906a5cf5a32
@@ -0,0 +1 @@
+3.0 (quilt)
============================================================
--- debian/README.source e29cfb655e1e73bdab8ff160d0cd760d7ff70d53
+++ debian/README.source 5b15462f496bfa1febffb4aa6b62c892ad89694a
@@ -4,6 +4,8 @@ call that version 1.6.2 here.
The upstream CVS head was not officially released from SourceForge; we
call that version 1.6.2 here.
+gnade_1.6.2.orig.tar.gz was produced manually from a CVS checkout.
+
The SourceForge GNADE distribution uses autotools to create some
files. We do not use autotools in the Debian build. We suppress the
lintian error for the out-of-date autotools files in the GNADE source
@@ -14,21 +16,52 @@ library. This was not done for gnade rel
(given in Ada comments) for each soname change in the corresponding C
library. This was not done for gnade releases before Debian 1.6.2-2.
-An exception is dbi/odbc/*. ODBC is a psuedo-standard; there is strong
-incentive for it to not change. So we are assuming those imports are
-ok.
+Nominally, there is one library in the Debian gnade package for each
+directory in gnade/dbi. However, most of those packages are rejected
+for one reason or another. Here is the list:
-The SQLite3 API appears to be very stable (and cleanly designed).
+adbc
-The GNADE MySQL code clearly does not match the current C headers for
-libmysqlclient.
+ This is an early attempt at a higher level abstract database
+ binding. It is not well tested.
+
+mysql
-The GNADE postgre code uses some very questionable techniques in
-interfacing to C.
+ This code clearly does not match the current C headers for
+ libmysqlclient.
-The gesql preprocessor generates a lot of warnings from the gnat
+oci
+
+ This is a binding to the Oracle database. Apparently there is a
+ free version of Oracle that can be installed on Debian, but I have
+ simply not tried to do that, so I don't know if this package would
+ work. It contains many C bindings that need to be checked.
+
+odbc
+
+ This is a binding to the industry standard ODBC. Since there is
+ strong incentive for it to not change, we assume the imports are
+ ok.
+
+postgres
+
+ This code uses some very questionable techniques in interfacing to
+ C.
+
+sqlite
+
+ This is obsolete; use sqlite3 instead
+
+sqlite3
+
+ The SQLite3 API appears to be very stable (and cleanly designed).
+ The C bindings were last checked for sqlite3 version 3.6.17
+ (Sep 2009).
+
+In addition, gnade/esql contains a preprocessor that allows embedding
+SQL code in Ada code. It generates a lot of warnings from the gnat
compiler. In the process of eliminating those warnings, it became
-clear the gesql is broken.
+clear esql is broken.
Therefore we package only odbc and SQLite3.
============================================================
--- debian/changelog 102a5b4c1a05803b7d0abb6cfca7fbd12c6b5488
+++ debian/changelog f0f6673700cdf78fc3d9e2dddee56b8be36e1285
@@ -1,3 +1,19 @@
+gnade (1.6.2-8) unstable; urgency=low
+
+ * debian/source/format: New file; change to 3.0 (quilt)
+
+ * debian/patches/*.patch: document according to DEP-3
+
+ * debian/compat: bump to 7
+
+ * debian/copyright (Format-Specification): use dep5 format.
+
+ * debian/rules: improve build instructions, drop quilt rules
+
+ * debian/test_installed.sh: do sudo on install steps
+
+ -- Stephen Leake <stephen_leake@stephe-leake.org> Wed, 30 Jun 2010 04:54:55 -0400
+
gnade (1.6.2-7) unstable; urgency=low
* debian/control (DM-Upload-Allowed): yes, not true.
============================================================
--- debian/compat ccf271b7830882da1791852baeca1737fcbe4b90
+++ debian/compat d3964f9dad9f60363c81b688324d95b4ec7c8038
@@ -1 +1 @@
-6
+7
============================================================
--- debian/control f0a89e0ba840839c647e88937e19f28be713d453
+++ debian/control 2a9e9efb7c61f8298f76aae3b24437387b6dd150
@@ -4,14 +4,13 @@ DM-Upload-Allowed: yes
Maintainer: Stephen Leake <stephen_leake@stephe-leake.org>
DM-Upload-Allowed: yes
# sqlite3, libsqlite3-dev are used to test the sqlite3 interface
-Build-Depends: debhelper (>= 6.0.7~), gnat-4.4, unixodbc-dev, libsqlite3-dev, quilt
-Standards-Version: 3.8.4
+Build-Depends: debhelper (>= 7.2.4), gnat-4.4, unixodbc-dev, libsqlite3-dev
+Standards-Version: 3.9.0
XS-Vcs-Mtn: www.ada-france.org org.debian.gnade
XS-Vcs-Browser: http://www.ada-france.org:8081/branch/changes/org.debian.gnade
Package: libgnadecommon1-dev
-# architecture is limited only because gnat is; keep this in sync with gnat
-Architecture: amd64 armel hppa i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel ppc64 powerpc sparc s390
+Architecture: any
Section: libdevel
Depends: gnat, gnat-4.4, ada-compiler,
libgnadecommon1 (= ${binary:Version}), ${misc:Depends}
@@ -30,7 +29,7 @@ Priority: extra
Package: libgnadecommon-dbg
Priority: extra
-Architecture: amd64 armel hppa i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel ppc64 powerpc sparc s390
+Architecture: any
Section: debug
Depends: libgnadecommon1 (= ${binary:Version}), ${misc:Depends}
Suggests: gnat, ada-compiler
@@ -46,7 +45,7 @@ Package: libgnadecommon1
This package contains the debugging symbols for the common library.
Package: libgnadecommon1
-Architecture: amd64 armel hppa i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel ppc64 powerpc sparc s390
+Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
Description: GNat Ada Database Environment - common subprograms library
GNADE is a complete database development environment for Ada
@@ -60,7 +59,7 @@ Package: libgnadeodbc1-dev
This package contains the shared library for the common subprograms.
Package: libgnadeodbc1-dev
-Architecture: amd64 armel hppa i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel ppc64 powerpc sparc s390
+Architecture: any
Section: libdevel
Depends: gnat, gnat-4.4, ada-compiler,
libgnadecommon1-dev (= ${binary:Version}), unixodbc (>= 2.2.11-16),
@@ -82,7 +81,7 @@ Priority: extra
Package: libgnadeodbc-dbg
Priority: extra
-Architecture: amd64 armel hppa i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel ppc64 powerpc sparc s390
+Architecture: any
Section: debug
Depends: libgnadeodbc2 (= ${binary:Version}), ${misc:Depends}
Suggests: gnat, ada-compiler
@@ -98,7 +97,7 @@ Package: libgnadeodbc2
This package contains the debugging symbols for the ODBC interface.
Package: libgnadeodbc2
-Architecture: amd64 armel hppa i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel ppc64 powerpc sparc s390
+Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
Description: GNat Ada Database Environment - ODBC interface
GNADE is a complete database development environment for Ada
@@ -112,7 +111,7 @@ Package: libgnadesqlite3-1-dev
This package contains the shared library for the ODBC interface.
Package: libgnadesqlite3-1-dev
-Architecture: amd64 armel hppa i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel ppc64 powerpc sparc s390
+Architecture: any
Depends: gnat, gnat-4.4, ada-compiler,
libgnadecommon1-dev (= ${binary:Version}),
libsqlite3-dev, libgnadesqlite3-2 (= ${binary:Version}), ${misc:Depends}
@@ -134,7 +133,7 @@ Priority: extra
Package: libgnadesqlite3-dbg
Priority: extra
-Architecture: amd64 armel hppa i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel ppc64 powerpc sparc s390
+Architecture: any
Depends: libgnadesqlite3-2 (= ${binary:Version}), ${misc:Depends}
Section: debug
Suggests: gnat, ada-compiler
@@ -150,7 +149,7 @@ Package: libgnadesqlite3-2
This package contains the debugging symbols for the SQLite3 interface.
Package: libgnadesqlite3-2
-Architecture: amd64 armel hppa i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel ppc64 powerpc sparc s390
+Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
Description: GNat Ada Database Environment - SQLite3 interface
GNADE is a complete database development environment for Ada
============================================================
--- debian/copyright 7eb7a19a8c189ecdf15609ee0786c645cf471565
+++ debian/copyright 3839db337c1740c23973ee155ec0dde5279ac64f
@@ -1,17 +1,11 @@
--*- mode: text; coding: utf-8 -*-
+Format-Specification: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=135
+Name: gnade
+Maintainer: Stephen Leake <stephen_leake@stephe-leake.org>
+Source: http://gnade.sourceforge.net/
-This package was debianized by Ludovic Brenta
-<lbrenta@debian.org> on Sun, 23 Nov 2003 20:50:17 +0100.
-
-It was downloaded from http://gnade.sourceforge.net/
-
-Upstream Authors: Jürgen Pfeifer <juergen.pfeifer@gmx.net>
- Michael Erdmann <Michael.Erdmann@snafu.de>
-
-Copyright: GPL
-
-This software is Copyright (C) 2000-2006 Jürgen Pfeifer and Michael Erdmann
-
+Files: *
+Copyright: 2000-2006 Jürgen Pfeifer and Michael Erdmann
+License: GMGPL-2
You are free to distribute this software under the terms of the GNU General
Public Licence.
============================================================
--- debian/patches/bug-538643.patch e79b9dd29b05d7076fb48037b41259b896b98b52
+++ debian/patches/bug-538643.patch 444dcfb2ce64f62f5c92857f4eefeb110d87ddd6
@@ -1,6 +1,9 @@
-Fix Debian bug 538643
-In *Binding, check size of object, not size of type.
+Description: In *Binding, check size of object, not size of type.
+Origin: vendor, http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=538643
+Forwarded: http://sf.net/tracker/?func=detail&aid=1875874&group_id=23045&atid=377333
+Reviewed-by: Stephen Leake <stephen_leake@stephe-leake.org>
+
Index: gnade-1.6.2/dbi/odbc/gnu-db-sqlcli.gpb
===================================================================
--- gnade-1.6.2.orig/dbi/odbc/gnu-db-sqlcli.gpb 2009-09-07 08:20:52.000000000 -0400
============================================================
--- debian/patches/demo_warnings.patch 82d2a6ce9f315f45ac8da5d115c9eafcf00a12b5
+++ debian/patches/demo_warnings.patch cf0cb0470399a594b3c14ccf548008cda40da9e1
@@ -1,8 +1,10 @@
-Fix compiler warnings in demo code.
+Description: Fix compiler warnings in demo code.
+ .
+ Improve odbc demo output format.
+ .
+ Improve sqlite3 demo.
+Author: Stephen Leake <stephen_leake@stephe-leake.org>
-Improve odbc demo output format.
-Improve sqlite3 demo.
-
Index: gnade-1.6.2/samples/odbc/demo.gpb
===================================================================
--- gnade-1.6.2.orig/samples/odbc/demo.gpb 2009-10-05 02:20:57.000000000 -0400
============================================================
--- debian/rules 0d66aba89cd6f05945b13ea1e05e0b4d3f119e16
+++ debian/rules 5f4bad931a9b48608bfd710cfaf5666b59bed422
@@ -1,6 +1,6 @@
#!/usr/bin/make -f
-# Copyright (c) 2009 Stephen Leake <stephen_leake@stephe-leake.org>
+# Copyright (c) 2009, 2010 Stephen Leake <stephen_leake@stephe-leake.org>
# Copyright (c) 2003-2006 Ludovic Brenta <lbrenta@debian.org>
#
# This program is free software; you can redistribute it and/or modify
@@ -19,21 +19,23 @@
# 02110-1301 USA
#
# To build this package:
-# sudo schroot -d `cd ..; pwd` --chroot=unstable -- dpkg-buildpackage -uc -us -i"_MTN|\\.mtn-ignore"
+# schroot -d `cd ..; pwd` --chroot=unstable -- dpkg-buildpackage -uc -us -i"_MTN|\\.mtn-ignore"
#
# To run lintian:
# schroot -d `cd ..; pwd` --chroot=unstable -- make -f debian/rules lint
#
# To install the packages and run the examples:
# sudo /etc/init.d/mysql stop
-# sudo schroot --chroot=unstable -- ./test_installed.sh
+# schroot --chroot=unstable -- ./test_installed.sh
+#
+# To review changes from previous version:
+# schroot -d `cd ..; pwd` --chroot=unstable -- debdiff
.SUFFIXES=
-include /usr/share/quilt/quilt.make
-
# We use gnatmake, not make, for parallel builds.
.NOTPARALLEL:
+CPUS := $(shell getconf _NPROCESSORS_ONLN)
# get soversions, aliversions from debian/control
common_soversion := $(shell sed -n -e "s/^Package: libgnadecommon\([0123456789]\+\)$$/\1/p" debian/control)
@@ -44,13 +46,11 @@ sqlite3_aliversion := $(shell sed -n -e
odbc_aliversion := $(shell sed -n -e "s/^Package: libgnadeodbc\(.\+\)-dev$$/\1/p" debian/control)
sqlite3_aliversion := $(shell sed -n -e "s/^Package: libgnadesqlite3-\(.\+\)-dev$$/\1/p" debian/control)
-CPUS := $(shell getconf _NPROCESSORS_ONLN)
-
# Targets mandated by the Debian Policy
.PHONY: build build-arch build-indep binary binary-arch binary-indep clean
-build: patch build-arch
+build: build-arch
ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
$(MAKE) -f debian/rules check
endif
@@ -81,7 +81,7 @@ binary-indep:
binary-indep:
-clean: unpatch
+clean:
dh_clean
rm -f debian/*-stamp
rm -f debian/gnadesqlite3*-dev.README.Debian
@@ -169,7 +169,7 @@ libgnadesqlite3-example:
dh_installexamples -p$(package) samples/sqlite3/demo.adb
# Check the build by running some examples.
-check: patch debian/check-sqlite3-stamp
+check: debian/check-sqlite3-stamp
# create 'gnade' mysql account, 'gnade' mysql database
# install 'MySQL' odbc driver, 'gnade_mysql' odbc source
@@ -203,7 +203,9 @@ debian/check-sqlite3-stamp: debian/libgn
export LD_LIBRARY_PATH=`pwd`/debian/tmp; debian/tmp/sqlite3-example-obj/demo debian/tmp/demo.db
touch $@
+lint: version := $(shell dpkg-parsechangelog | grep "Version: " | sed "s/Version: //")
+lint: arch := $(shell dpkg-architecture -qDEB_BUILD_ARCH)
lint:
- cd ..; lintian -i gnade*.changes
+ cd ..; lintian -i gnade_$(version)_$(arch).changes
# end of file
============================================================
--- debian/test_installed.sh c3be6d7e0deb550cc0bc290c5a6069db9ed90236
+++ debian/test_installed.sh c02f95844c1fa3682f4c8b4cffdf1e19c3282614
@@ -10,14 +10,17 @@
# This re-installs the latest version.
-dpkg --install ../../libgnadecommon1_1.6.2-3_i386.deb
-dpkg --install ../../libgnadeodbc2_1.6.2-3_i386.deb
-dpkg --install ../../libgnadesqlite3-2_1.6.2-3_i386.deb
+sudo dpkg --install ../../libgnadecommon1_1.6.2-3_i386.deb
+sudo dpkg --install ../../libgnadeodbc2_1.6.2-3_i386.deb
+sudo dpkg --install ../../libgnadesqlite3-2_1.6.2-3_i386.deb
-dpkg --install ../../libgnadecommon1-dev_1.6.2-3_i386.deb
-dpkg --install ../../libgnadeodbc1-dev_1.6.2-3_i386.deb
-dpkg --install ../../libgnadesqlite3-1-dev_1.6.2-3_i386.deb
+sudo dpkg --install ../../libgnadecommon1-dev_1.6.2-3_i386.deb
+sudo dpkg --install ../../libgnadeodbc1-dev_1.6.2-3_i386.deb
+sudo dpkg --install ../../libgnadesqlite3-1-dev_1.6.2-3_i386.deb
+# tmp is owned by root; we need write permission
+sudo chmod -R o+w tmp
+
rm -rf tmp/odbc-example-obj
rm -rf tmp/sqlite3-example-obj