Merge lp:~cosmos-door/ubuntu/raring/avarice/1093297 into lp:debian/avarice

Proposed by Mitsuya Shibata
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
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/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

To post a comment you must log in.
Revision history for this message
Mitsuya Shibata (cosmos-door) wrote :

Because debian package dropped "New bfd requires libz",
debian/patches/01_support_bfd_include_guard.patch is not needed.

Revision history for this message
Micah Gersten (micahg) wrote :

This should be merged into lp:ubuntu/avarice, not lp:debian/avarice

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.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== added directory '.pc'
2=== added file '.pc/.quilt_patches'
3--- .pc/.quilt_patches 1970-01-01 00:00:00 +0000
4+++ .pc/.quilt_patches 2012-12-23 16:48:23 +0000
5@@ -0,0 +1,1 @@
6+debian/patches
7
8=== added file '.pc/.quilt_series'
9--- .pc/.quilt_series 1970-01-01 00:00:00 +0000
10+++ .pc/.quilt_series 2012-12-23 16:48:23 +0000
11@@ -0,0 +1,1 @@
12+series
13
14=== added file '.pc/.version'
15--- .pc/.version 1970-01-01 00:00:00 +0000
16+++ .pc/.version 2012-12-23 16:48:23 +0000
17@@ -0,0 +1,1 @@
18+2
19
20=== removed file 'debian/avarice.rules'
21--- debian/avarice.rules 2011-12-03 12:23:50 +0000
22+++ debian/avarice.rules 1970-01-01 00:00:00 +0000
23@@ -1,9 +0,0 @@
24-SUBSYSTEM!="usb_device", ACTION!="add", GOTO="avarice_end"
25-
26-# Atmel Corp. JTAG ICE mkII
27-ATTRS{idVendor}=="03eb", ATTRS{idProduct}=="2103", MODE="660", GROUP="dialout"
28-
29-# Atmel Corp. AVR Dragon
30-ATTRS{idVendor}=="03eb", ATTRS{idProduct}=="2107", MODE="660", GROUP="dialout"
31-
32-LABEL="avarice_end"
33
34=== added file 'debian/avarice.udev'
35--- debian/avarice.udev 1970-01-01 00:00:00 +0000
36+++ debian/avarice.udev 2012-12-23 16:48:23 +0000
37@@ -0,0 +1,9 @@
38+SUBSYSTEM!="usb_device", ACTION!="add", GOTO="avarice_end"
39+
40+# Atmel Corp. JTAG ICE mkII
41+ATTRS{idVendor}=="03eb", ATTRS{idProduct}=="2103", MODE="660", GROUP="dialout"
42+
43+# Atmel Corp. AVR Dragon
44+ATTRS{idVendor}=="03eb", ATTRS{idProduct}=="2107", MODE="660", GROUP="dialout"
45+
46+LABEL="avarice_end"
47
48=== modified file 'debian/changelog'
49--- debian/changelog 2011-12-03 12:23:50 +0000
50+++ debian/changelog 2012-12-23 16:48:23 +0000
51@@ -1,3 +1,19 @@
52+avarice (2.11-1ubuntu1) raring; urgency=low
53+
54+ * Merge from debian sid (LP: #1093297). Remaining changes:
55+ - debian/avarice.rules: Rename to debian/avarice.udev
56+ - debian/rules: Use dh_installudev to install udev rules
57+ - debian/install: Drop previous install rule
58+ - debian/links: Drop previous symlink
59+ - debian/preinst: Remove previous symlink and rules if unmodified, otherwise
60+ rename rules to new name
61+ - debian/control: Breaks on udev to get correct version
62+ - Switch to dpkg-source 3.0 (quilt) format
63+ - 00_debian_origin.patch
64+ split already applied patch to upstream source by debian package
65+
66+ -- Mitsuya Shibata <mty.shibata@gmail.com> Mon, 24 Dec 2012 01:13:17 +0900
67+
68 avarice (2.11-1) unstable; urgency=low
69
70 * New upstream release.
71@@ -8,6 +24,31 @@
72
73 -- Shaun Jackman <sjackman@debian.org> Sat, 03 Dec 2011 12:23:50 -0800
74
75+avarice (2.10-3ubuntu2) quantal; urgency=low
76+
77+ * Fix FTBFS (LP: #1058667)
78+ - debian/patches/01_support_bfd_include_guard.patch
79+ include autoconf.h before bfd.h to support new binutils
80+ * Replace SYSFS with ATTRS in avarice.udev from Debian: #603630
81+ * Switch to dpkg-source 3.0 (quilt) format
82+ - 00_debian_origin.patch
83+ split already applied patch to upstream source by debian package
84+
85+ -- Mitsuya Shibata <mty.shibata@gmail.com> Sun, 30 Sep 2012 18:16:33 +0900
86+
87+avarice (2.10-3ubuntu1) lucid; urgency=low
88+
89+ * Merge from debian testing (LP: #518113). Remaining changes:
90+ - debian/avarice.rules: Rename to debian/avarice.udev
91+ - debian/rules: Use dh_installudev to install udev rules
92+ - debian/install: Drop previous install rule
93+ - debian/links: Drop previous symlink
94+ - debian/preinst: Remove previous symlink and rules if unmodified, otherwise
95+ rename rules to new name
96+ - debian/control: Breaks on udev to get correct version
97+
98+ -- Scott Howard <showard314@gmail.com> Sat, 06 Feb 2010 12:35:01 -0500
99+
100 avarice (2.10-3) unstable; urgency=medium
101
102 * Patch usb_dev_handle to fix a FTBFS. Closes: #565280.
103@@ -31,6 +72,28 @@
104
105 -- Shaun Jackman <sjackman@debian.org> Sun, 16 Aug 2009 11:17:09 -0700
106
107+avarice (2.9-1.1ubuntu2) karmic; urgency=low
108+
109+ * Added debian/patches/01_gcc4.4_fix.diff to fix FTBFS (LP: #432538)
110+
111+ -- Nicolas Van Wambeke <nicolasvw@free.fr> Fri, 18 Sep 2009 16:03:07 +0200
112+
113+avarice (2.9-1.1ubuntu1) karmic; urgency=low
114+
115+ * Merge from debian unstable (LP: #372793), remaining changes:
116+ - debian/avarice.rules: Rename to debian/avarice.udev
117+ - debian/rules: Use dh_installudev to install udev rules
118+ - debian/install: Drop previous install rule
119+ - debian/links: Drop previous symlink
120+ - debian/preinst: Remove previous symlink and rules if unmodified, otherwise
121+ rename rules to new name
122+ - debian/control: Bump build-depend on debhelper to install udev rules into
123+ /lib/udev/rules.d, add Breaks on udev to get correct version
124+ - Newer bfd uses libz, so we need to link against that as well as bfd is linked
125+ statically. The static linking is done by simply changing src/Makefile.in
126+
127+ -- Andres Rodriguez <andreserl@ubuntu.com> Thu, 07 May 2009 12:43:51 -0500
128+
129 avarice (2.9-1.1) unstable; urgency=low
130
131 * Non-maintainer upload.
132@@ -47,6 +110,28 @@
133
134 -- Shaun Jackman <sjackman@debian.org> Mon, 30 Mar 2009 19:09:40 -0700
135
136+avarice (2.8-1ubuntu2) jaunty; urgency=low
137+
138+ * debian/avarice.rules: Rename to debian/avarice.udev
139+ * debian/rules: Use dh_installudev to install udev rules
140+ * debian/install: Drop previous install rule
141+ * debian/links: And previous symlink
142+ * debian/preinst: Remove previous symlink and rules if unmodified, otherwise
143+ rename rules to new name
144+ * debian/control: Bump build-depend on debhelper to install udev rules into
145+ /lib/udev/rules.d, add Breaks on udev to get correct version
146+
147+ -- Scott James Remnant <scott@ubuntu.com> Tue, 13 Jan 2009 01:37:49 +0000
148+
149+avarice (2.8-1ubuntu1) jaunty; urgency=low
150+
151+ * Newer bfd uses libz, so we need to link against that as well as bfd is
152+ linked statically.
153+ - Beware, the static linking is done by simply changing src/Makefile.in,
154+ so running automake will undo this change.
155+
156+ -- James Westby <james.westby@canonical.com> Mon, 24 Nov 2008 03:02:09 +0000
157+
158 avarice (2.8-1) unstable; urgency=low
159
160 * New upstream release.
161
162=== modified file 'debian/control'
163--- debian/control 2011-12-03 12:23:50 +0000
164+++ debian/control 2012-12-23 16:48:23 +0000
165@@ -1,7 +1,8 @@
166 Source: avarice
167 Section: electronics
168 Priority: optional
169-Maintainer: Shaun Jackman <sjackman@debian.org>
170+Maintainer: Ubuntu MOTU Developers <ubuntu-motu@lists.ubuntu.com>
171+XSBC-Original-Maintainer: Shaun Jackman <sjackman@debian.org>
172 Build-Depends: binutils-dev, libusb-dev, zlib1g-dev, debhelper (>> 8)
173 Build-Conflicts: binutils-multiarch
174 Standards-Version: 3.9.2
175@@ -11,6 +12,7 @@
176 Architecture: any
177 Depends: ${shlibs:Depends}, ${misc:Depends}
178 Recommends: gdb-avr
179+Breaks: udev (<< 136-1)
180 Description: use GDB with Atmel's JTAG ICE for the AVR
181 AVaRICE translates between GDB's remote debug protocol and the AVR
182 JTAG ICE protocol.
183
184=== modified file 'debian/install'
185--- debian/install 2011-12-03 12:23:50 +0000
186+++ debian/install 2012-12-23 16:48:23 +0000
187@@ -1,2 +1,1 @@
188 src/avarice usr/bin
189-debian/avarice.rules lib/udev
190
191=== removed file 'debian/links'
192--- debian/links 2011-12-03 12:23:50 +0000
193+++ debian/links 1970-01-01 00:00:00 +0000
194@@ -1,1 +0,0 @@
195-lib/udev/avarice.rules lib/udev/rules.d/z60_avarice.rules
196
197=== added directory 'debian/patches'
198=== added file 'debian/patches/00_debian_origin.patch'
199--- debian/patches/00_debian_origin.patch 1970-01-01 00:00:00 +0000
200+++ debian/patches/00_debian_origin.patch 2012-12-23 16:48:23 +0000
201@@ -0,0 +1,25 @@
202+Index: avarice/doc/avarice.1
203+===================================================================
204+--- avarice.orig/doc/avarice.1 2012-12-24 00:58:22.000000000 +0900
205++++ avarice/doc/avarice.1 2012-12-24 01:12:10.051966803 +0900
206+@@ -23,7 +23,6 @@
207+
208+ ..
209+ .TH avarice 1 "September 29, 2008"
210+-.LO 1
211+ .SH NAME
212+ avarice \- Provides an interface from avr-gdb to Atmel's JTAGICE box.
213+ .SH SYNOPSIS
214+Index: avarice/src/Makefile.in
215+===================================================================
216+--- avarice.orig/src/Makefile.in 2012-12-24 00:58:22.000000000 +0900
217++++ avarice/src/Makefile.in 2012-12-24 01:12:10.051966803 +0900
218+@@ -105,7 +105,7 @@
219+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
220+ LDFLAGS = @LDFLAGS@
221+ LIBOBJS = @LIBOBJS@
222+-LIBS = @LIBS@
223++LIBS = -lusb /usr/lib/libbfd.a -lz -liberty -ldl
224+ LTLIBOBJS = @LTLIBOBJS@
225+ MAKEINFO = @MAKEINFO@
226+ MKDIR_P = @MKDIR_P@
227
228=== added file 'debian/patches/series'
229--- debian/patches/series 1970-01-01 00:00:00 +0000
230+++ debian/patches/series 2012-12-23 16:48:23 +0000
231@@ -0,0 +1,1 @@
232+00_debian_origin.patch
233
234=== added file 'debian/preinst'
235--- debian/preinst 1970-01-01 00:00:00 +0000
236+++ debian/preinst 2012-12-23 16:48:23 +0000
237@@ -0,0 +1,21 @@
238+#!/bin/sh
239+
240+set -e
241+
242+if [ "$1" = install ] || [ "$1" = upgrade ]; then
243+ if [ -L "/etc/udev/rules.d/z60_avarice.rules" ]; then
244+ rm -f /etc/udev/rules.d/z60_avarice.rules
245+ fi
246+
247+ if [ -e "/etc/udev/avarice.rules" ]; then
248+ if [ "`md5sum \"/etc/udev/avarice.rules\" | sed -e \"s/ .*//\"`" = \
249+ "`dpkg-query -W -f='${Conffiles}' avarice | sed -n -e \"\\\\' /etc/udev/avarice.rules's/.* //p\"`" ]
250+ then
251+ rm -f "/etc/udev/avarice.rules"
252+ else
253+ mv "/etc/udev/avarice.rules" "/etc/udev/rules.d/40-avarice.rules"
254+ fi
255+ fi
256+fi
257+
258+#DEBHELPER#
259
260=== added directory 'debian/source'
261=== added file 'debian/source/format'
262--- debian/source/format 1970-01-01 00:00:00 +0000
263+++ debian/source/format 2012-12-23 16:48:23 +0000
264@@ -0,0 +1,1 @@
265+3.0 (quilt)
266
267=== modified file 'doc/avarice.1'
268--- doc/avarice.1 2010-01-24 11:21:12 +0000
269+++ doc/avarice.1 2012-12-23 16:48:23 +0000
270@@ -23,6 +23,7 @@
271
272 ..
273 .TH avarice 1 "September 29, 2008"
274+.LO 1
275 .SH NAME
276 avarice \- Provides an interface from avr-gdb to Atmel's JTAGICE box.
277 .SH SYNOPSIS
278
279=== modified file 'src/Makefile.in'
280--- src/Makefile.in 2011-12-03 12:23:50 +0000
281+++ src/Makefile.in 2012-12-23 16:48:23 +0000
282@@ -105,7 +105,7 @@
283 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
284 LDFLAGS = @LDFLAGS@
285 LIBOBJS = @LIBOBJS@
286-LIBS = -lusb /usr/lib/libbfd.a -lz -liberty -ldl
287+LIBS = @LIBS@
288 LTLIBOBJS = @LTLIBOBJS@
289 MAKEINFO = @MAKEINFO@
290 MKDIR_P = @MKDIR_P@

Subscribers

People subscribed via source and target branches

to all changes: