libappindicator

Merge lp:~ted/libappindicator/saucy-fix into lp:libappindicator/13.10

  1. saucy-fix
  2. Merge into trunk.13.10
Proposed by Ted Gould
Status: Merged
Approved by: Lars Karlitski
Approved revision: 268
Merged at revision: 263
Proposed branch: lp:~ted/libappindicator/saucy-fix
Merge into: lp:libappindicator/13.10
Diff against target: 50 lines (+6/-8)
3 files modified
autogen.sh (+1/-1)
debian/rules (+0/-2)
docs/reference/Makefile.am (+5/-5)
To merge this branch: bzr merge lp:~ted/libappindicator/saucy-fix
Reviewer Review Type Date Requested Status
Lars Karlitski (community) Approve
PS Jenkins bot (community) continuous-integration Approve
Review via email: mp+168210@code.launchpad.net

Commit message

Making gtk-doc check run in the current source directory

Description of the change

Trying to fix the saucy test builds

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:263
http://jenkins.qa.ubuntu.com/job/libappindicator-ci/13/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/libappindicator-saucy-amd64-ci/3/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/libappindicator-ci/13/rebuild

review: Needs Fixing (continuous-integration)
lp:~ted/libappindicator/saucy-fix updated
264. By Ted Gould

Dropping some left over debugging info

265. By Ted Gould

Going back to the environment style

266. By Ted Gould

An odd typo worth fixing

267. By Ted Gould

Don't need the same directory twice

268. By Ted Gould

Seems no one else has this on, no reason to be the odd ball.

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:268
http://jenkins.qa.ubuntu.com/job/libappindicator-ci/14/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/libappindicator-saucy-amd64-ci/4

Click here to trigger a rebuild:
http://s-jenkins:8080/job/libappindicator-ci/14/rebuild

review: Approve (continuous-integration)
Revision history for this message
Lars Karlitski (larsu) wrote :

Seems fine to me.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'autogen.sh'
2--- autogen.sh 2012-11-30 17:09:57 +0000
3+++ autogen.sh 2013-06-08 04:30:36 +0000
4@@ -1,6 +1,6 @@
5 #!/bin/sh
6
7-PKG_NAME="liappindicator"
8+PKG_NAME="libappindicator"
9
10 which gnome-autogen.sh || {
11 echo "You need gnome-common from GNOME SVN"
12
13=== modified file 'debian/rules'
14--- debian/rules 2013-04-09 20:04:24 +0000
15+++ debian/rules 2013-06-08 04:30:36 +0000
16@@ -68,8 +68,6 @@
17 override_dh_auto_test: $(FLAVORS:%=dotest-%)
18
19 dotest-%:
20- ps -ef
21- env
22 dh_auto_test --builddirectory=build/$* --
23
24
25
26=== modified file 'docs/reference/Makefile.am'
27--- docs/reference/Makefile.am 2012-12-10 22:00:06 +0000
28+++ docs/reference/Makefile.am 2013-06-08 04:30:36 +0000
29@@ -98,7 +98,7 @@
30 # signals and properties.
31 # e.g. GTKDOC_CFLAGS=-I$(top_srcdir) -I$(top_builddir) $(GTK_DEBUG_FLAGS)
32 # e.g. GTKDOC_LIBS=$(top_builddir)/gtk/$(gtktargetlib)
33-GTKDOC_CFLAGS=-I$(top_srcdir) -I$(top_srcdir)/src -I$(top_srcdir)/src $(LIBRARY_CFLAGS)
34+GTKDOC_CFLAGS=-I$(top_srcdir) -I$(top_srcdir)/src $(LIBRARY_CFLAGS)
35 GTKDOC_LIBS=$(top_builddir)/src/$(APPINDICATORLIB) $(LIBRARY_LIBS)
36
37 # This includes the standard gtk-doc make rules, copied by gtkdocize.
38@@ -116,8 +116,8 @@
39 # Comment this out if you want 'make check' to test you doc status
40 # and run some sanity checks
41 if ENABLE_GTK_DOC
42- TESTS_ENVIRONMENT = cd $(srcdir) && \
43- DOC_MODULE=$(DOC_MODULE) DOC_MAIN_SGML_FILE=$(DOC_MAIN_SGML_FILE) \
44- SRCDIR=$(abs_srcdir) BUILDDIR=$(abs_builddir)
45-TESTS = $(GTKDOC_CHECK)
46+TESTS_ENVIRONMENT = cd $(srcdir) && \
47+ DOC_MODULE=$(DOC_MODULE) DOC_MAIN_SGML_FILE=$(DOC_MAIN_SGML_FILE) \
48+ SRCDIR=$(abs_srcdir) BUILDDIR=$(abs_builddir)
49+#TESTS = $(GTKDOC_CHECK)
50 endif

Subscribers

People subscribed via source and target branches