Merge lp:~dobey/ubuntuone-client/pot-build-fix into lp:ubuntuone-client

Proposed by dobey on 2009-10-19
Status: Merged
Approved by: dobey on 2009-10-21
Approved revision: 263
Merged at revision: not available
Proposed branch: lp:~dobey/ubuntuone-client/pot-build-fix
Merge into: lp:ubuntuone-client
Diff against target: 23 lines
2 files modified
data/ubuntuone-client-preferences.desktop.in (+0/-9)
po/POTFILES.in (+0/-1)
To merge this branch: bzr merge lp:~dobey/ubuntuone-client/pot-build-fix
Reviewer Review Type Date Requested Status
Rodrigo Moya (community) Approve on 2009-10-19
Tim Cole (community) 2009-10-19 Approve on 2009-10-19
Review via email: mp+13593@code.launchpad.net

Commit message

Remove un-disted file from POTFILES.in

To post a comment you must log in.
Tim Cole (tcole) :
review: Approve
review: Approve
dobey (dobey) wrote :
Download full text (15.3 KiB)

The attempt to merge lp:~dobey/ubuntuone-client/pot-build-fix into lp:ubuntuone-client failed.Below is the output from the failed tests.

/usr/bin/gnome-autogen.sh
checking for autoconf >= 2.53...
(B testing autoconf2.50... not found.
  testing autoconf... found 2.64
checking for automake >= 1.10...
(B testing automake-1.11... found 1.11
checking for libtool >= 1.5...
(B testing libtoolize... found 2.2.6
checking for intltool >= 0.30...
(B testing intltoolize... found 0.41.0
checking for pkg-config >= 0.14.0...
(B testing pkg-config... found 0.22
Checking for required M4 macros...
(BChecking for forbidden M4 macros...
(BProcessing ./configure.ac
(BRunning libtoolize...
(Blibtoolize: putting auxiliary files in `.'.
libtoolize: copying file `./ltmain.sh'
libtoolize: putting macros in AC_CONFIG_MACRO_DIR, `m4'.
libtoolize: copying file `m4/libtool.m4'
libtoolize: copying file `m4/ltoptions.m4'
libtoolize: copying file `m4/ltsugar.m4'
libtoolize: copying file `m4/ltversion.m4'
libtoolize: copying file `m4/lt~obsolete.m4'
Running intltoolize...
(BRunning aclocal-1.11...
(BRunning autoconf...
(BRunning autoheader...
(BRunning automake-1.11...
(BRunning ./configure --prefix=/usr ...
(Bchecking for a BSD-compatible install... /usr/bin/install -c
checking whether build environment is sane... yes
checking for a thread-safe mkdir -p... /bin/mkdir -p
checking for gawk... no
checking for mawk... mawk
checking whether make sets $(MAKE)... yes
checking for style of include used by make... GNU
checking for gcc... gcc
checking for C compiler default output file name... a.out
checking whether the C compiler works... yes
checking whether we are cross compiling... no
checking for suffix of executables...
checking for suffix of object files... o
checking whether we are using the GNU C compiler... yes
checking whether gcc accepts -g... yes
checking for gcc option to accept ISO C89... none needed
checking dependency style of gcc... gcc3
checking for library containing strerror... none required
checking for gcc... (cached) gcc
checking whether we are using the GNU C compiler... (cached) yes
checking whether gcc accepts -g... (cached) yes
checking for gcc option to accept ISO C89... (cached) none needed
checking dependency style of gcc... (cached) gcc3
checking build system type... i686-pc-linux-gnu
checking host system type... i686-pc-linux-gnu
checking for a sed that does not truncate output... /bin/sed
checking for grep that handles long lines and -e... /bin/grep
checking for egrep... /bin/grep -E
checking for fgrep... /bin/grep -F
checking for ld used by gcc... /usr/bin/ld
checking if the linker (/usr/bin/ld) is GNU ld... yes
checking for BSD- or MS-compatible name lister (nm)... /usr/bin/nm -B
checking the name lister (/usr/bin/nm -B) interface... BSD nm
checking whether ln -s works... yes
checking the maximum length of command line arguments... 1572864
checking whether the shell understands some XSI constructs... yes
checking whether the shell understands "+="... yes
checking for /usr/bin/ld option to reload object files... -r
checking f...

263. By dobey on 2009-10-21

Remove the file too, so make check doesn't fail

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== removed file 'data/ubuntuone-client-preferences.desktop.in'
2--- data/ubuntuone-client-preferences.desktop.in 2009-09-25 18:48:03 +0000
3+++ data/ubuntuone-client-preferences.desktop.in 1970-01-01 00:00:00 +0000
4@@ -1,9 +0,0 @@
5-[Desktop Entry]
6-Name=Ubuntu One
7-_Comment=Configure the Ubuntu One file sharing client
8-Exec=ubuntuone-client-preferences
9-Icon=ubuntuone-client
10-Terminal=false
11-Type=Application
12-Categories=GTK;Settings;
13-X-Ubuntu-Gettext-Domain=ubuntuone-client
14
15=== modified file 'po/POTFILES.in'
16--- po/POTFILES.in 2009-09-25 18:48:03 +0000
17+++ po/POTFILES.in 2009-10-21 13:52:10 +0000
18@@ -4,6 +4,5 @@
19 data/emblem-ubuntuone-unsynchronized.icon.in
20 data/emblem-ubuntuone-uploading.icon.in
21 data/ubuntuone-client-applet.desktop.in
22-data/ubuntuone-client-preferences.desktop.in
23 nautilus/ubuntuone-nautilus.c
24

Subscribers

People subscribed via source and target branches