Package: release.debian.org Severity: normal User: release.debian....@packages.debian.org Usertags: unblock
-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 Please unblock package libfprint. The -4 upload fixes the #680838 FTBFS, revealed by a Lucas-powered rebuild, which also made me file #680865against src:libusbx (already solved by the 2:1.0.12-2 upload there). unblock libfprint/1:0.4.0-4-gdfff16f-4 debdiff and patch are attached. Cheers, OdyX -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.12 (GNU/Linux) iQGcBAEBCAAGBQJP+yP6AAoJEIvPpx7KFjRVGYIL/jjqB2yXyPsNQJkS4LGfatCU f5KaVKS32qJYceMrBhrD67z1vWrt/0aqHDU6p1LM/KGW6vLh63rImXTrj1ORz5qo AJDWx/oPYow716mxQ7dOot6LKVwsA1C7MHT6QokH8As8mm7HXSzl78L8X4wPC5qo ICqrDCOx8Szdhv6BlUomsjP3yseNPwCuD6XyO9ojPdaSQa9nOO/wNHX3PQHBaRls peq/1wpMW97lEc2zb5HxbzlA4Nyd1/L+vfD8THfLjdEQnBBs+r7VOJZYvHzZ7pwV jRnnFFX1MKOIgwqKnolEB6uOIcQspTD+5Z35g2yHKrhWTI5qAvpHVZTEKgTszENC n+6iWU6lgvjbQMai9jI5SqIM4H4c/XyNjI7ge9BT/wZUM9Yi8EznrSi5SpoKmfcS bimCFlwx/fy6Z3JNPBfN/6KbbdmFx4Ifdk1udcBEY+wzyBqiTuCYrvIJamMbB1Yn ic4qskSfKJC8Uc3nZNnDKcwAdKcfM7dSNwDzmFjCTw== =Ow/U -----END PGP SIGNATURE-----
diff -Nru libfprint-0.4.0-4-gdfff16f/debian/changelog libfprint-0.4.0-4-gdfff16f/debian/changelog --- libfprint-0.4.0-4-gdfff16f/debian/changelog 2012-06-26 10:52:17.000000000 +0200 +++ libfprint-0.4.0-4-gdfff16f/debian/changelog 2012-07-09 00:46:25.000000000 +0200 @@ -1,3 +1,9 @@ +libfprint (1:0.4.0-4-gdfff16f-4) unstable; urgency=low + + * Fix libusb global variables FTBFS. (Closes: #680838) + + -- Didier Raboud <o...@debian.org> Mon, 09 Jul 2012 00:46:05 +0200 + libfprint (1:0.4.0-4-gdfff16f-3) unstable; urgency=low * Patch the udev rules creator to: diff -Nru libfprint-0.4.0-4-gdfff16f/debian/patches/Fix-libusb-global-variables-FTBFS.patch libfprint-0.4.0-4-gdfff16f/debian/patches/Fix-libusb-global-variables-FTBFS.patch --- libfprint-0.4.0-4-gdfff16f/debian/patches/Fix-libusb-global-variables-FTBFS.patch 1970-01-01 01:00:00.000000000 +0100 +++ libfprint-0.4.0-4-gdfff16f/debian/patches/Fix-libusb-global-variables-FTBFS.patch 2012-07-09 00:37:43.000000000 +0200 @@ -0,0 +1,75 @@ +Description: Fix FTBFS caused by generic global variables declaration. +Author: Didier Raboud <o...@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 -Nru libfprint-0.4.0-4-gdfff16f/debian/patches/series libfprint-0.4.0-4-gdfff16f/debian/patches/series --- libfprint-0.4.0-4-gdfff16f/debian/patches/series 2012-06-26 10:51:13.000000000 +0200 +++ libfprint-0.4.0-4-gdfff16f/debian/patches/series 2012-07-09 00:37:43.000000000 +0200 @@ -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
Description: Fix FTBFS caused by generic global variables declaration. Author: Didier Raboud <o...@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) \
