The unified diff between revisions [6633320d..] and [3da6ddd6..] is displayed below. It can also be downloaded as a raw diff.
#
#
# rename "debian/odbc.gpr"
# to "debian/gnadeodbc.gpr"
#
# rename "debian/sqlite3.gpr"
# to "debian/gnadesqlite3.gpr"
#
# add_file "debian/gnadecommon.gpr"
# content [9ef39dee1add4f182c9bb672d0ff0699f365edba]
#
# patch "debian/gnadeodbc.gpr"
# from [c4a107413ff2b80f20d63cb2f16fd04a8c6d50f2]
# to [843d86df76c3ea3de2470eab6b5e5565710dc391]
#
# patch "debian/gnadesqlite3.gpr"
# from [bafc8b88086aa03fa8ebd0cb386a7b0440950098]
# to [6367728aa3ea10b2e7ab50ef2b61a7b4dcc643f5]
#
# patch "debian/rules"
# from [a6070e2f1ba0e6c88672655b6c18880658155d5a]
# to [11788645d4eae7869a71ea20a76df29ce520c316]
#
============================================================
--- debian/gnadecommon.gpr 9ef39dee1add4f182c9bb672d0ff0699f365edba
+++ debian/gnadecommon.gpr 9ef39dee1add4f182c9bb672d0ff0699f365edba
@@ -0,0 +1,25 @@
+-- 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 only used by gnadeodbc and gnadesqlite3; it
+-- is not useful on its own.
+
+project GNADEODBC 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/gnadecommon");
+ for Library_ALI_Dir use "/usr/lib/ada/adalib/gnadecommon";
+ for Externally_Built use "true";
+end GNADEODBC;
============================================================
--- debian/odbc.gpr c4a107413ff2b80f20d63cb2f16fd04a8c6d50f2
+++ debian/gnadeodbc.gpr 843d86df76c3ea3de2470eab6b5e5565710dc391
@@ -13,21 +13,21 @@
-- 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:
+-- the ODBC binding of GNADE, the GNU Ada Database Environment. Here
+-- is an example of how to use this project file:
--
--- with "odbc";
+-- with "gnadeodbc";
-- project Example is
-- for Object_Dir use "obj";
-- for Exec_Dir use ".";
-- for Main use ("example");
-- end Example;
-project ODBC is
+project GNADEODBC 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 Source_Dirs use ("/usr/share/ada/adainclude/gnadeodbc");
+ for Library_ALI_Dir use "/usr/lib/ada/adalib/gnadeodbc";
for Externally_Built use "true";
-end ODBC;
+end GNADEODBC;
============================================================
--- debian/sqlite3.gpr bafc8b88086aa03fa8ebd0cb386a7b0440950098
+++ debian/gnadesqlite3.gpr 6367728aa3ea10b2e7ab50ef2b61a7b4dcc643f5
@@ -13,21 +13,21 @@
-- 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:
+-- the SQLite3 binding of GNADE, the GNU Ada Database Environment.
+-- Here is an example of how to use this project file:
--
--- with "sqlite3";
+-- with "gnadesqlite3";
-- project Example is
-- for Object_Dir use "obj";
-- for Exec_Dir use ".";
-- for Main use ("example");
-- end Example;
-project SQLite3 is
+project GNADESQLite3 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 Source_Dirs use ("/usr/share/ada/adainclude/gnadesqlite3");
+ for Library_ALI_Dir use "/usr/lib/ada/adalib/gnadesqlite3";
for Externally_Built use "true";
-end SQLite3;
+end GNADESQLite3;
============================================================
--- debian/rules a6070e2f1ba0e6c88672655b6c18880658155d5a
+++ debian/rules 11788645d4eae7869a71ea20a76df29ce520c316
@@ -18,8 +18,8 @@
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
# 02110-1301 USA
#
-# To run this makefile in a chroot:
-# cd ..; sudo schroot --chroot=unstable -- dpkg-buildpackage -uc -us -i
+# To build this package:
+# cd ..; sudo schroot --chroot=unstable -- dpkg-buildpackage -uc -us -i"_MTN|\\.mtn-ignore"
#
# To run lintian:
# cd ..; schroot --chroot=unstable -- make -f debian/rules lint
@@ -132,40 +132,24 @@ libgnade%-so: debian/libgnade%-stamp
dh_makeshlibs -p$(package)
dh_lintian -p$(package)
-# Install a -dev and -dbg package. All -dev packages add files to
-# adalib/gnade and adainclude/gnade, and there is only one project
-# file provided by libgnadecommon-dev. All other -dev packages depend
-# on it.
+# Install a -dev and -dbg package.
+libgnadecommon-dev: package := libgnadecommon$(common_aliversion)-dev
libgnadeodbc-dev: package := libgnadeodbc$(odbc_aliversion)-dev
libgnadesqlite3-dev: package := libgnadesqlite3-$(sqlite3_aliversion)-dev
libgnade%-dev: debian/libgnade%-stamp
- dh_installdirs -p$(package) \
- usr/share/ada/adainclude/gnade \
- usr/lib/ada/adalib/gnade
- dh_install -p$(package) debian/tmp/$*-dynamic/*.ali usr/lib/ada/adalib/gnade
- dh_install -p$(package) dbi/$*/*.ad[bs] usr/share/ada/adainclude/gnade
- if [ -d debian/tmp/$*-prep ]; then dh_install -p$(package) debian/tmp/$*-prep/*.ad[bs] usr/share/ada/adainclude/gnade; fi
+ dh_installdirs -p$(package) usr/share/ada/adainclude/gnade$* usr/lib/ada/adalib/gnade$*
+ dh_install -p$(package) debian/tmp/$*-dynamic/*.ali usr/lib/ada/adalib/gnade$*
+ if [ -d dbi/$* ]; then \
+ dh_install -p$(package) dbi/$*/*.ad[bs] usr/share/ada/adainclude/gnade$* ; \
+ else \
+ dh_install -p$(package) support/*.ad[bs] usr/share/ada/adainclude/gnade$* ; \
+ fi
+ if [ -d debian/tmp/$*-prep ]; then dh_install -p$(package) debian/tmp/$*-prep/*.ad[bs] usr/share/ada/adainclude/gnade$*; fi
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
+ dh_link -p$(package) /usr/lib/libgnade$*.so.$($*_soversion) /usr/lib/libgnade$*.so
+ dh_install -p$(package) debian/gnade$*.gpr /usr/share/ada/adainclude
-# Install libgnadecommon-dev; this overrides the pattern target above.
-libgnadecommon-dev: package := libgnadecommon$(common_aliversion)-dev
-libgnadecommon-dev: debian/libgnadecommon-stamp
- dh_installdirs -p$(package) \
- usr/share/ada/adainclude/gnade \
- 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/tmp/libgnadecommon.a /usr/lib
- dh_link -p$(package) /usr/lib/libgnadecommon.so.$(common_soversion) \
- /usr/lib/libgnadecommon.so
-
-# check the build by running some examples running the odbc example
-# requires root privs to set it up, so we can't run it as part of the
-# package build process. We keep the target here so we can easily run
-# it while developing the next release.
+# Check the build by running some examples.
check: patch debian/check-sqlite3-stamp
# create 'gnade' mysql account, 'gnade' mysql database
@@ -182,6 +166,10 @@ debian/odbc-source-stamp:
odbcinst -i -s -l -f debian/odbc_mysql_source.ini
touch $@
+# Running the odbc example requires root privs to set it up, so we
+# can't run it as part of the package build process. We keep the odbc
+# target here so we can easily run it while developing the next
+# release.
debian/check-odbc-stamp: debian/libgnadeodbc-stamp debian/odbc-source-stamp debian/tmp/odbc-example-prep/demo.adb
gnatmake -p -Pdebian/gnade_odbc_example_build -XLIBTYPE=dynamic
export LD_LIBRARY_PATH=`pwd`/debian/tmp; debian/tmp/odbc-example-obj/demo