[gadap] 10/24: Add pkg-config file; delete trash
Alastair McKinstry
mckinstry at moszumanska.debian.org
Thu Aug 27 14:35:33 UTC 2015
This is an automated email from the git hooks/post-receive script.
mckinstry pushed a commit to tag debian/2.0-4
in repository gadap.
commit 89c25727d109a190cf04fdeaaebf701b220f4c6c
Author: Alastair McKinstry <mckinstry at debian.org>
Date: Tue Oct 25 12:40:04 2011 +0100
Add pkg-config file; delete trash
---
debian/autoreconf.after | 56 ---------------------------
debian/autoreconf.before | 50 ------------------------
debian/changelog | 6 +++
debian/libgadap-dev.debhelper.log | 2 -
debian/libgadap2.debhelper.log | 2 -
debian/patches/pkg-config.patch | 81 +++++++++++++++++++++++++++++++++++++++
debian/patches/series | 1 +
7 files changed, 88 insertions(+), 110 deletions(-)
diff --git a/debian/autoreconf.after b/debian/autoreconf.after
deleted file mode 100644
index 6cd1502..0000000
--- a/debian/autoreconf.after
+++ /dev/null
@@ -1,56 +0,0 @@
-1bc15e1dff791b5831719c8e079da89d ./Makefile.am
-d134f2945a98ea8ac4ec8cf045bdf006 ./gadap-config.in
-b30a917bd66f6ca244932e68d08ad5f4 ./configure.ac
-d1bd83a33f1a841ab7fda32449746cc4 ./VERSION
-72f12aabfcadc7aae3252edf334b2980 ./test/Makefile.am
-ca003e578445b1f78198991c38ff6f77 ./test/Makefile.in
-0b348e27da975a215764b3c673e9b3a3 ./test/test.cc
-0afce91a3daa1fdc32ee36370c1129dd ./m4/install-sh
-21504de31981a67b5b93b265029d1865 ./m4/depcomp
-2e9d13b09afbdc7c7c743ca2374fd85b ./m4/libdap.m4
-766574f467c38d27fc7604ca8eb6734c ./m4/mkinstalldirs
-9d9668fb32d0542b712be2c34ca79bd7 ./m4/missing
-4e27c3d5f72e3b6a85174fe6c5e66e0e ./configure
-c6da6f54464e87efc3179b4bf92263ed ./aclocal.m4
-aad78a990038a8eaddb2fde1c6cde548 ./.pc/applied-patches
-266f9759f56277b2751b24d1eb17c50f ./.pc/.quilt_patches
-d41d8cd98f00b204e9800998ecf8427e ./.pc/x/VERSION
-247bafda6e5c22b0d07314a065f4a6f1 ./.pc/x/configure
-a99f8c25ef95708dcd055d17f1cc748a ./.pc/x/config.h.in
-e8a673d5d4d69a5fd11c880fd4c3c481 ./.pc/.quilt_series
-26ab0db90d72e28ad0ba1e22ee510510 ./.pc/.version
-d41d8cd98f00b204e9800998ecf8427e ./.pc/libdap-conf.patch/.timestamp
-901dcd13f218b49b2835b74920e3a3dd ./.pc/libdap-conf.patch/m4/libdap.m4
-38b7e81ddfc5e4c6f46e8384bd81d393 ./autom4te.cache/requests
-31ec6009eca4afb2a1991870df77fdab ./autom4te.cache/traces.0
-dcb522ed4c6becf4241fc835a39833ea ./autom4te.cache/output.1
-92f068225a656d706b980a6d0af6654f ./autom4te.cache/traces.1
-dcb522ed4c6becf4241fc835a39833ea ./autom4te.cache/output.0
-95301e1f150f744239458d3e507c5e40 ./Makefile.in
-a76febd37c45c1a1da52d6f7b0249b82 ./COPYRIGHT
-d41d8cd98f00b204e9800998ecf8427e ./etc/install-sh
-d41d8cd98f00b204e9800998ecf8427e ./etc/depcomp
-d41d8cd98f00b204e9800998ecf8427e ./etc/mkinstalldirs
-d41d8cd98f00b204e9800998ecf8427e ./etc/missing
-5880309ba6f7784d24c2bac64728ee4a ./src/Makefile.am
-374ce9a5f1afd87accbbed408d671b02 ./src/gaBaseTypes.cc
-dbd50066e9080e50854ae7d6bc509dc0 ./src/NCTypeFactory.h
-acff0cc0c5a795742190c695ef7e8678 ./src/gaConnect.h
-bcb9f6c107dd18f0e6f919e3f9399570 ./src/NCTypeFactory.cc
-9dc112450747673782df9e1c9b2b09d2 ./src/gaUtils.h
-4c3352ad20a774872e5098a61013fcdc ./src/gaReports.h
-2ccd5e6e996e7c9ee4ba867fa2059ba1 ./src/Connections.cc
-8e1ea4cf4ba0f4667f9aeca57a16dd06 ./src/gadap_err.h
-2efcd79f99cedfeb85a5b9eb72558e55 ./src/gaTypeFactory.cc
-b76d97c33ccec666c89920640d834c2d ./src/gadap.cc
-e7d21217f6f93f6410932e06460a1ab7 ./src/Makefile.in
-c8692c82aaed1915417603cfd49ec3c3 ./src/gadap.h
-b34c949febe4e48599e77d5a2b630937 ./src/Connections.h
-cbc2ba51ecd4b5be516bfed5f86ef590 ./src/gaBaseTypes.h
-fe00e6fd0d4fd831f80db98740b3f2d0 ./src/gaReports.cc
-ed05cbd5b48b6d9454bd21a3301fbbd3 ./src/gadap_types.h
-79ffb479a60ddb58a44fd682c3a42e18 ./src/gaUtils.cc
-2526cf4b9efb1ac1f7c72117abf5b6af ./src/gaConnect.cc
-dbd50066e9080e50854ae7d6bc509dc0 ./src/gaTypeFactory.h
-dd8199abeaf0ef8b91afcb7f49fe95de ./config.h.in~
-dd8199abeaf0ef8b91afcb7f49fe95de ./config.h.in
diff --git a/debian/autoreconf.before b/debian/autoreconf.before
deleted file mode 100644
index ff9af12..0000000
--- a/debian/autoreconf.before
+++ /dev/null
@@ -1,50 +0,0 @@
-1bc15e1dff791b5831719c8e079da89d ./Makefile.am
-d134f2945a98ea8ac4ec8cf045bdf006 ./gadap-config.in
-b30a917bd66f6ca244932e68d08ad5f4 ./configure.ac
-d1bd83a33f1a841ab7fda32449746cc4 ./VERSION
-72f12aabfcadc7aae3252edf334b2980 ./test/Makefile.am
-dbbb0d58bfb8e6a42b6eb128d425aa26 ./test/Makefile.in
-0b348e27da975a215764b3c673e9b3a3 ./test/test.cc
-aded5875c5d5830de6653181e8ced19c ./m4/install-sh
-d7d8db17e074dcabf513d766b728993d ./m4/depcomp
-2e9d13b09afbdc7c7c743ca2374fd85b ./m4/libdap.m4
-64e8ff72710e830f15a347863b848c7d ./m4/mkinstalldirs
-5d58f0dd4262171a71b65bd515d85d07 ./m4/missing
-45938e211bbe8d29a107e0a7bcd8e9cd ./configure
-6375ab69eeb0263a6e00b753ce24757a ./aclocal.m4
-aad78a990038a8eaddb2fde1c6cde548 ./.pc/applied-patches
-266f9759f56277b2751b24d1eb17c50f ./.pc/.quilt_patches
-d41d8cd98f00b204e9800998ecf8427e ./.pc/x/VERSION
-247bafda6e5c22b0d07314a065f4a6f1 ./.pc/x/configure
-a99f8c25ef95708dcd055d17f1cc748a ./.pc/x/config.h.in
-e8a673d5d4d69a5fd11c880fd4c3c481 ./.pc/.quilt_series
-26ab0db90d72e28ad0ba1e22ee510510 ./.pc/.version
-d41d8cd98f00b204e9800998ecf8427e ./.pc/libdap-conf.patch/.timestamp
-901dcd13f218b49b2835b74920e3a3dd ./.pc/libdap-conf.patch/m4/libdap.m4
-3a9d8ec713386102d25ae7135927b4cd ./Makefile.in
-a76febd37c45c1a1da52d6f7b0249b82 ./COPYRIGHT
-d41d8cd98f00b204e9800998ecf8427e ./etc/install-sh
-d41d8cd98f00b204e9800998ecf8427e ./etc/depcomp
-d41d8cd98f00b204e9800998ecf8427e ./etc/mkinstalldirs
-d41d8cd98f00b204e9800998ecf8427e ./etc/missing
-5880309ba6f7784d24c2bac64728ee4a ./src/Makefile.am
-374ce9a5f1afd87accbbed408d671b02 ./src/gaBaseTypes.cc
-dbd50066e9080e50854ae7d6bc509dc0 ./src/NCTypeFactory.h
-acff0cc0c5a795742190c695ef7e8678 ./src/gaConnect.h
-bcb9f6c107dd18f0e6f919e3f9399570 ./src/NCTypeFactory.cc
-9dc112450747673782df9e1c9b2b09d2 ./src/gaUtils.h
-4c3352ad20a774872e5098a61013fcdc ./src/gaReports.h
-2ccd5e6e996e7c9ee4ba867fa2059ba1 ./src/Connections.cc
-8e1ea4cf4ba0f4667f9aeca57a16dd06 ./src/gadap_err.h
-2efcd79f99cedfeb85a5b9eb72558e55 ./src/gaTypeFactory.cc
-b76d97c33ccec666c89920640d834c2d ./src/gadap.cc
-1801498dfeb19f9d531803db7a6bce61 ./src/Makefile.in
-c8692c82aaed1915417603cfd49ec3c3 ./src/gadap.h
-b34c949febe4e48599e77d5a2b630937 ./src/Connections.h
-cbc2ba51ecd4b5be516bfed5f86ef590 ./src/gaBaseTypes.h
-fe00e6fd0d4fd831f80db98740b3f2d0 ./src/gaReports.cc
-ed05cbd5b48b6d9454bd21a3301fbbd3 ./src/gadap_types.h
-79ffb479a60ddb58a44fd682c3a42e18 ./src/gaUtils.cc
-2526cf4b9efb1ac1f7c72117abf5b6af ./src/gaConnect.cc
-dbd50066e9080e50854ae7d6bc509dc0 ./src/gaTypeFactory.h
-dd8199abeaf0ef8b91afcb7f49fe95de ./config.h.in
diff --git a/debian/changelog b/debian/changelog
index fcaa4d2..fe5e3a7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+gadap (2.0-2) unstable; urgency=low
+
+ * Add pkg-config file.
+
+ -- Alastair McKinstry <mckinstry at debian.org> Tue, 25 Oct 2011 12:39:01 +0100
+
gadap (2.0-1) unstable; urgency=low
* Initial release. (Closes: #646433).
diff --git a/debian/libgadap-dev.debhelper.log b/debian/libgadap-dev.debhelper.log
deleted file mode 100644
index 7fdfa7f..0000000
--- a/debian/libgadap-dev.debhelper.log
+++ /dev/null
@@ -1,2 +0,0 @@
-dh_autoreconf
-dh_auto_configure
diff --git a/debian/libgadap2.debhelper.log b/debian/libgadap2.debhelper.log
deleted file mode 100644
index 7fdfa7f..0000000
--- a/debian/libgadap2.debhelper.log
+++ /dev/null
@@ -1,2 +0,0 @@
-dh_autoreconf
-dh_auto_configure
diff --git a/debian/patches/pkg-config.patch b/debian/patches/pkg-config.patch
new file mode 100644
index 0000000..6217af6
--- /dev/null
+++ b/debian/patches/pkg-config.patch
@@ -0,0 +1,81 @@
+Author: Alastair McKinstry <mckinstry at debian.org>
+Description: Add gadap.pc pkg-config file to gadap
+Last-Updated: 2011-10-25
+Forwwarded: no
+
+Index: gadap-2.0/configure.ac
+===================================================================
+--- gadap-2.0.orig/configure.ac 2011-10-24 16:50:06.000000000 +0100
++++ gadap-2.0/configure.ac 2011-10-25 11:34:15.000000000 +0100
+@@ -38,6 +38,7 @@
+ AC_CONFIG_FILES([Makefile
+ src/Makefile
+ test/Makefile
++ gadap.pc
+ ])
+ AC_CONFIG_FILES([gadap-config], [chmod 755 gadap-config])
+ AC_OUTPUT
+Index: gadap-2.0/gadap.pc.in
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ gadap-2.0/gadap.pc.in 2011-10-25 11:54:31.000000000 +0100
+@@ -0,0 +1,13 @@
++prefix=@prefix@
++exec_prefix=${prefix}
++libdir=@libdir@
++includedir=${prefix}/include
++ccompiler=gcc
++cppcompiler=g++
++
++Name: @PACKAGE_NAME@
++Description:
++Version: @PACKAGE_VERSION@
++Libs: -L${libdir} -lgadap
++Libs.private: -lpthread
++Requires: libdapclient libdapserver
+Index: gadap-2.0/gadap-config.in
+===================================================================
+--- gadap-2.0.orig/gadap-config.in 2011-10-25 12:37:21.000000000 +0100
++++ gadap-2.0/gadap-config.in 2011-10-25 12:37:37.000000000 +0100
+@@ -2,11 +2,7 @@
+ #
+ # Borrowed the idea for this script (and some code) from nc-dap which in
+ # turn took it from libcurl.
+-#
+-prefix=@prefix@
+-exec_prefix=${prefix}
+-libdir=${exec_prefix}/lib
+-includedir=${prefix}/include
++# This version now derives out of the pkg-config file (preferred)
+
+ usage()
+ {
+@@ -46,23 +42,23 @@
+ ;;
+
+ --cc)
+- echo "@CC@"
++ `pkg-config --variable=cc gadap`
+ ;;
+
+ --cxx)
+- echo "@CXX@"
++ `pkg-config --variable=cxx gadap`
+ ;;
+
+ --cflags)
+- echo "-I${includedir}/@PACKAGE_NAME@"
++ `pkg-config --cflags gadap`
+ ;;
+
+ --libs)
+- echo "-L${libdir} -lgadap @LIBS@"
++ `pkg-config --libs gadap`
+ ;;
+
+ --prefix)
+- echo "${prefix}"
++ `pkg-config --variable=prefix gadap`
+ ;;
+
+ --version)
diff --git a/debian/patches/series b/debian/patches/series
index bdfaac4..a2233f9 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
libdap-conf.patch
libdap-namespace.patch
test-errors.patch
+pkg-config.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/gadap.git
More information about the debian-science-commits
mailing list