Merge lp:~cosmos-door/ubuntu/raring/avarice/1093297 into lp:debian/avarice
Status: | Needs review |
---|---|
Proposed branch: | lp:~cosmos-door/ubuntu/raring/avarice/1093297 |
Merge into: | lp:debian/avarice |
Diff against target: |
290 lines (+150/-13) 15 files modified
.pc/.quilt_patches (+1/-0) .pc/.quilt_series (+1/-0) .pc/.version (+1/-0) debian/avarice.rules (+0/-9) debian/avarice.udev (+9/-0) debian/changelog (+85/-0) debian/control (+3/-1) debian/install (+0/-1) debian/links (+0/-1) debian/patches/00_debian_origin.patch (+25/-0) debian/patches/series (+1/-0) debian/preinst (+21/-0) debian/source/format (+1/-0) doc/avarice.1 (+1/-0) src/Makefile.in (+1/-1) |
To merge this branch: | bzr merge lp:~cosmos-door/ubuntu/raring/avarice/1093297 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Ubuntu branches | Pending | ||
Review via email: mp+141186@code.launchpad.net |
Description of the change
* Merge from debian sid (LP: #1093297). Remaining changes:
- debian/
- 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_
split already applied patch to upstream source by debian package
Unmerged revisions
- 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
* New upstream release.
* Replace SYSFS with ATTRS in avarice.rules. Closes: #603630.
Thanks to Gonzalo Pérez de Olaguer Córdoba.
* Update the Debian policy to version 3.9.2.
* Bump debhelper to version 8. - 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 - 9. By Nicolas Van Wambeke
-
Added debian/
patches/ 01_gcc4. 4_fix.diff to fix FTBFS (LP: #432538) - 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.
Because debian package dropped "New bfd requires libz", patches/ 01_support_ bfd_include_ guard.patch is not needed.
debian/