lp:~cosmos-door/ubuntu/trusty/avarice/merge-1269697
- Get this branch:
- bzr branch lp:~cosmos-door/ubuntu/trusty/avarice/merge-1269697
Branch merges
- Ubuntu branches: Pending requested
-
Diff: 1093 lines (+26/-1009)7 files modified.pc/00_debian_origin.patch/doc/avarice.1 (+0/-429)
.pc/00_debian_origin.patch/src/Makefile.in (+0/-577)
.pc/applied-patches (+0/-1)
debian/changelog (+23/-0)
debian/control (+1/-1)
doc/avarice.1 (+1/-0)
src/Makefile.in (+1/-1)
Related bugs
Bug #1269697: Please merge avarice 2.11-1.1 (universe) from Debian unstable (main) | Undecided | Fix Released |
Related blueprints
Branch information
- Owner:
- Mitsuya Shibata
- Status:
- Development
Recent revisions
- 13. By Mitsuya Shibata
-
* Merge from debian sid (LP: #1269697). Remaining changes:
- debian/avarice. rules: Rename to debian/avarice.udev
- debian/rules: Use dh_installudev to install udev rules
- debian/install: Drop previous install rule
- debian/links: Drop previous symlink
- debian/preinst: Remove previous symlink and rules if unmodified, otherwise
rename rules to new name
- debian/control: Breaks on udev to get correct version
- Switch to dpkg-source 3.0 (quilt) format
- 00_debian_origin. patch
split already applied patch to upstream source by debian package
* Non-maintainer upload.
* Build-depend on libiberty-dev. Closes: #730902. - 12. By Mitsuya Shibata
-
* Merge from debian sid (LP: #1093297). Remaining changes:
- debian/avarice. rules: Rename to debian/avarice.udev
- debian/rules: Use dh_installudev to install udev rules
- debian/install: Drop previous install rule
- debian/links: Drop previous symlink
- debian/preinst: Remove previous symlink and rules if unmodified, otherwise
rename rules to new name
- debian/control: Breaks on udev to get correct version
- Switch to dpkg-source 3.0 (quilt) format
- 00_debian_origin. patch
split already applied patch to upstream source by debian package - 11. By Mitsuya Shibata
-
* Fix FTBFS (LP: #1058667)
- debian/patches/ 01_support_ bfd_include_ guard.patch
include autoconf.h before bfd.h to support new binutils
* Replace SYSFS with ATTRS in avarice.udev from Debian: #603630
* Switch to dpkg-source 3.0 (quilt) format
- 00_debian_origin. patch
split already applied patch to upstream source by debian package - 10. By Scott Howard
-
* Merge from debian testing (LP: #518113). Remaining changes:
- debian/avarice. rules: Rename to debian/avarice.udev
- debian/rules: Use dh_installudev to install udev rules
- debian/install: Drop previous install rule
- debian/links: Drop previous symlink
- debian/preinst: Remove previous symlink and rules if unmodified, otherwise
rename rules to new name
- debian/control: Breaks on udev to get correct version - 8. By Andres Rodriguez
-
* Merge from debian unstable (LP: #372793), remaining changes:
- debian/avarice. rules: Rename to debian/avarice.udev
- debian/rules: Use dh_installudev to install udev rules
- debian/install: Drop previous install rule
- debian/links: Drop previous symlink
- debian/preinst: Remove previous symlink and rules if unmodified, otherwise
rename rules to new name
- debian/control: Bump build-depend on debhelper to install udev rules into
/lib/udev/rules. d, add Breaks on udev to get correct version
- Newer bfd uses libz, so we need to link against that as well as bfd is linked
statically. The static linking is done by simply changing src/Makefile.in - 7. By Scott James Remnant (Canonical)
-
* debian/
avarice. rules: Rename to debian/avarice.udev
* debian/rules: Use dh_installudev to install udev rules
* debian/install: Drop previous install rule
* debian/links: And previous symlink
* debian/preinst: Remove previous symlink and rules if unmodified, otherwise
rename rules to new name
* debian/control: Bump build-depend on debhelper to install udev rules into
/lib/udev/rules. d, add Breaks on udev to get correct version - 6. By James Westby
-
* Newer bfd uses libz, so we need to link against that as well as bfd is
linked statically.
- Beware, the static linking is done by simply changing src/Makefile.in,
so running automake will undo this change. - 5. By Shaun Jackman <email address hidden>
-
* New upstream release.
* Update the Debian policy to version 3.8.0.1. - 4. By Shaun Jackman <email address hidden>
-
* Add the AVR Dragon to the udev rules. Closes: #461986.
* Update the Debian policy to version 3.7.3.
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)
- Stacked on:
- lp:ubuntu/trusty/avarice