Notify OSD

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

  1. fix-dist
  2. Merge into main
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
1=== modified file 'data/Makefile.am'
2--- data/Makefile.am 2009-02-13 11:51:16 +0000
3+++ data/Makefile.am 2009-03-23 14:31:42 +0000
4@@ -2,7 +2,9 @@
5 SUBDIRS = icons
6
7 servicedir=/usr/share/dbus-1/services
8-service_DATA=org.freedesktop.Notifications.service
9+service_DATA=org.freedesktop.Notifications.service.in
10+
11+EXTRA_DIST= $(service_DATA)
12
13 org.freedesktop.Notifications.service: org.freedesktop.Notifications.service.in
14 sed "s_@LIBEXECDIR@_$(libexecdir)_" $< > $@
15
16=== modified file 'src/Makefile.am'
17--- src/Makefile.am 2009-03-19 10:21:30 +0000
18+++ src/Makefile.am 2009-03-23 14:31:42 +0000
19@@ -45,6 +45,7 @@
20 dnd.h \
21 log.h \
22 apport.h \
23+ util.h \
24 bubble-window.h \
25 bubble-window-accessible.h \
26 bubble-window-accessible-factory.h \

Subscribers

People subscribed via source and target branches