[Fingerforce-commits] [SCM] libfprint packaging for Debian by the FingerForce Team. branch, debian, updated. debian/0.4.0-4-gdfff16f-2-4-gd7d9405

[Didier Raboud]

The following commit has been merged in the debian branch:
commit d7d940575e452e97af53c396093063fcfb755f6b
Author: Didier Raboud <odyx at debian.org>
Date:   Sun Jul 8 13:10:46 2012 -0600

    Fix libusb global variables FTBFS.
    
    Closes: #680838

diff --git a/debian/patches/Fix-libusb-global-variables-FTBFS.patch b/debian/patches/Fix-libusb-global-variables-FTBFS.patch
new file mode 100644
index 0000000..3af9e68
--- /dev/null
+++ b/debian/patches/Fix-libusb-global-variables-FTBFS.patch
@@ -0,0 +1,75 @@
+Description: Fix FTBFS caused by generic global variables declaration.
+Author: Didier Raboud <odyx at debian.org>
+Origin: vendor
+Bug: http://bugs.debian.org/680838
+Last-Update: 2012-07-08
+--- a/libfprint/core.c
++++ b/libfprint/core.c
+@@ -291,25 +291,25 @@
+ #ifndef ENABLE_DEBUG_LOGGING
+ 	if (!log_level)
+ 		return;
+-	if (level == LOG_LEVEL_WARNING && log_level < 2)
++	if (level == FPRINT_LOG_LEVEL_WARNING && log_level < 2)
+ 		return;
+-	if (level == LOG_LEVEL_INFO && log_level < 3)
++	if (level == FPRINT_LOG_LEVEL_INFO && log_level < 3)
+ 		return;
+ #endif
+ 
+ 	switch (level) {
+-	case LOG_LEVEL_INFO:
++	case FPRINT_LOG_LEVEL_INFO:
+ 		prefix = "info";
+ 		break;
+-	case LOG_LEVEL_WARNING:
++	case FPRINT_LOG_LEVEL_WARNING:
+ 		stream = stderr;
+ 		prefix = "warning";
+ 		break;
+-	case LOG_LEVEL_ERROR:
++	case FPRINT_LOG_LEVEL_ERROR:
+ 		stream = stderr;
+ 		prefix = "error";
+ 		break;
+-	case LOG_LEVEL_DEBUG:
++	case FPRINT_LOG_LEVEL_DEBUG:
+ 		stream = stderr;
+ 		prefix = "debug";
+ 		break;
+--- a/libfprint/fp_internal.h
++++ b/libfprint/fp_internal.h
+@@ -33,10 +33,10 @@
+         (type *)( (char *)__mptr - offsetof(type,member) );})
+ 
+ enum fpi_log_level {
+-	LOG_LEVEL_DEBUG,
+-	LOG_LEVEL_INFO,
+-	LOG_LEVEL_WARNING,
+-	LOG_LEVEL_ERROR,
++	FPRINT_LOG_LEVEL_DEBUG,
++	FPRINT_LOG_LEVEL_INFO,
++	FPRINT_LOG_LEVEL_WARNING,
++	FPRINT_LOG_LEVEL_ERROR,
+ };
+ 
+ void fpi_log(enum fpi_log_level, const char *component, const char *function,
+@@ -53,14 +53,14 @@
+ #endif
+ 
+ #ifdef ENABLE_DEBUG_LOGGING
+-#define fp_dbg(fmt...) _fpi_log(LOG_LEVEL_DEBUG, fmt)
++#define fp_dbg(fmt...) _fpi_log(FPRINT_LOG_LEVEL_DEBUG, fmt)
+ #else
+ #define fp_dbg(fmt...)
+ #endif
+ 
+-#define fp_info(fmt...) _fpi_log(LOG_LEVEL_INFO, fmt)
+-#define fp_warn(fmt...) _fpi_log(LOG_LEVEL_WARNING, fmt)
+-#define fp_err(fmt...) _fpi_log(LOG_LEVEL_ERROR, fmt)
++#define fp_info(fmt...) _fpi_log(FPRINT_LOG_LEVEL_INFO, fmt)
++#define fp_warn(fmt...) _fpi_log(FPRINT_LOG_LEVEL_WARNING, fmt)
++#define fp_err(fmt...) _fpi_log(FPRINT_LOG_LEVEL_ERROR, fmt)
+ 
+ #ifndef NDEBUG
+ #define BUG_ON(condition) \
diff --git a/debian/patches/series b/debian/patches/series
index ad7c2ea..f590d6d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 kFreeBSD_FTBFS_add_ETIME_definition.patch
 udev-rules-creation-add-Debian-specifics.patch
 Fix-blacklist-handling-in-udev-rules-creation.patch
+Fix-libusb-global-variables-FTBFS.patch

-- 
libfprint packaging for Debian by the FingerForce Team.