Merge lp://staging/~ken-vandine/indicator-applet/packaging into lp://staging/~ubuntu-desktop/indicator-applet/ubuntu

Proposed by Ken VanDine
Status: Merged
Merged at revision: not available
Proposed branch: lp://staging/~ken-vandine/indicator-applet/packaging
Merge into: lp://staging/~ubuntu-desktop/indicator-applet/ubuntu
Diff against target: None lines
To merge this branch: bzr merge lp://staging/~ken-vandine/indicator-applet/packaging
Reviewer Review Type Date Requested Status
Jonathan Riddell Pending
Review via email: mp+9683@code.staging.launchpad.net
To post a comment you must log in.
Revision history for this message
Ken VanDine (ken-vandine) wrote :

Enabled building of the docs, which the package expected

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2009-08-04 23:41:16 +0000
3+++ debian/changelog 2009-08-05 08:50:42 +0000
4@@ -1,3 +1,10 @@
5+indicator-applet (0.2.0~bzr319-0ubuntu3) karmic; urgency=low
6+
7+ * debian/rules
8+ - added --enable-gtk-doc to build the docs
9+
10+ -- Ken VanDine <ken.vandine@canonical.com> Wed, 05 Aug 2009 09:50:17 +0100
11+
12 indicator-applet (0.2.0~bzr319-0ubuntu2) karmic; urgency=low
13
14 * Run ./autogen.sh before upload
15
16=== modified file 'debian/rules'
17--- debian/rules 2009-03-17 18:39:45 +0000
18+++ debian/rules 2009-08-05 08:50:42 +0000
19@@ -3,6 +3,6 @@
20 include /usr/share/cdbs/1/rules/debhelper.mk
21 include /usr/share/cdbs/1/class/gnome.mk
22
23-DEB_CONFIGURE_EXTRA_FLAGS += --disable-scrollkeeper --disable-gobject-introspection
24+DEB_CONFIGURE_EXTRA_FLAGS += --disable-scrollkeeper --disable-gobject-introspection --enable-gtk-doc
25 LDFLAGS += -Wl,-z,defs -Wl,--as-needed
26 DEB_DH_MAKESHLIBS_ARGS_libindicate0 += -V 'libindicate0 (>= 0.1.2)'

Subscribers

People subscribed via source and target branches