r12212 - in packages/trunk/alex4/debian: . patches

[Evgeni Golov]

Author: evgeni
Date: 2011-05-06 13:05:56 +0000 (Fri, 06 May 2011)
New Revision: 12212

Modified:
   packages/trunk/alex4/debian/changelog
   packages/trunk/alex4/debian/patches/compiler-warnings.patch
Log:
Include defs.h *after* particle.h,
thus not redifining __unused from glibc's bits/stat.h
Closes: #624884


Modified: packages/trunk/alex4/debian/changelog
===================================================================
--- packages/trunk/alex4/debian/changelog	2011-05-05 12:49:29 UTC (rev 12211)
+++ packages/trunk/alex4/debian/changelog	2011-05-06 13:05:56 UTC (rev 12212)
@@ -1,3 +1,12 @@
+alex4 (1.1-5) unstable; urgency=low
+
+  * Team upload.
+  * Include defs.h *after* particle.h, thus not redifining __unused from
+    glibc's bits/stat.h
+    Closes: #624884
+
+ -- Evgeni Golov <evgeni at debian.org>  Fri, 06 May 2011 15:02:49 +0200
+
 alex4 (1.1-4) unstable; urgency=low
 
   * Update the unix-port patch a bit:

Modified: packages/trunk/alex4/debian/patches/compiler-warnings.patch
===================================================================
--- packages/trunk/alex4/debian/patches/compiler-warnings.patch	2011-05-05 12:49:29 UTC (rev 12211)
+++ packages/trunk/alex4/debian/patches/compiler-warnings.patch	2011-05-06 13:05:56 UTC (rev 12212)
@@ -157,15 +157,16 @@
 +#endif /* _INCLUDED */
 --- a/src/particle.c
 +++ b/src/particle.c
-@@ -20,7 +20,7 @@
+@@ -20,8 +20,8 @@
   
   
  
 -
+ #include "particle.h"
 +#include "defs.h"
- #include "particle.h"
  
  // pointer to datafile
+ DATAFILE *data;
 @@ -92,7 +92,7 @@
  }