DBus Menu

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

  1. multiarch-same-devheaders
  2. Merge into trunk.12.10
Proposed by Evgeni Golov
Status: Merged
Approved by: Ted Gould
Approved revision: 418
Merged at revision: 419
Proposed branch: lp:~evgeni/libdbusmenu/multiarch-same-devheaders
Merge into: lp:libdbusmenu/12.10
Diff against target: 25 lines (+2/-2)
2 files modified
libdbusmenu-glib/enum-types.h.in (+1/-1)
libdbusmenu-gtk/genericmenuitem-enum-types.h.in (+1/-1)
To merge this branch: bzr merge lp:~evgeni/libdbusmenu/multiarch-same-devheaders
Reviewer Review Type Date Requested Status
Ted Gould (community) Approve
Review via email: mp+107170@code.launchpad.net

Description of the change

  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.

  See: http://bugs.debian.org/674200

To post a comment you must log in.
Revision history for this message
Ted Gould (ted) wrote :

Heh, would have never guessed that cause a problem in the comment :-)

review: Approve
Revision history for this message
Evgeni Golov (evgeni) wrote :

Well, the files differ (in checksum) and dpkg refuses to install then.
This btw affects about every lib of the ayatana project -- want me to send more merges? :)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'libdbusmenu-glib/enum-types.h.in'
2--- libdbusmenu-glib/enum-types.h.in 2011-03-04 15:01:20 +0000
3+++ libdbusmenu-glib/enum-types.h.in 2012-05-24 08:20:25 +0000
4@@ -43,7 +43,7 @@
5 /*** END file-tail ***/
6
7 /*** BEGIN file-production ***/
8-/* Enumerations from file: "@filename@" */
9+/* Enumerations from file: "@basename@" */
10 #include "@basename@"
11
12 /*** END file-production ***/
13
14=== modified file 'libdbusmenu-gtk/genericmenuitem-enum-types.h.in'
15--- libdbusmenu-gtk/genericmenuitem-enum-types.h.in 2011-08-22 19:31:31 +0000
16+++ libdbusmenu-gtk/genericmenuitem-enum-types.h.in 2012-05-24 08:20:25 +0000
17@@ -43,7 +43,7 @@
18 /*** END file-tail ***/
19
20 /*** BEGIN file-production ***/
21-/* Enumerations from file: "@filename@" */
22+/* Enumerations from file: "@basename@" */
23 #include "@basename@"
24
25 /*** END file-production ***/

Subscribers

People subscribed via source and target branches

to all changes: