The unified diff between revisions [b89440b3..] and [121647f0..] 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 [98b4a2a3ee7734b9665829001b693ba2f8f4e96d] # to [aad015b0b4b4647c87d90b96a1dd541a4639a706] # ============================================================ --- debian/rules 98b4a2a3ee7734b9665829001b693ba2f8f4e96d +++ debian/rules aad015b0b4b4647c87d90b96a1dd541a4639a706 @@ -132,8 +132,8 @@ libgnade%-dev: debian/libgnade%-stamp 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 - dh_install -p$@ debian/tmp/$*-prep/*.ad[bs] usr/share/ada/adainclude/gnade - dh_install -p$@ debian/tmp/libgnade$*.a debian/tmp/libgnade%.so.$($*_soversion) /usr/lib + 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_link -p$@ /usr/lib/libgnade$*.so.$($*_soversion) \ /usr/lib/libgnade$*.so @@ -149,17 +149,21 @@ libgnadecommon-dev: debian/libgnadecommo dh_link -p$@ /usr/lib/libgnadecommon.so.$(common_soversion) \ /usr/lib/libgnadecommon.so -# check the build by running some examples -check: patch debian/check-odbc-stamp debian/check-sqlite3-stamp +# 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: patch debian/check-sqlite3-stamp # create 'gnade' mysql account, 'gnade' mysql database # install 'MySQL' odbc driver, 'gnade_mysql' odbc source # assumes mysql root account has no password +# assumes mysqld has been started; use '/etc/init.d/mysql start' +# assumes gnade db and user have not already been created debian/odbc-source-stamp: - dh_testroot - mysqladmin create gnade - echo "create user gnade identified by 'gnade'" | mysql - echo "grant all on gnade.* to gnade" | mysql + mysqladmin -uroot create gnade + echo "create user gnade identified by 'gnade'" | mysql -uroot + echo "grant all on gnade.* to gnade" | mysql -uroot mysql -ugnade -pgnade < samples/sample_db/gnade.mysql.sql odbcinst -i -d -f debian/odbc_mysql_driver.ini odbcinst -i -s -l -f debian/odbc_mysql_source.ini