r5557 - in glibc-package/trunk/debian: . patches patches/any
Author: aurel32
Date: 2013-05-07 22:07:46 +0000 (Tue, 07 May 2013)
New Revision: 5557
Added:
glibc-package/trunk/debian/patches/any/cvs-sys-param-h-DEV_BSIZE.diff
Removed:
glibc-package/trunk/debian/patches/any/submitted-sys-param-h-DEV_BSIZE.diff
Modified:
glibc-package/trunk/debian/changelog
glibc-package/trunk/debian/patches/series
Log:
Use upstream version instead of submitted one
Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog 2013-05-07 21:51:04 UTC (rev 5556)
+++ glibc-package/trunk/debian/changelog 2013-05-07 22:07:46 UTC (rev 5557)
@@ -7,7 +7,7 @@
this is no longer needed by the updated glibc-bsd sysdeps upstream.
[ Aurelien Jarno ]
- * patches/any/submitted-sys-param-h-DEV_BSIZE.diff: New patch to fix
+ * patches/any/cvs-sys-param-h-DEV_BSIZE.diff: New patch to fix
conflict with kFreeBSD kernel headers.
* kfreebsd/local-sysdeps.diff: update to revision 4409 (from glibc-bsd).
Added: glibc-package/trunk/debian/patches/any/cvs-sys-param-h-DEV_BSIZE.diff
===================================================================
--- glibc-package/trunk/debian/patches/any/cvs-sys-param-h-DEV_BSIZE.diff (rev 0)
+++ glibc-package/trunk/debian/patches/any/cvs-sys-param-h-DEV_BSIZE.diff 2013-05-07 22:07:46 UTC (rev 5557)
@@ -0,0 +1,22 @@
+2013-05-07 Aurelien Jarno <aurelien@aurel32.net>
+
+ * misc/sys/param.h (DEV_BSIZE): Define only if not already defined.
+
+diff --git a/misc/sys/param.h b/misc/sys/param.h
+index 5e6353d..d257ec7 100644
+--- a/misc/sys/param.h
++++ b/misc/sys/param.h
+@@ -71,7 +71,9 @@
+
+
+ /* Unit of `st_blocks'. */
+-#define DEV_BSIZE 512
++#ifndef DEV_BSIZE
++# define DEV_BSIZE 512
++#endif
+
+
+ /* Bit map related macros. */
+--
+1.7.10.4
+
Deleted: glibc-package/trunk/debian/patches/any/submitted-sys-param-h-DEV_BSIZE.diff
===================================================================
--- glibc-package/trunk/debian/patches/any/submitted-sys-param-h-DEV_BSIZE.diff 2013-05-07 21:51:04 UTC (rev 5556)
+++ glibc-package/trunk/debian/patches/any/submitted-sys-param-h-DEV_BSIZE.diff 2013-05-07 22:07:46 UTC (rev 5557)
@@ -1,21 +0,0 @@
-2013-05-07 Aurelien Jarno <aurelien@aurel32.net>
-
- * misc/sys/param.h(DEV_BSIZE): Define only if not already defined.
-
-diff --git a/misc/sys/param.h b/misc/sys/param.h
-index 5e6353d..6a0b5d3 100644
---- a/misc/sys/param.h
-+++ b/misc/sys/param.h
-@@ -71,7 +71,9 @@
-
-
- /* Unit of `st_blocks'. */
-+#ifndef DEV_BSIZE
- #define DEV_BSIZE 512
-+#endif
-
-
- /* Bit map related macros. */
---
-1.7.10.4
-
Modified: glibc-package/trunk/debian/patches/series
===================================================================
--- glibc-package/trunk/debian/patches/series 2013-05-07 21:51:04 UTC (rev 5556)
+++ glibc-package/trunk/debian/patches/series 2013-05-07 22:07:46 UTC (rev 5557)
@@ -234,4 +234,4 @@
any/unsubmitted-ldso-machine-mismatch.diff
any/cvs-use-glibc-wchar.diff
any/submitted-setfsid-wur.diff
-any/submitted-sys-param-h-DEV_BSIZE.diff
+any/cvs-sys-param-h-DEV_BSIZE.diff
Reply to: