Merge lp:~abogani/ubuntu/lucid/avr-libc/avr-libc.fix-FTBFS into lp:ubuntu/lucid/avr-libc

Proposed by Alessio Igor Bogani
Status: Merged
Merged at revision: not available
Proposed branch: lp:~abogani/ubuntu/lucid/avr-libc/avr-libc.fix-FTBFS
Merge into: lp:ubuntu/lucid/avr-libc
Diff against target: 57 lines (+12/-5)
4 files modified
debian/changelog (+6/-0)
debian/control (+2/-1)
doc/api/Makefile.am (+2/-2)
doc/api/Makefile.in (+2/-2)
To merge this branch: bzr merge lp:~abogani/ubuntu/lucid/avr-libc/avr-libc.fix-FTBFS
Reviewer Review Type Date Requested Status
Registry Administrators Pending
Ubuntu branches Pending
Review via email: mp+21326@code.launchpad.net
To post a comment you must log in.

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-10-31 11:52:10 +0000
3+++ debian/changelog 2010-03-14 11:46:15 +0000
4@@ -1,3 +1,9 @@
5+avr-libc (1:1.6.7-1ubuntu1) lucid; urgency=low
6+
7+ * Fix FTBFS (LP: #538679)
8+
9+ -- Alessio Igor Bogani <abogani@ubuntu.com> Sun, 14 Mar 2010 12:11:41 +0100
10+
11 avr-libc (1:1.6.7-1) unstable; urgency=low
12
13 * New upstream relese (closes: #544030)
14
15=== modified file 'debian/control'
16--- debian/control 2009-10-31 11:52:10 +0000
17+++ debian/control 2010-03-14 11:46:15 +0000
18@@ -1,7 +1,8 @@
19 Source: avr-libc
20 Section: otherosfs
21 Priority: extra
22-Maintainer: Hakan Ardo <hakan@debian.org>
23+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
24+XSBC-Original-Maintainer: Hakan Ardo <hakan@debian.org>
25 Standards-Version: 3.2.1
26 Build-Depends: gcc-avr (>=1:4.3.4), binutils-avr (>=2.20), debhelper (>=5), doxygen (>=1.3.4), texlive, transfig, gs-gpl, netpbm, x11-common, texlive-extra-utils,
27
28
29=== modified file 'doc/api/Makefile.am'
30--- doc/api/Makefile.am 2009-10-31 11:52:10 +0000
31+++ doc/api/Makefile.am 2010-03-14 11:46:15 +0000
32@@ -182,8 +182,8 @@
33 sed -e '/{TabularC}{3}/s/{TabularC}{3}/{longtable}{|l|l|l|}/' \
34 -e '/{longtable}{|l|l|l|}/,/TabularC/s/TabularC/longtable/' \
35 -e '/Architecture/s/\\\\\\hline/\\endhead\\hline/' \
36- using_tools.tex > tmp.$$ && \
37- mv -f tmp.$$ using_tools.tex
38+ using__tools.tex > tmp.$$ && \
39+ mv -f tmp.$$ using__tools.tex
40
41 #doxygen.config: doxygen.config.in $(top_srcdir)/stamp-h1
42 doxygen.config: doxygen.config.in
43
44=== modified file 'doc/api/Makefile.in'
45--- doc/api/Makefile.in 2009-10-31 11:52:10 +0000
46+++ doc/api/Makefile.in 2010-03-14 11:46:15 +0000
47@@ -493,8 +493,8 @@
48 sed -e '/{TabularC}{3}/s/{TabularC}{3}/{longtable}{|l|l|l|}/' \
49 -e '/{longtable}{|l|l|l|}/,/TabularC/s/TabularC/longtable/' \
50 -e '/Architecture/s/\\\\\\hline/\\endhead\\hline/' \
51- using_tools.tex > tmp.$$ && \
52- mv -f tmp.$$ using_tools.tex
53+ using__tools.tex > tmp.$$ && \
54+ mv -f tmp.$$ using__tools.tex
55
56 #doxygen.config: doxygen.config.in $(top_srcdir)/stamp-h1
57 doxygen.config: doxygen.config.in

Subscribers

People subscribed via source and target branches