Merge lp:~evgeni/libindicator/multiarch-same-devheaders into lp:libindicator/12.10

[Evgeni Golov]

don't include build-time filenames in comments of the enum header files

If we do, the header files may be different on each build.
This is especially harmful when building multiple times for multiple
architectures and expecting the files to be identical.

[Charles Kerr (charlesk)]

I wouldn't've thought of that.

Nice catch. :)

review: Approve

=== modified file 'libindicator/indicator-object-enum-types.c.template'
--- libindicator/indicator-object-enum-types.c.template	2010-03-16 16:40:14 +0000
+++ libindicator/indicator-object-enum-types.c.template	2012-06-10 09:22:22 +0000
@@ -3,8 +3,8 @@
 /*** END file-header ***/
 
 /*** BEGIN file-production ***/
-/* enumerations from "@filename@" */
-#include "@filename@"
+/* enumerations from "@basename@" */
+#include "@basename@"
 /*** END file-production ***/
 
 /*** BEGIN value-header ***/

=== modified file 'libindicator/indicator-object-enum-types.h.template'
--- libindicator/indicator-object-enum-types.h.template	2010-03-16 16:40:14 +0000
+++ libindicator/indicator-object-enum-types.h.template	2012-06-10 09:22:22 +0000
@@ -10,7 +10,7 @@
 /*** END file-header ***/
 
 /*** BEGIN file-production ***/
-/* enumerations from "@filename@" */
+/* enumerations from "@basename@" */
 /*** END file-production ***/
 
 /*** BEGIN file-tail ***/