diff -Nru libzn-poly-0.9/debian/changelog libzn-poly-0.9/debian/changelog --- libzn-poly-0.9/debian/changelog 2013-01-11 19:16:36.000000000 +0000 +++ libzn-poly-0.9/debian/changelog 2013-03-13 23:09:58.000000000 +0000 @@ -1,4 +1,15 @@ -libzn-poly (0.9-2) experimental; urgency=low +libzn-poly (0.9-3) unstable; urgency=low + + * debian/patches/fix_ulong_redefinition.patch: + Undefine ulong before defining it again in zn_poly.h. + (Closes: #702887) + * Change distribution of the previous changelog entry 0.9-2 + from experimental to unstable, because that version was + accidentally uploaded to unstable. + + -- Tobias Hansen Wed, 13 Mar 2013 23:54:00 +0100 + +libzn-poly (0.9-2) unstable; urgency=low * debian/patches/gcc-4.5-mips.patch: The custom C implementation of ZNP_MUL_WIDE from the patch diff -Nru libzn-poly-0.9/debian/patches/fix_ulong_redefinition.patch libzn-poly-0.9/debian/patches/fix_ulong_redefinition.patch --- libzn-poly-0.9/debian/patches/fix_ulong_redefinition.patch 1970-01-01 00:00:00.000000000 +0000 +++ libzn-poly-0.9/debian/patches/fix_ulong_redefinition.patch 2013-03-13 22:53:18.000000000 +0000 @@ -0,0 +1,16 @@ +Description: Undefine ulong before defining it again. +Author: Tobias Hansen +Bug-Debian: http://bugs.debian.org/702887 + +--- a/include/zn_poly.h ++++ b/include/zn_poly.h +@@ -69,6 +69,9 @@ + /* + I get really sick of typing unsigned long. + */ ++#ifdef ulong ++#undef ulong ++#endif + typedef unsigned long ulong; + + diff -Nru libzn-poly-0.9/debian/patches/series libzn-poly-0.9/debian/patches/series --- libzn-poly-0.9/debian/patches/series 2012-12-20 20:03:03.000000000 +0000 +++ libzn-poly-0.9/debian/patches/series 2013-03-13 22:25:18.000000000 +0000 @@ -1,2 +1,3 @@ zn_poly_soname.patch gcc-4.5-mips.patch +fix_ulong_redefinition.patch