Merge lp:~ken-vandine/notify-osd/fix-dist into lp:notify-osd/trunk

Proposed by Ken VanDine
Status: Merged
Merge reported by: David Barth
Merged at revision: not available
Proposed branch: lp:~ken-vandine/notify-osd/fix-dist
Merge into: lp:notify-osd/trunk
Diff against target: None lines
To merge this branch: bzr merge lp:~ken-vandine/notify-osd/fix-dist
Reviewer Review Type Date Requested Status
David Barth (community) Approve
Review via email: mp+4778@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Ken VanDine (ken-vandine) wrote :

There are a couple files currently excluded when running make dist. This branch fixes that.

Revision history for this message
Mirco Müller (macslow) wrote :

> There are a couple files currently excluded when running make dist. This
> branch fixes that.

Just pushed that as revision 251 to notify-osd trunk.

Revision history for this message
David Barth (dbarth) wrote :

The patch was accepted and pushed to trunk by Mirco

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'data/Makefile.am'
--- data/Makefile.am 2009-02-13 11:51:16 +0000
+++ data/Makefile.am 2009-03-23 14:31:42 +0000
@@ -2,7 +2,9 @@
2SUBDIRS = icons2SUBDIRS = icons
33
4servicedir=/usr/share/dbus-1/services4servicedir=/usr/share/dbus-1/services
5service_DATA=org.freedesktop.Notifications.service5service_DATA=org.freedesktop.Notifications.service.in
6
7EXTRA_DIST= $(service_DATA)
68
7org.freedesktop.Notifications.service: org.freedesktop.Notifications.service.in9org.freedesktop.Notifications.service: org.freedesktop.Notifications.service.in
8 sed "s_@LIBEXECDIR@_$(libexecdir)_" $< > $@10 sed "s_@LIBEXECDIR@_$(libexecdir)_" $< > $@
911
=== modified file 'src/Makefile.am'
--- src/Makefile.am 2009-03-19 10:21:30 +0000
+++ src/Makefile.am 2009-03-23 14:31:42 +0000
@@ -45,6 +45,7 @@
45 dnd.h \45 dnd.h \
46 log.h \46 log.h \
47 apport.h \47 apport.h \
48 util.h \
48 bubble-window.h \49 bubble-window.h \
49 bubble-window-accessible.h \50 bubble-window-accessible.h \
50 bubble-window-accessible-factory.h \51 bubble-window-accessible-factory.h \

Subscribers

People subscribed via source and target branches