Package: ocfs2-tools
Version: 1.2.1-1.1
Severity: normal
Tags: patch
Hi,
Attached is the diff for my ocfs2-tools 1.2.1-1.2 NMU.
diff -Nru /tmp/q7Gs3PSadt/ocfs2-tools-1.2.1/debian/changelog
/tmp/VDFxoJXh6c/ocfs2-tools-1.2.1/debian/changelog
--- /tmp/q7Gs3PSadt/ocfs2-tools-1.2.1/debian/changelog 2006-09-28
13:26:55.000000000 +0200
+++ /tmp/VDFxoJXh6c/ocfs2-tools-1.2.1/debian/changelog 2006-09-28
13:26:55.000000000 +0200
@@ -1,3 +1,11 @@
+ocfs2-tools (1.2.1-1.2) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Move dh_installdeb to after dh_pysupport, to make sure
+ update-python-modules is indeed called in postinst. (Closes: #388529)
+
+ -- Steinar H. Gunderson <[EMAIL PROTECTED]> Thu, 28 Sep 2006 13:19:03 +0200
+
ocfs2-tools (1.2.1-1.1) unstable; urgency=low
* Non-maintainer upload.
diff -Nru /tmp/q7Gs3PSadt/ocfs2-tools-1.2.1/debian/rules
/tmp/VDFxoJXh6c/ocfs2-tools-1.2.1/debian/rules
--- /tmp/q7Gs3PSadt/ocfs2-tools-1.2.1/debian/rules 2006-09-28
13:26:55.000000000 +0200
+++ /tmp/VDFxoJXh6c/ocfs2-tools-1.2.1/debian/rules 2006-09-28
13:26:55.000000000 +0200
@@ -77,10 +77,10 @@
dh_compress
dh_installdebconf
dh_fixperms
- dh_installdeb
dh_makeshlibs
dh_shlibdeps
dh_pysupport
+ dh_installdeb
dh_gencontrol
dh_md5sums
dh_builddeb
diff -Nru /tmp/q7Gs3PSadt/ocfs2-tools-1.2.1/ocfs2console/blkid/blkid_types.h
/tmp/VDFxoJXh6c/ocfs2-tools-1.2.1/ocfs2console/blkid/blkid_types.h
--- /tmp/q7Gs3PSadt/ocfs2-tools-1.2.1/ocfs2console/blkid/blkid_types.h
1970-01-01 01:00:00.000000000 +0100
+++ /tmp/VDFxoJXh6c/ocfs2-tools-1.2.1/ocfs2console/blkid/blkid_types.h
2006-09-28 13:26:55.000000000 +0200
@@ -0,0 +1,61 @@
+/*
+ * If linux/types.h is already been included, assume it has defined
+ * everything we need. (cross fingers) Other header files may have
+ * also defined the types that we need.
+ */
+#if (!defined(_LINUX_TYPES_H) && !defined(_BLKID_TYPES_H) && \
+ !defined(_EXT2_TYPES_H))
+#define _BLKID_TYPES_H
+
+typedef unsigned char __u8;
+typedef signed char __s8;
+
+#if (4 == 8)
+typedef int __s64;
+typedef unsigned int __u64;
+#else
+#if (4 == 8)
+typedef long __s64;
+typedef unsigned long __u64;
+#else
+#if (8 == 8)
+#if defined(__GNUC__)
+typedef __signed__ long long __s64;
+#else
+typedef signed long long __s64;
+#endif /* __GNUC__ */
+typedef unsigned long long __u64;
+#endif /* SIZEOF_LONG_LONG == 8 */
+#endif /* SIZEOF_LONG == 8 */
+#endif /* SIZEOF_INT == 8 */
+
+#if (4 == 2)
+typedef int __s16;
+typedef unsigned int __u16;
+#else
+#if (2 == 2)
+typedef short __s16;
+typedef unsigned short __u16;
+#else
+ ?==error: undefined 16 bit type
+#endif /* SIZEOF_SHORT == 2 */
+#endif /* SIZEOF_INT == 2 */
+
+#if (4 == 4)
+typedef int __s32;
+typedef unsigned int __u32;
+#else
+#if (4 == 4)
+typedef long __s32;
+typedef unsigned long __u32;
+#else
+#if (2 == 4)
+typedef short __s32;
+typedef unsigned short __u32;
+#else
+ ?== error: undefined 32 bit type
+#endif /* SIZEOF_SHORT == 4 */
+#endif /* SIZEOF_LONG == 4 */
+#endif /* SIZEOF_INT == 4 */
+
+#endif /* _*_TYPES_H */
