From 73758aa9412ac6e0da96d1010da197b05cfef51a Mon Sep 17 00:00:00 2001 From: =?utf8?q?Fr=C3=A9d=C3=A9ric-Emmanuel=20PICCA?= Date: Thu, 12 Feb 2009 11:29:32 +0100 Subject: [PATCH] * add the tango.pc file --- debian/liblog4tango4-dev.install | 2 +- debian/libtango6-dev.install | 1 + debian/patches/series | 1 + debian/patches/upstream_pkgconfig_tango.patch | 48 +++++++++++++++++++++++++++ debian/rules | 5 ++- 5 files changed, 55 insertions(+), 2 deletions(-) create mode 100644 debian/patches/upstream_pkgconfig_tango.patch diff --git a/debian/liblog4tango4-dev.install b/debian/liblog4tango4-dev.install index 5dc742c..3e35454 100644 --- a/debian/liblog4tango4-dev.install +++ b/debian/liblog4tango4-dev.install @@ -1,3 +1,3 @@ usr/include/log4tango/* usr/lib/liblog4tango*.so -usr/lib/pkgconfig/* +usr/lib/pkgconfig/log4tango.pc diff --git a/debian/libtango6-dev.install b/debian/libtango6-dev.install index dfc0083..9449c93 100644 --- a/debian/libtango6-dev.install +++ b/debian/libtango6-dev.install @@ -1,3 +1,4 @@ usr/include/*.h usr/include/idl usr/lib/libtango*.so +usr/lib/pkgconfig/tango.pc diff --git a/debian/patches/series b/debian/patches/series index 8b30347..5ff1945 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -6,3 +6,4 @@ fix_libtango_compilation.patch fix_gcc4.3_compilation.patch update_doxygen_file.patch upstream_pkgconfig_log4tango.patch +upstream_pkgconfig_tango.patch diff --git a/debian/patches/upstream_pkgconfig_tango.patch b/debian/patches/upstream_pkgconfig_tango.patch new file mode 100644 index 0000000..a3bad4d --- /dev/null +++ b/debian/patches/upstream_pkgconfig_tango.patch @@ -0,0 +1,48 @@ +Index: tango/lib/cpp/tango.pc.in +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ tango/lib/cpp/tango.pc.in 2009-02-12 11:03:24.000000000 +0100 +@@ -0,0 +1,10 @@ ++prefix=@prefix@ ++exec_prefix=@exec_prefix@ ++libdir=@libdir@ ++includedir=@includedir@ ++Name: tango ++Description: The tango constrol system library ++Version: @VERSION@ ++Requires: omniDynamic4 >= 4.1.2 omniCOS4 ++Libs: -L${libdir} -ltango ++Cflags: -I${includedir} +Index: tango/configure.in +=================================================================== +--- tango.orig/configure.in 2009-02-12 11:07:30.000000000 +0100 ++++ tango/configure.in 2009-02-12 11:08:13.000000000 +0100 +@@ -357,6 +357,7 @@ + lib/Makefile + lib/idl/Makefile + lib/cpp/Makefile ++ lib/cpp/tango.pc + lib/cpp/server/Makefile + lib/cpp/server/idl/Makefile + lib/cpp/client/Makefile +Index: tango/configure +=================================================================== +--- tango.orig/configure 2009-02-12 11:08:41.000000000 +0100 ++++ tango/configure 2009-02-12 11:10:31.000000000 +0100 +@@ -24001,7 +24001,7 @@ + subdirs="$subdirs lib/cpp/log4tango" + + +- ac_config_files="$ac_config_files Makefile lib/Makefile lib/idl/Makefile lib/cpp/Makefile lib/cpp/server/Makefile lib/cpp/server/idl/Makefile lib/cpp/client/Makefile lib/cpp/client/helpers/Makefile cppserver/Makefile cppserver/database/Makefile cppserver/database/create_db.sql cppserver/database/create_db.sh cppserver/database/my.cnf cppserver/database/stored_proc.sql cppserver/database/create_db_tables.sql cppserver/database/update_db.sql cppserver/starter/Makefile cppserver/tangotest/Makefile utils/Makefile utils/notifd2db/Makefile scripts/Makefile scripts/jive scripts/logviewer scripts/TangoVers scripts/astor scripts/atkpanel scripts/atktuning scripts/pogo scripts/cvstag scripts/tg_devtest scripts/tango scripts/devicetree scripts/jdraw scripts/synopticappli scripts/atkmoni doc/Makefile templates/Makefile templates/pogo/cpp/Makefile" ++ ac_config_files="$ac_config_files Makefile lib/Makefile lib/idl/Makefile lib/cpp/Makefile lib/cpp/tango.pc lib/cpp/server/Makefile lib/cpp/server/idl/Makefile lib/cpp/client/Makefile lib/cpp/client/helpers/Makefile cppserver/Makefile cppserver/database/Makefile cppserver/database/create_db.sql cppserver/database/create_db.sh cppserver/database/my.cnf cppserver/database/stored_proc.sql cppserver/database/create_db_tables.sql cppserver/database/update_db.sql cppserver/starter/Makefile cppserver/tangotest/Makefile utils/Makefile utils/notifd2db/Makefile scripts/Makefile scripts/jive scripts/logviewer scripts/TangoVers scripts/astor scripts/atkpanel scripts/atktuning scripts/pogo scripts/cvstag scripts/tg_devtest scripts/tango scripts/devicetree scripts/jdraw scripts/synopticappli scripts/atkmoni doc/Makefile templates/Makefile templates/pogo/cpp/Makefile" + cat >confcache <<\_ACEOF + # This file is a shell script that caches the results of configure + # tests run on this system so they can be shared between configure +@@ -24590,6 +24590,7 @@ + "lib/Makefile" ) CONFIG_FILES="$CONFIG_FILES lib/Makefile" ;; + "lib/idl/Makefile" ) CONFIG_FILES="$CONFIG_FILES lib/idl/Makefile" ;; + "lib/cpp/Makefile" ) CONFIG_FILES="$CONFIG_FILES lib/cpp/Makefile" ;; ++ "lib/cpp/tango.pc" ) CONFIG_FILES="$CONFIG_FILES lib/cpp/tango.pc" ;; + "lib/cpp/server/Makefile" ) CONFIG_FILES="$CONFIG_FILES lib/cpp/server/Makefile" ;; + "lib/cpp/server/idl/Makefile" ) CONFIG_FILES="$CONFIG_FILES lib/cpp/server/idl/Makefile" ;; + "lib/cpp/client/Makefile" ) CONFIG_FILES="$CONFIG_FILES lib/cpp/client/Makefile" ;; diff --git a/debian/rules b/debian/rules index 44927c4..faa8b58 100755 --- a/debian/rules +++ b/debian/rules @@ -18,6 +18,7 @@ build-stamp: dh build --before configure dh_auto_configure -- --with-omni=/usr --disable-dbcreate --disable-java #ugly hack + touch aclocal.m4 touch lib/cpp/log4tango/aclocal.m4 touch lib/cpp/log4tango/Makefile.am touch lib/cpp/log4tango/Makefile.in @@ -36,9 +37,11 @@ install-stamp: install -p -m 644 cppserver/database/create_db_tables.sql debian/tmp/usr/share/tango-db/create_db_tables.sql install -p -m 644 cppserver/database/stored_proc.sql debian/tmp//usr/share/tango-db/stored_proc.sql install -p -m 600 cppserver/database/my.cnf debian/tmp/usr/share/tango-db/my.cnf - # log4tango have a different version number + # install the pkg-config files + # log4tango.pc and tango.pc install -d debian/tmp/usr/lib/pkgconfig install -p -m 644 lib/cpp/log4tango/log4tango.pc debian/tmp/usr/lib/pkgconfig/log4tango.pc + install -p -m 644 lib/cpp/tango.pc debian/tmp/usr/lib/pkgconfig/tango.pc dh install --remaining -v touch install-stamp -- 2.11.4.GIT