package: libhid
version: 0.2.15+20060325-2.2
tags: patch
diff -N -ur libhid-0.2.15+20060325/debian/changelog
libhid-0.2.15+20060325.tabbott/debian/changelog
--- libhid-0.2.15+20060325/debian/changelog 2006-08-11 12:45:17.000000000
-0400
+++ libhid-0.2.15+20060325.tabbott/debian/changelog 2008-12-13
14:47:06.000000000 -0500
@@ -1,3 +1,10 @@
+libhid (0.2.15+20060325-2.2) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Rename include/assert.h to include/hid_assert.h (Closes: #476525).
+
+ -- Tim Abbott <tabb...@mit.edu> Sat, 13 Dec 2008 14:33:16 -0500
+
libhid (0.2.15+20060325-2.1) unstable; urgency=low
* Non-maintainer upload.
diff -N -ur libhid-0.2.15+20060325/include/assert.h
libhid-0.2.15+20060325.tabbott/include/assert.h
--- libhid-0.2.15+20060325/include/assert.h 2005-02-20 15:01:07.000000000
-0500
+++ libhid-0.2.15+20060325.tabbott/include/assert.h 1969-12-31
19:00:00.000000000 -0500
@@ -1,30 +0,0 @@
-#ifndef __INCLUDED_ASSERT_H__
-#define __INCLUDED_ASSERT_H__
-
-#ifndef HID_INTERNAL
-# error "this file is only supposed to be used from within libhid."
-#endif /* HID_INTERNAL */
-
-#include <hid.h>
-#include <debug.h>
-
-#define ASSERT(a) if (!(a) && hid_debug_stream && hid_debug_level &
HID_DEBUG_ASSERTS) \
- fprintf(hid_debug_stream, "*** ASSERTION FAILURE in %s() [%s:%d]: %s\n", \
- __FUNCTION__, __FILE__, __LINE__, #a)
-
-#endif /* __INCLUDED_DEBUG_H__ */
-
-/* COPYRIGHT --
- *
- * This file is part of libhid, a user-space HID access library.
- * libhid is (c) 2003-2005
- * Martin F. Krafft <lib...@pobox.madduck.net>
- * Charles Lepple <clep...@ghz.cc>
- * Arnaud Quette <arnaud.que...@free.fr> && <arnaud.que...@mgeups.com>
- * and distributed under the terms of the GNU General Public License.
- * See the file ./COPYING in the source distribution for more information.
- *
- * THIS PACKAGE IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR IMPLIED
- * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES
- * OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
- */
diff -N -ur libhid-0.2.15+20060325/include/hid_assert.h
libhid-0.2.15+20060325.tabbott/include/hid_assert.h
--- libhid-0.2.15+20060325/include/hid_assert.h 1969-12-31 19:00:00.000000000
-0500
+++ libhid-0.2.15+20060325.tabbott/include/hid_assert.h 2005-02-20
15:01:07.000000000 -0500
@@ -0,0 +1,30 @@
+#ifndef __INCLUDED_ASSERT_H__
+#define __INCLUDED_ASSERT_H__
+
+#ifndef HID_INTERNAL
+# error "this file is only supposed to be used from within libhid."
+#endif /* HID_INTERNAL */
+
+#include <hid.h>
+#include <debug.h>
+
+#define ASSERT(a) if (!(a) && hid_debug_stream && hid_debug_level &
HID_DEBUG_ASSERTS) \
+ fprintf(hid_debug_stream, "*** ASSERTION FAILURE in %s() [%s:%d]: %s\n", \
+ __FUNCTION__, __FILE__, __LINE__, #a)
+
+#endif /* __INCLUDED_DEBUG_H__ */
+
+/* COPYRIGHT --
+ *
+ * This file is part of libhid, a user-space HID access library.
+ * libhid is (c) 2003-2005
+ * Martin F. Krafft <lib...@pobox.madduck.net>
+ * Charles Lepple <clep...@ghz.cc>
+ * Arnaud Quette <arnaud.que...@free.fr> && <arnaud.que...@mgeups.com>
+ * and distributed under the terms of the GNU General Public License.
+ * See the file ./COPYING in the source distribution for more information.
+ *
+ * THIS PACKAGE IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR IMPLIED
+ * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES
+ * OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+ */
diff -N -ur libhid-0.2.15+20060325/Makefile.am
libhid-0.2.15+20060325.tabbott/Makefile.am
--- libhid-0.2.15+20060325/Makefile.am 2005-07-06 10:27:33.000000000 -0400
+++ libhid-0.2.15+20060325.tabbott/Makefile.am 2008-12-13 14:47:06.000000000
-0500
@@ -7,7 +7,7 @@
SUBDIRS = hidparser src $(MAYBE_PYTHONWRAPPER) test doc
dist_noinst_HEADERS = \
- include/assert.h \
+ include/hid_assert.h \
include/constants.h \
include/debug.h \
include/hid_helpers.h \
diff -N -ur libhid-0.2.15+20060325/Makefile.in
libhid-0.2.15+20060325.tabbott/Makefile.in
--- libhid-0.2.15+20060325/Makefile.in 2006-03-25 14:04:52.000000000 -0500
+++ libhid-0.2.15+20060325.tabbott/Makefile.in 2008-12-13 14:47:06.000000000
-0500
@@ -255,7 +255,7 @@
@pythonwrapper_t...@maybe_pythonwrapper = swig
SUBDIRS = hidparser src $(MAYBE_PYTHONWRAPPER) test doc
dist_noinst_HEADERS = \
- include/assert.h \
+ include/hid_assert.h \
include/constants.h \
include/debug.h \
include/hid_helpers.h \
diff -N -ur libhid-0.2.15+20060325/src/bsd.c
libhid-0.2.15+20060325.tabbott/src/bsd.c
--- libhid-0.2.15+20060325/src/bsd.c 2006-03-13 20:46:41.000000000 -0500
+++ libhid-0.2.15+20060325.tabbott/src/bsd.c 2008-12-13 14:47:06.000000000
-0500
@@ -7,7 +7,7 @@
#include <os.h>
#include <debug.h>
-#include <assert.h>
+#include <hid_assert.h>
hid_return hid_os_force_claim(HIDInterface* const hidif, int const interface,
HIDInterfaceMatcher const* const matcher, unsigned short retries)
diff -N -ur libhid-0.2.15+20060325/src/darwin.c
libhid-0.2.15+20060325.tabbott/src/darwin.c
--- libhid-0.2.15+20060325/src/darwin.c 2005-07-07 22:48:15.000000000 -0400
+++ libhid-0.2.15+20060325.tabbott/src/darwin.c 2008-12-13 14:47:06.000000000
-0500
@@ -8,7 +8,7 @@
#include <compiler.h>
#include <debug.h>
-#include <assert.h>
+#include <hid_assert.h>
hid_return hid_os_force_claim(HIDInterface* const hidif, int const interface,
HIDInterfaceMatcher const* const matcher, unsigned short retries UNUSED)
diff -N -ur libhid-0.2.15+20060325/src/debug.c
libhid-0.2.15+20060325.tabbott/src/debug.c
--- libhid-0.2.15+20060325/src/debug.c 2005-02-20 15:01:07.000000000 -0500
+++ libhid-0.2.15+20060325.tabbott/src/debug.c 2008-12-13 14:47:06.000000000
-0500
@@ -1,7 +1,7 @@
#define HID_INTERNAL
#include <debug.h>
-#include <assert.h>
+#include <hid_assert.h>
HIDDebugLevel hid_debug_level = HID_DEBUG_NONE;
FILE* hid_debug_stream = NULL;
diff -N -ur libhid-0.2.15+20060325/src/hid_exchange.c
libhid-0.2.15+20060325.tabbott/src/hid_exchange.c
--- libhid-0.2.15+20060325/src/hid_exchange.c 2006-03-13 20:58:40.000000000
-0500
+++ libhid-0.2.15+20060325.tabbott/src/hid_exchange.c 2008-12-13
14:47:06.000000000 -0500
@@ -7,7 +7,7 @@
#include <compiler.h>
#include <debug.h>
-#include <assert.h>
+#include <hid_assert.h>
/*...@brief Send a control message to retrieve an entire input report
*
diff -N -ur libhid-0.2.15+20060325/src/hid_initialisation.c
libhid-0.2.15+20060325.tabbott/src/hid_initialisation.c
--- libhid-0.2.15+20060325/src/hid_initialisation.c 2006-01-22
23:39:23.000000000 -0500
+++ libhid-0.2.15+20060325.tabbott/src/hid_initialisation.c 2008-12-13
14:47:06.000000000 -0500
@@ -8,7 +8,7 @@
#include <hid_helpers.h>
#include <debug.h>
-#include <assert.h>
+#include <hid_assert.h>
/*...@brief Programmers can check this with hid_is_initialized().
*/
diff -N -ur libhid-0.2.15+20060325/src/hid_opening.c
libhid-0.2.15+20060325.tabbott/src/hid_opening.c
--- libhid-0.2.15+20060325/src/hid_opening.c 2006-01-22 23:39:22.000000000
-0500
+++ libhid-0.2.15+20060325.tabbott/src/hid_opening.c 2008-12-13
14:47:06.000000000 -0500
@@ -5,7 +5,7 @@
#include <os.h>
#include <debug.h>
-#include <assert.h>
+#include <hid_assert.h>
enum USBMatchFlags {
USB_MATCH_NONE = 0x0,
diff -N -ur libhid-0.2.15+20060325/src/hid_parsing.c
libhid-0.2.15+20060325.tabbott/src/hid_parsing.c
--- libhid-0.2.15+20060325/src/hid_parsing.c 2006-03-14 08:38:25.000000000
-0500
+++ libhid-0.2.15+20060325.tabbott/src/hid_parsing.c 2008-12-13
14:47:06.000000000 -0500
@@ -6,7 +6,7 @@
#include <string.h>
#include <debug.h>
-#include <assert.h>
+#include <hid_assert.h>
static void hid_prepare_parse_path(HIDInterface* const hidif,
int const path[], unsigned int const depth)
diff -N -ur libhid-0.2.15+20060325/src/hid_preparation.c
libhid-0.2.15+20060325.tabbott/src/hid_preparation.c
--- libhid-0.2.15+20060325/src/hid_preparation.c 2005-11-23
08:04:19.000000000 -0500
+++ libhid-0.2.15+20060325.tabbott/src/hid_preparation.c 2008-12-13
14:47:06.000000000 -0500
@@ -5,7 +5,7 @@
#include <constants.h>
#include <debug.h>
-#include <assert.h>
+#include <hid_assert.h>
/*! @todo This code does not seem to properly retrieve descriptors for devices
* with multiple interfaces. We probably need to parse each interface a little
diff -N -ur libhid-0.2.15+20060325/src/hid_presentation.c
libhid-0.2.15+20060325.tabbott/src/hid_presentation.c
--- libhid-0.2.15+20060325/src/hid_presentation.c 2005-02-20
15:01:07.000000000 -0500
+++ libhid-0.2.15+20060325.tabbott/src/hid_presentation.c 2008-12-13
14:47:06.000000000 -0500
@@ -4,7 +4,7 @@
#include <hid_helpers.h>
#include <debug.h>
-#include <assert.h>
+#include <hid_assert.h>
hid_return hid_write_identification(FILE* const out,
HIDInterface const* const hidif)
diff -N -ur libhid-0.2.15+20060325/src/libhid-detach-device.c
libhid-0.2.15+20060325.tabbott/src/libhid-detach-device.c
--- libhid-0.2.15+20060325/src/libhid-detach-device.c 2005-02-20
15:01:07.000000000 -0500
+++ libhid-0.2.15+20060325.tabbott/src/libhid-detach-device.c 2008-12-13
14:47:06.000000000 -0500
@@ -5,7 +5,7 @@
#include <stdlib.h>
#include <string.h>
-#include <assert.h>
+#include <hid_assert.h>
#include <debug.h>
int main(int argc, char** argp)
diff -N -ur libhid-0.2.15+20060325/src/linux.c
libhid-0.2.15+20060325.tabbott/src/linux.c
--- libhid-0.2.15+20060325/src/linux.c 2005-02-20 15:01:07.000000000 -0500
+++ libhid-0.2.15+20060325.tabbott/src/linux.c 2008-12-13 14:47:06.000000000
-0500
@@ -7,7 +7,7 @@
#include <os.h>
#include <debug.h>
-#include <assert.h>
+#include <hid_assert.h>
/*...@brief Forcibly claim an interface from an attached kernel driver.
*
diff -N -ur libhid-0.2.15+20060325/swig/Makefile.am
libhid-0.2.15+20060325.tabbott/swig/Makefile.am
--- libhid-0.2.15+20060325/swig/Makefile.am 2006-01-22 23:39:23.000000000
-0500
+++ libhid-0.2.15+20060325.tabbott/swig/Makefile.am 2008-12-13
14:47:06.000000000 -0500
@@ -31,6 +31,7 @@
%.py %_wrap.c: %.i ../include/hid.h
$(SWIG) $(SWIGFLAGS) $<
echo '#include <compiler.h>' > tmp.c
+ echo '#include <assert.h>' >> tmp.c
sed -e 's/PyObject \*self/& UNUSED/' \
-e 's/int flags)/int flags UNUSED)/' < $(patsubst %.i,%_wrap.c,$<)
>> tmp.c \
&& mv tmp.c $(patsubst %.i,%_wrap.c,$<)
diff -N -ur libhid-0.2.15+20060325/swig/Makefile.in
libhid-0.2.15+20060325.tabbott/swig/Makefile.in
--- libhid-0.2.15+20060325/swig/Makefile.in 2006-03-25 14:04:50.000000000
-0500
+++ libhid-0.2.15+20060325.tabbott/swig/Makefile.in 2008-12-13
14:47:06.000000000 -0500
@@ -573,6 +573,7 @@
%.py %_wrap.c: %.i ../include/hid.h
$(SWIG) $(SWIGFLAGS) $<
echo '#include <compiler.h>' > tmp.c
+ echo '#include <assert.h>' >> tmp.c
sed -e 's/PyObject \*self/& UNUSED/' \
-e 's/int flags)/int flags UNUSED)/' < $(patsubst %.i,%_wrap.c,$<)
>> tmp.c \
&& mv tmp.c $(patsubst %.i,%_wrap.c,$<)
--
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
