The unified diff between revisions [c9f346c2..] and [bd016fa4..] is displayed below. It can also be downloaded as a raw diff.

This diff has been restricted to the following files: 'debian/rules'

#
#
# patch "debian/rules"
#  from [aad015b0b4b4647c87d90b96a1dd541a4639a706]
#    to [ef2a92ad3ab8bb186f1b44287e9a61b74f5a8db2]
#
============================================================
--- debian/rules	aad015b0b4b4647c87d90b96a1dd541a4639a706
+++ debian/rules	ef2a92ad3ab8bb186f1b44287e9a61b74f5a8db2
@@ -17,12 +17,10 @@
 # along with this program; if not, write to the Free Software
 # 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

-# This file builds GNADE for Debian GNU/Linux, without touching the
-# original source files.  The build target does everything in the
-# build directory.  The binary targets move files from there to
-# the package-specific subdirectories under debian.
-
 .SUFFIXES=

 include /usr/share/quilt/quilt.make
@@ -35,6 +33,11 @@ sqlite3_soversion := 2
 odbc_soversion 	  := 2
 sqlite3_soversion := 2

+# aliversions change when any ali file changes
+common_aliversion  := 1
+odbc_aliversion    := 1
+sqlite3_aliversion := 1
+
 CPUS := $(shell getconf _NPROCESSORS_ONLN)

 # Targets mandated by the Debian Policy
@@ -48,14 +51,17 @@ libs := common odbc sqlite3

 libs := common odbc sqlite3

-all_packages += $(foreach l,$(libs), install$(l) libgnade$(l)-dev)
-
 build-arch: $(addprefix debian/libgnade,$(addsuffix -stamp,$(libs)))

 build-indep:

+all_packages += $(foreach l,$(libs), libgnade$(l)-so libgnade$(l)-dev)
+
 binary: binary-arch

+# we ignore the warnings about "dependency on libgnadecommon.so.1
+# could be avoided" for libgnadeodbc; see gnade_odbc_build.gpr for
+# more info.
 binary-arch: build-arch testroot $(all_packages)
 	dh_shlibdeps -a
 	dh_installdocs -a
@@ -112,11 +118,11 @@ debian/tmp/%-prep:
 ##############################################################################
 # Targets that move files into the proper packages

-# Install a binary library package
-installcommon:  package := libgnadecommon$(common_soversion)
-installodbc:    package := libgnadeodbc$(odbc_soversion)
-installsqlite3: package := libgnadesqlite3-$(sqlite3_soversion)
-install%: debian/libgnade%-stamp
+# Install a shared object library package
+libgnadecommon-so:  package := libgnadecommon$(common_soversion)
+libgnadeodbc-so:    package := libgnadeodbc$(odbc_soversion)
+libgnadesqlite3-so: package := libgnadesqlite3-$(sqlite3_soversion)
+libgnade%-so: debian/libgnade%-stamp
 	dh_installdirs -p$(package) usr/lib
 	dh_install -p$(package) debian/tmp/libgnade$*.so.$($*_soversion) usr/lib
 	dh_strip -p$(package) --dbg-package=libgnade$*-dbg
@@ -126,27 +132,30 @@ install%: debian/libgnade%-stamp
 # adalib/gnade and adainclude/gnade, and there is only one project
 # file provided by libgnadecommon-dev. All other -dev packages depend
 # on it.
+libgnadeodbc-dev:    package := libgnadeodbc$(odbc_aliversion)-dev
+libgnadesqlite3-dev: package := libgnadesqlite3-$(sqlite3_aliversion)-dev
 libgnade%-dev: debian/libgnade%-stamp
-	dh_installdirs -p$@ \
+	dh_installdirs -p$(package) \
 	   usr/share/ada/adainclude/gnade \
 	   usr/lib/ada/adalib/gnade
-	dh_install -p$@ debian/tmp/$*-dynamic/*.ali usr/lib/ada/adalib/gnade
-	dh_install -p$@ dbi/$*/*.ad[bs] usr/share/ada/adainclude/gnade
-	if [ -d debian/tmp/$*-prep ]; then dh_install -p$@ debian/tmp/$*-prep/*.ad[bs] usr/share/ada/adainclude/gnade; fi
-	dh_install -p$@ debian/tmp/libgnade$*.a debian/tmp/libgnade$*.so.$($*_soversion) /usr/lib
+	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_install -p$(package) debian/tmp/libgnade$*.a /usr/lib
 	dh_link -p$@ /usr/lib/libgnade$*.so.$($*_soversion) \
 	   /usr/lib/libgnade$*.so

 # Install libgnadecommon-dev; this overrides the pattern target above.
+libgnadecommon-dev: package := libgnadecommon$(common_aliversion)-dev
 libgnadecommon-dev: debian/libgnadecommon-stamp
-	dh_installdirs -p$@ \
+	dh_installdirs -p$(package) \
 	   usr/share/ada/adainclude/gnade \
 	   usr/lib/ada/adalib/gnade
-	dh_install -p$@ debian/tmp/common-dynamic/*.ali usr/lib/ada/adalib/gnade
-	dh_install -p$@ support/*.ad[bs] usr/share/ada/adainclude/gnade
-	dh_install -p$@ debian/gnade.gpr usr/share/ada/adainclude
-	dh_install -p$@ debian/tmp/libgnadecommon.a debian/tmp/libgnadecommon.so.$(common_soversion) /usr/lib
-	dh_link -p$@ /usr/lib/libgnadecommon.so.$(common_soversion) \
+	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

 # check the build by running some examples running the odbc example
@@ -182,4 +191,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: regexp := ^Version: \([0-9.]\+-.\+\)$$
+lint: version := $(shell dpkg-parsechangelog | grep ^Version | sed 's/$(regexp)/\1/')
+lint:
+	cd ..; lintian --lab ../../lint/gnade-$(version) -i gnade*.changes
+
 # end of file