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
=== modified file 'debian/changelog'
--- debian/changelog 2009-10-31 11:52:10 +0000
+++ debian/changelog 2010-03-14 11:46:15 +0000
@@ -1,3 +1,9 @@
1avr-libc (1:1.6.7-1ubuntu1) lucid; urgency=low
2
3 * Fix FTBFS (LP: #538679)
4
5 -- Alessio Igor Bogani <abogani@ubuntu.com> Sun, 14 Mar 2010 12:11:41 +0100
6
1avr-libc (1:1.6.7-1) unstable; urgency=low7avr-libc (1:1.6.7-1) unstable; urgency=low
28
3 * New upstream relese (closes: #544030)9 * New upstream relese (closes: #544030)
410
=== modified file 'debian/control'
--- debian/control 2009-10-31 11:52:10 +0000
+++ debian/control 2010-03-14 11:46:15 +0000
@@ -1,7 +1,8 @@
1Source: avr-libc1Source: avr-libc
2Section: otherosfs2Section: otherosfs
3Priority: extra3Priority: extra
4Maintainer: Hakan Ardo <hakan@debian.org>4Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
5XSBC-Original-Maintainer: Hakan Ardo <hakan@debian.org>
5Standards-Version: 3.2.16Standards-Version: 3.2.1
6Build-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,7Build-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,
78
89
=== modified file 'doc/api/Makefile.am'
--- doc/api/Makefile.am 2009-10-31 11:52:10 +0000
+++ doc/api/Makefile.am 2010-03-14 11:46:15 +0000
@@ -182,8 +182,8 @@
182 sed -e '/{TabularC}{3}/s/{TabularC}{3}/{longtable}{|l|l|l|}/' \182 sed -e '/{TabularC}{3}/s/{TabularC}{3}/{longtable}{|l|l|l|}/' \
183 -e '/{longtable}{|l|l|l|}/,/TabularC/s/TabularC/longtable/' \183 -e '/{longtable}{|l|l|l|}/,/TabularC/s/TabularC/longtable/' \
184 -e '/Architecture/s/\\\\\\hline/\\endhead\\hline/' \184 -e '/Architecture/s/\\\\\\hline/\\endhead\\hline/' \
185 using_tools.tex > tmp.$$ && \185 using__tools.tex > tmp.$$ && \
186 mv -f tmp.$$ using_tools.tex186 mv -f tmp.$$ using__tools.tex
187187
188#doxygen.config: doxygen.config.in $(top_srcdir)/stamp-h1188#doxygen.config: doxygen.config.in $(top_srcdir)/stamp-h1
189doxygen.config: doxygen.config.in189doxygen.config: doxygen.config.in
190190
=== modified file 'doc/api/Makefile.in'
--- doc/api/Makefile.in 2009-10-31 11:52:10 +0000
+++ doc/api/Makefile.in 2010-03-14 11:46:15 +0000
@@ -493,8 +493,8 @@
493 sed -e '/{TabularC}{3}/s/{TabularC}{3}/{longtable}{|l|l|l|}/' \493 sed -e '/{TabularC}{3}/s/{TabularC}{3}/{longtable}{|l|l|l|}/' \
494 -e '/{longtable}{|l|l|l|}/,/TabularC/s/TabularC/longtable/' \494 -e '/{longtable}{|l|l|l|}/,/TabularC/s/TabularC/longtable/' \
495 -e '/Architecture/s/\\\\\\hline/\\endhead\\hline/' \495 -e '/Architecture/s/\\\\\\hline/\\endhead\\hline/' \
496 using_tools.tex > tmp.$$ && \496 using__tools.tex > tmp.$$ && \
497 mv -f tmp.$$ using_tools.tex497 mv -f tmp.$$ using__tools.tex
498498
499#doxygen.config: doxygen.config.in $(top_srcdir)/stamp-h1499#doxygen.config: doxygen.config.in $(top_srcdir)/stamp-h1
500doxygen.config: doxygen.config.in500doxygen.config: doxygen.config.in

Subscribers

People subscribed via source and target branches