The unified diff between revisions [94371f06..] and [6633320d..] is displayed below. It can also be downloaded as a raw diff.
#
#
# delete "debian/patches/mtn-ignore.patch"
#
# rename "debian/gnade.gpr"
# to "debian/odbc.gpr"
#
# add_file "debian/sqlite3.gpr"
# content [bafc8b88086aa03fa8ebd0cb386a7b0440950098]
#
# patch "debian/changelog"
# from [c3b56073a45fd7cfb8a02a70d47ffd72da5ceaf0]
# to [bcf30b0245a838c91b59eacc7a0f20533392fa1c]
#
# patch "debian/control"
# from [c7718ce376f6ec64589d56ae3d956b659d6a7aa6]
# to [e97cb939cbbfcb5d0cbb3339cbc25ddc05dfaf82]
#
# patch "debian/gnade_common_build.gpr"
# from [be98c29551f52e91d5cdc6502d211de4567ddbd8]
# to [7487a9151295fb81150139507653e2ae0dd17438]
#
# patch "debian/gnade_odbc_build.gpr"
# from [880521012c75c4047de599758437db2a6de49a4d]
# to [9f5f5a47d15bce531758fbcd5d8daa85863982d1]
#
# patch "debian/gnade_sqlite3_build.gpr"
# from [a1807c37c7361bdc4afd6b30e07d2cb9fea7ecd8]
# to [111b415f96ec985c2715a7479429a3b9bab94427]
#
# patch "debian/odbc.gpr"
# from [82d69d8952b2fc3e7096eccff032616c2d14c5c9]
# to [c4a107413ff2b80f20d63cb2f16fd04a8c6d50f2]
#
# patch "debian/patches/series"
# from [51170ff1bc6b2930b41f422c300e171f8f1cbce8]
# to [ae1c70603672ba9b9f1c3b5633e2bf4cbcf214e6]
#
# patch "debian/rules"
# from [b99a7947eb7f1939bd5d2ead801029dca039e8cf]
# to [a6070e2f1ba0e6c88672655b6c18880658155d5a]
#
============================================================
--- debian/sqlite3.gpr bafc8b88086aa03fa8ebd0cb386a7b0440950098
+++ debian/sqlite3.gpr bafc8b88086aa03fa8ebd0cb386a7b0440950098
@@ -0,0 +1,33 @@
+-- GNADE project file for use with GNAT
+-- Copyright (c) 2009 Stephen Leake <stephen_leake@stephe-leake.org>
+-- Copyright (c) 2003-2009 Ludovic Brenta <lbrenta@debian.org>
+--
+-- This program is free software; you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License as published by
+-- the Free Software Foundation; either version 2 of the License, or
+-- (at your option) any later version.
+--
+-- This program 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 General Public License for more details.
+--
+-- This project file is designed to help build applications that use
+-- GNADE, the GNU Ada Database Environment. Here is an example of how
+-- to use this project file:
+--
+-- with "sqlite3";
+-- project Example is
+-- for Object_Dir use "obj";
+-- for Exec_Dir use ".";
+-- for Main use ("example");
+-- end Example;
+
+project SQLite3 is
+ for Library_Name use "gnadesqlite3";
+ for Library_Dir use "/usr/lib";
+ for Library_Kind use "dynamic";
+ for Source_Dirs use ("/usr/share/ada/adainclude/gnade");
+ for Library_ALI_Dir use "/usr/lib/ada/adalib/gnade";
+ for Externally_Built use "true";
+end SQLite3;
============================================================
--- debian/changelog c3b56073a45fd7cfb8a02a70d47ffd72da5ceaf0
+++ debian/changelog bcf30b0245a838c91b59eacc7a0f20533392fa1c
@@ -1,20 +1,33 @@
-gnade (1.6.2-2) UNRELEASED; urgency=low
+gnade (1.6.2-2) unstable; urgency=low
[Stephen Leake]
- * debian/control:
- - (Build-Depends): delete libmysqlclient; clearly broken. Closes: #538522.
- - (Build-Depends): add quilt for 538643
- - delete gesql package; clearly broken.
- - delete postgresql package; uses questionable C import techniques.
- - add libgnadecommon package; was lumped with libgnadeodbc
- - s/source:Version/binary:Version/g. Closes: #542325.
- - (Architecture): add kfreebsd-amd64. Closes: #542413.
- - change package libgnadesqlite1.6.2 to libgnadesqlite3-1.6.2, since
- we are linking with libsqlite3, not libsqlite.
+ * Change -dev package names to reflect the change in .ali files (see
+ extensive discussion at
+ http://people.debian.org/~lbrenta/debian-ada-policy.html):
+ - libgnadeodbc-dev -> libgnadeodbc1-dev
+ - libgnadesqlite-dev -> libgnadesqlite3-1-dev
+ * Change sonames and package names for shared libraries:
+ - libgnadeodbc.so.1.6.2 -> libgnadeodbc.so.2
+ - libgnadesqlite.so.1.6.2 -> libgnadesqlite3.so.2 (we are linking to
+ libsqlite3, not libsqlite).
+
+ * New packages:
+ - libgnadecommon1-dev, libgnadecommon1, libgnadecommon-dbg: factorize
+ code shared by the ODBC and SQLite3 bindings.
+
+ * Deleted packages:
+ - libgnademysql{1.6.2,-dev,-dbg}: clearly broken.
+ - libgnadepostgresql{1.6.2,,-dev,-dbg}: uses questionable C import
+ techniques.
+ - gnade-bin: the embedded SQL preprocessor was clearly broken.
+
+ * debian/control (Build-Depends): delete libmysqlclient; add quilt.
+ (Architecture): add kfreebsd-amd64. Closes: #542413.
+ (libgnadeodbc1-dev, libgnadesqlite3-1-dev): depend on libgnadecommon1-dev.
+
* debian/rules:
- ensure dbi/sqlite3 source is used
- - change package libgnadesqlite1.6.2 to libgnadesqlite3-1.6.2
- add patch, unpatch targets
- delete mysql, postgresql, gesql
- add check target; run gnade demos
@@ -25,9 +38,11 @@ gnade (1.6.2-2) UNRELEASED; urgency=low
[Ludovic Brenta]
* debian/control (Vcs-Mtn, Vcs-Browse): new.
- (Maintainer): new maintainer Stephen Leake.
+ (Maintainer): new maintainer Stephen Leake. Closes: #496787.
(Uploaders): add myself as the sponsor.
(*): switch to gnat-4.4.
+ (*-dev): ensure Conflicts: and Replaces: with superseded packages.
+ Suggest the -dbg packages.
-- Stephen Leake <stephen_leake@stephe-leake.org> Thu, 22 Oct 2009 22:19:46 +0200
============================================================
--- debian/control c7718ce376f6ec64589d56ae3d956b659d6a7aa6
+++ debian/control e97cb939cbbfcb5d0cbb3339cbc25ddc05dfaf82
@@ -4,7 +4,7 @@ Uploaders: Ludovic Brenta <lbrenta@debia
Maintainer: Stephen Leake <stephen_leake@stephe-leake.org>
Uploaders: Ludovic Brenta <lbrenta@debian.org>
# sqlite3, libsqlite3-dev are used to test the sqlite3 interface
-Build-Depends: debhelper (>= 6.0.7~), gnat-4.4, unixodbc-dev, libsqlite3-dev, quilt, sqlite3, libsqlite3-dev
+Build-Depends: debhelper (>= 6.0.7~), gnat-4.4, unixodbc-dev, libsqlite3-dev, quilt
Standards-Version: 3.8.3
XS-Vcs-Mtn: www.ada-france.org org.debian.gnade
XS-Vcs-Browser: http://www.ada-france.org:8081/branch/changes/org.debian.gnade
@@ -14,6 +14,7 @@ Depends: gnat-4.4, libgnadecommon1 (= ${
Architecture: alpha amd64 hppa i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel ppc64 powerpc sparc s390
Section: libdevel
Depends: gnat-4.4, libgnadecommon1 (= ${binary:Version})
+Suggests: libgnadecommon-dbg
Description: GNat Ada Database Environment - subprograms common to other GNADE packages
GNADE is a complete database development environment for Ada
programmers. It consists of:
@@ -60,8 +61,9 @@ Depends: gnat-4.4, libgnadecommon1-dev (
Architecture: alpha amd64 hppa i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel ppc64 powerpc sparc s390
Section: libdevel
Depends: gnat-4.4, libgnadecommon1-dev (= ${binary:Version}), unixodbc (>= 2.2.11-16), libgnadeodbc2 (= ${binary:Version})
-Suggests: gnade-doc (= ${source:Version}), libgnadesqlite3-dev
-Conflicts: gnade-dev
+Suggests: libgnadesqlite3-dev, libgnadeodbc-dbg
+Conflicts: gnade-dev, libgnadeodbc-dev
+Replaces: libgnadeodbc-dev
Description: GNat Ada Database Environment - ODBC programming interface
GNADE is a complete database development environment for Ada
programmers. It consists of:
@@ -108,6 +110,9 @@ Section: libdevel
Architecture: alpha amd64 hppa i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel ppc64 powerpc sparc s390
Depends: gnat-4.4, libgnadecommon1-dev (= ${binary:Version}), libsqlite3-dev, libgnadesqlite3-2 (= ${binary:Version})
Section: libdevel
+Suggests: libgnadesqlite3-dbg
+Conflicts: libgnadesqlite-dev
+Replaces: libgnadesqlite-dev
Description: GNat Ada Database Environment - SQLite3 programming interface
GNADE is a complete database development environment for Ada
programmers. It consists of:
============================================================
--- debian/gnade_common_build.gpr be98c29551f52e91d5cdc6502d211de4567ddbd8
+++ debian/gnade_common_build.gpr 7487a9151295fb81150139507653e2ae0dd17438
@@ -28,7 +28,7 @@ project GNADE_Common_Build is
for Library_Version use "libgnadecommon.so." & Soversion;
package Compiler is
- Base_Switches :=
+ for Default_Switches ("Ada") use
("-g",
"-O2",
"-gnat05",
@@ -36,15 +36,6 @@ project GNADE_Common_Build is
"-gnatwa",
"-gnatVa",
"-fstack-check");
-
- case Libtype is
- when "static" =>
- for Default_Switches ("Ada") use Base_Switches;
-
- when "dynamic" =>
- for Default_Switches ("Ada") use Base_Switches & ("-FPIC");
- end case;
-
end Compiler;
end GNADE_Common_Build;
============================================================
--- debian/gnade_odbc_build.gpr 880521012c75c4047de599758437db2a6de49a4d
+++ debian/gnade_odbc_build.gpr 9f5f5a47d15bce531758fbcd5d8daa85863982d1
@@ -43,14 +43,8 @@ project GNADE_ODBC_Build is
"-gnatVa",
"-fstack-check");
- case Libtype is
- when "static" =>
- for Default_Switches ("Ada") use Base_Switches;
+ for Default_Switches ("Ada") use Base_Switches;
- when "dynamic" =>
- for Default_Switches ("Ada") use Base_Switches & ("-FPIC");
- end case;
-
-- This has generic formal subpgrogram parameters that are used
-- only in the child packages.
for Switches ("gnu-db-sqlcli-generic_attr.ads") use Base_Switches & ("-gnatwU");
============================================================
--- debian/gnade_sqlite3_build.gpr a1807c37c7361bdc4afd6b30e07d2cb9fea7ecd8
+++ debian/gnade_sqlite3_build.gpr 111b415f96ec985c2715a7479429a3b9bab94427
@@ -28,7 +28,7 @@ project GNADE_Sqlite3_Build is
for Library_Options use ("-lsqlite3");
package Compiler is
- Base_Switches :=
+ for Default_Switches ("Ada") use
("-g",
"-O2",
"-gnat05",
@@ -36,15 +36,6 @@ project GNADE_Sqlite3_Build is
"-gnatwa",
"-gnatVa",
"-fstack-check");
-
- case Libtype is
- when "static" =>
- for Default_Switches ("Ada") use Base_Switches;
-
- when "dynamic" =>
- for Default_Switches ("Ada") use Base_Switches & ("-FPIC");
- end case;
-
end Compiler;
end GNADE_Sqlite3_Build;
============================================================
--- debian/gnade.gpr 82d69d8952b2fc3e7096eccff032616c2d14c5c9
+++ debian/odbc.gpr c4a107413ff2b80f20d63cb2f16fd04a8c6d50f2
@@ -1,6 +1,6 @@
-- GNADE project file for use with GNAT
-- Copyright (c) 2009 Stephen Leake <stephen_leake@stephe-leake.org>
--- Copyright (c) 2003-2006 Ludovic Brenta <lbrenta@debian.org>
+-- Copyright (c) 2003-2009 Ludovic Brenta <lbrenta@debian.org>
--
-- This program is free software; you can redistribute it and/or modify
-- it under the terms of the GNU General Public License as published by
@@ -16,27 +16,18 @@
-- GNADE, the GNU Ada Database Environment. Here is an example of how
-- to use this project file:
--
--- with "gnade";
+-- with "odbc";
-- project Example is
-- for Object_Dir use "obj";
-- for Exec_Dir use ".";
-- for Main use ("example");
--- package Linker renames GNADE.Linker;
--- -- Alternatively, if you need additional switches:
--- -- package Linker is
--- -- for Default_Switches ("Ada") use ("-lgnadecommon", "-lgnadeodbc", ...)
--- -- end Linker;
-- end Example;
-project GNADE is
- for Source_Dirs use ("../../include/gnade");
- for Library_Name use "gnade";
- for Library_Dir use "../../lib/gnade";
+project ODBC is
+ for Library_Name use "gnadeodbc";
+ for Library_Dir use "/usr/lib";
+ for Library_Kind use "dynamic";
+ for Source_Dirs use ("/usr/share/ada/adainclude/gnade");
+ for Library_ALI_Dir use "/usr/lib/ada/adalib/gnade";
for Externally_Built use "true";
-
- -- By default, link only against libgnadeodbc, the thin binding to
- -- ODBC. You may also want to link against libgnadesqlite3.
- package Linker is
- for Default_Switches ("Ada") use ("-lgnadecommon", "-lgnadeodbc");
- end Linker;
-end GNADE;
+end ODBC;
============================================================
--- debian/patches/series 51170ff1bc6b2930b41f422c300e171f8f1cbce8
+++ debian/patches/series ae1c70603672ba9b9f1c3b5633e2bf4cbcf214e6
@@ -1,3 +1,3 @@ demo_warnings.patch
bug-538643.patch
demo_warnings.patch
-mtn-ignore.patch
+
============================================================
--- debian/rules b99a7947eb7f1939bd5d2ead801029dca039e8cf
+++ debian/rules a6070e2f1ba0e6c88672655b6c18880658155d5a
@@ -148,6 +148,7 @@ libgnade%-dev: debian/libgnade%-stamp
dh_install -p$(package) debian/tmp/libgnade$*.a /usr/lib
dh_link -p$(package) /usr/lib/libgnade$*.so.$($*_soversion) \
/usr/lib/libgnade$*.so
+ dh_install -p$(package) debian/$*.gpr /usr/share/ada/adainclude
# Install libgnadecommon-dev; this overrides the pattern target above.
libgnadecommon-dev: package := libgnadecommon$(common_aliversion)-dev
@@ -157,7 +158,6 @@ libgnadecommon-dev: debian/libgnadecommo
usr/lib/ada/adalib/gnade
dh_install -p$(package) debian/tmp/common-dynamic/*.ali usr/lib/ada/adalib/gnade
dh_install -p$(package) support/*.ad[bs] usr/share/ada/adainclude/gnade
- dh_install -p$(package) debian/gnade.gpr usr/share/ada/adainclude
dh_install -p$(package) debian/tmp/libgnadecommon.a /usr/lib
dh_link -p$(package) /usr/lib/libgnadecommon.so.$(common_soversion) \
/usr/lib/libgnadecommon.so