[pkg-wpa-devel] r1125 - in /wpasupplicant/trunk: ./ debian/changelog debian/control debian/patches/01_use_pkg-config_for_pcsc-lite_module debian/patches/series

Sun Feb 10 08:38:23 UTC 2008

Author: siretart
Date: Sun Feb 10 08:38:23 2008
New Revision: 1125

URL: http://svn.debian.org/wsvn/pkg-wpa/?sc=1&rev=1125
Log:
* use pkg-config for detecting how to link against pcsc-lite
  - debian/patches/01_use_pkg-config_for_pcsc-lite_module

Added:
    wpasupplicant/trunk/debian/patches/01_use_pkg-config_for_pcsc-lite_module
Modified:
    wpasupplicant/trunk/   (props changed)
    wpasupplicant/trunk/debian/changelog
    wpasupplicant/trunk/debian/control
    wpasupplicant/trunk/debian/patches/series

Propchange: wpasupplicant/trunk/
------------------------------------------------------------------------------

--- bzr:file-ids (original)
+++ bzr:file-ids Sun Feb 10 08:38:23 2008
@@ -1,0 +1,1 @@
+debian/patches/01_use_pkg-config_for_pcsc-lite_module	01_use_pkgconfig_for-20080209221443-qbtnqlq25yy15hec-1

Propchange: wpasupplicant/trunk/
------------------------------------------------------------------------------
--- bzr:revision-id:v3-trunk1 (original)
+++ bzr:revision-id:v3-trunk1 Sun Feb 10 08:38:23 2008
@@ -7,3 +7,4 @@
 228 siretart at tauware.de-20080209172921-hpwvo3c30ngpn6f0
 229 siretart at tauware.de-20080209205525-exvs01rf5iz3werp
 230 siretart at tauware.de-20080209221815-pytcrgbnplgz0d67
+231 siretart at tauware.de-20080209222225-s2jg0o8gk8il5gbn

Propchange: wpasupplicant/trunk/
------------------------------------------------------------------------------
--- bzr:revision-info (original)
+++ bzr:revision-info Sun Feb 10 08:38:23 2008
@@ -1,4 +1,4 @@
-timestamp: 2008-02-09 23:18:15.253000021 +0100
+timestamp: 2008-02-09 23:22:25.492000103 +0100
 committer: Reinhard Tartler <siretart at tauware.de>
 properties: 
-	branch-nick: better.linking
+	branch-nick: wpasupplicant.trunk.bzr

Modified: wpasupplicant/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/debian/changelog?rev=1125&op=diff
==============================================================================
--- wpasupplicant/trunk/debian/changelog (original)
+++ wpasupplicant/trunk/debian/changelog Sun Feb 10 08:38:23 2008
@@ -39,8 +39,10 @@
     warning.
   * use -Wl,--as-needed to avoid unnecessary linking to ncurses,
     libpthread and libdl.
-
- -- Reinhard Tartler <siretart at tauware.de>  Sat, 09 Feb 2008 22:10:11 +0100
+  * use pkg-config for detecting how to link against pcsc-lite
+    - debian/patches/01_use_pkg-config_for_pcsc-lite_module
+
+ -- Reinhard Tartler <siretart at tauware.de>  Sat, 09 Feb 2008 23:21:37 +0100
 
 wpasupplicant (0.6.2+git20080202.gde6ccd7-1) unstable; urgency=low
 

Modified: wpasupplicant/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/debian/control?rev=1125&op=diff
==============================================================================
--- wpasupplicant/trunk/debian/control (original)
+++ wpasupplicant/trunk/debian/control Sun Feb 10 08:38:23 2008
@@ -4,7 +4,7 @@
 Maintainer: Debian/Ubuntu wpasupplicant Maintainers <pkg-wpa-devel at lists.alioth.debian.org>
 Uploaders: Kyle McMartin <kyle at debian.org>, Reinhard Tartler <siretart at tauware.de>, Kel Modderman <kel at otaku42.de>
 Standards-Version: 3.7.3
-Build-Depends: debhelper (>= 5), quilt, libssl-dev, libpcsclite-dev, libreadline5-dev, libqt4-dev, libdbus-1-dev, docbook, docbook-utils
+Build-Depends: debhelper (>= 5), quilt, libssl-dev, libpcsclite-dev, libreadline5-dev, libqt4-dev, libdbus-1-dev, docbook, docbook-utils, pkg-config
 Vcs-Svn: svn://svn.debian.org/pkg-wpa/wpasupplicant/trunk
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/
 Homepage: http://w1.fi/wpa_supplicant/

Added: wpasupplicant/trunk/debian/patches/01_use_pkg-config_for_pcsc-lite_module
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/debian/patches/01_use_pkg-config_for_pcsc-lite_module?rev=1125&op=file
==============================================================================
--- wpasupplicant/trunk/debian/patches/01_use_pkg-config_for_pcsc-lite_module (added)
+++ wpasupplicant/trunk/debian/patches/01_use_pkg-config_for_pcsc-lite_module Sun Feb 10 08:38:23 2008
@@ -1,0 +1,19 @@
+From: Reinhard Tartler <siretart at tauware.de>
+References: none
+Description: Use pkg-config for libpcsclite linkage flags
+ At least in debian, we can rely on pkg-config being available and
+ returning more accurate ldflags.
+
+--- a/wpa_supplicant/Makefile	2008-02-01 14:38:48 +0000
++++ b/wpa_supplicant/Makefile	2008-02-09 21:21:35 +0000
+@@ -561,7 +561,8 @@
+ #dynamic symbol loading that is now used in pcsc_funcs.c
+ #LIBS += -lwinscard
+ else
+-LIBS += -lpcsclite -lpthread
++# For the debian package, we can rely on pkg-config returning correct values
++LIBS += $(shell pkg-config --libs libpcsclite)
+ endif
+ endif
+ 
+

Modified: wpasupplicant/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/debian/patches/series?rev=1125&op=diff
==============================================================================
--- wpasupplicant/trunk/debian/patches/series (original)
+++ wpasupplicant/trunk/debian/patches/series Sun Feb 10 08:38:23 2008
@@ -1,3 +1,4 @@
+01_use_pkg-config_for_pcsc-lite_module
 02_dbus_group_policy.patch
 03_dbus_service_activation_logfile.patch
 04_append_mmd_to_default_cflags.patch


