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

[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

[Mitsuya Shibata (cosmos-door)]

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

[Micah Gersten (micahg)]

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

Unmerged revisions

12. By Mitsuya Shibata on 2012-12-23

* 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 on 2012-09-30

* 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 on 2010-02-06

* 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 on 2009-09-18

Added debian/patches/01_gcc4.4_fix.diff to fix FTBFS (LP: #432538)

8. By Andres Rodriguez on 2009-05-07

* 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) on 2009-01-13

* 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 on 2008-11-24

* 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.

=== added directory '.pc'
=== added file '.pc/.quilt_patches'
--- .pc/.quilt_patches	1970-01-01 00:00:00 +0000
+++ .pc/.quilt_patches	2012-12-23 16:48:23 +0000
@@ -0,0 +1,1 @@
+debian/patches
 
=== added file '.pc/.quilt_series'
--- .pc/.quilt_series	1970-01-01 00:00:00 +0000
+++ .pc/.quilt_series	2012-12-23 16:48:23 +0000
@@ -0,0 +1,1 @@
+series
 
=== added file '.pc/.version'
--- .pc/.version	1970-01-01 00:00:00 +0000
+++ .pc/.version	2012-12-23 16:48:23 +0000
@@ -0,0 +1,1 @@
+2
 
=== removed file 'debian/avarice.rules'
--- debian/avarice.rules	2011-12-03 12:23:50 +0000
+++ debian/avarice.rules	1970-01-01 00:00:00 +0000
@@ -1,9 +0,0 @@
-SUBSYSTEM!="usb_device", ACTION!="add", GOTO="avarice_end"
-
-# Atmel Corp. JTAG ICE mkII
-ATTRS{idVendor}=="03eb", ATTRS{idProduct}=="2103", MODE="660", GROUP="dialout"
-
-# Atmel Corp. AVR Dragon
-ATTRS{idVendor}=="03eb", ATTRS{idProduct}=="2107", MODE="660", GROUP="dialout"
-
-LABEL="avarice_end"
 
=== added file 'debian/avarice.udev'
--- debian/avarice.udev	1970-01-01 00:00:00 +0000
+++ debian/avarice.udev	2012-12-23 16:48:23 +0000
@@ -0,0 +1,9 @@
+SUBSYSTEM!="usb_device", ACTION!="add", GOTO="avarice_end"
+
+# Atmel Corp. JTAG ICE mkII
+ATTRS{idVendor}=="03eb", ATTRS{idProduct}=="2103", MODE="660", GROUP="dialout"
+
+# Atmel Corp. AVR Dragon
+ATTRS{idVendor}=="03eb", ATTRS{idProduct}=="2107", MODE="660", GROUP="dialout"
+
+LABEL="avarice_end"
 
=== modified file 'debian/changelog'
--- debian/changelog	2011-12-03 12:23:50 +0000
+++ debian/changelog	2012-12-23 16:48:23 +0000
@@ -1,3 +1,19 @@
+avarice (2.11-1ubuntu1) raring; urgency=low
+
+  * 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
+
+ -- Mitsuya Shibata <[e-mail]>  Mon, 24 Dec 2012 01:13:17 +0900
+
 avarice (2.11-1) unstable; urgency=low
 
   * New upstream release.
@@ -8,6 +24,31 @@
 
  -- Shaun Jackman <[e-mail]>  Sat, 03 Dec 2011 12:23:50 -0800
 
+avarice (2.10-3ubuntu2) quantal; urgency=low
+
+  * 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
+
+ -- Mitsuya Shibata <[e-mail]>  Sun, 30 Sep 2012 18:16:33 +0900
+
+avarice (2.10-3ubuntu1) lucid; urgency=low
+
+  * 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
+
+ -- Scott Howard <[e-mail]>  Sat, 06 Feb 2010 12:35:01 -0500
+
 avarice (2.10-3) unstable; urgency=medium
 
   * Patch usb_dev_handle to fix a FTBFS. Closes: #565280.
@@ -31,6 +72,28 @@
 
  -- Shaun Jackman <[e-mail]>  Sun, 16 Aug 2009 11:17:09 -0700
 
+avarice (2.9-1.1ubuntu2) karmic; urgency=low
+
+  * Added debian/patches/01_gcc4.4_fix.diff to fix FTBFS (LP: #432538)
+
+ -- Nicolas Van Wambeke <[e-mail]>  Fri, 18 Sep 2009 16:03:07 +0200
+
+avarice (2.9-1.1ubuntu1) karmic; urgency=low
+
+  * 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
+
+ -- Andres Rodriguez <[e-mail]>  Thu, 07 May 2009 12:43:51 -0500
+
 avarice (2.9-1.1) unstable; urgency=low
 
   * Non-maintainer upload.
@@ -47,6 +110,28 @@
 
  -- Shaun Jackman <[e-mail]>  Mon, 30 Mar 2009 19:09:40 -0700
 
+avarice (2.8-1ubuntu2) jaunty; urgency=low
+
+  * 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
+
+ -- Scott James Remnant <[e-mail]>  Tue, 13 Jan 2009 01:37:49 +0000
+
+avarice (2.8-1ubuntu1) jaunty; urgency=low
+
+  * 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.
+
+ -- James Westby <[e-mail]>  Mon, 24 Nov 2008 03:02:09 +0000
+
 avarice (2.8-1) unstable; urgency=low
 
   * New upstream release.
 
=== modified file 'debian/control'
--- debian/control	2011-12-03 12:23:50 +0000
+++ debian/control	2012-12-23 16:48:23 +0000
@@ -1,7 +1,8 @@
 Source: avarice
 Section: electronics
 Priority: optional
-Maintainer: Shaun Jackman <[e-mail]>
+Maintainer: Ubuntu MOTU Developers <[e-mail]>
+XSBC-Original-Maintainer: Shaun Jackman <[e-mail]>
 Build-Depends: binutils-dev, libusb-dev, zlib1g-dev, debhelper (>> 8)
 Build-Conflicts: binutils-multiarch
 Standards-Version: 3.9.2
@@ -11,6 +12,7 @@
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Recommends: gdb-avr
+Breaks: udev (<< 136-1)
 Description: use GDB with Atmel's JTAG ICE for the AVR
  AVaRICE translates between GDB's remote debug protocol and the AVR
  JTAG ICE protocol.
 
=== modified file 'debian/install'
--- debian/install	2011-12-03 12:23:50 +0000
+++ debian/install	2012-12-23 16:48:23 +0000
@@ -1,2 +1,1 @@
 src/avarice usr/bin
-debian/avarice.rules lib/udev
 
=== removed file 'debian/links'
--- debian/links	2011-12-03 12:23:50 +0000
+++ debian/links	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-lib/udev/avarice.rules lib/udev/rules.d/z60_avarice.rules
 
=== added directory 'debian/patches'
=== added file 'debian/patches/00_debian_origin.patch'
--- debian/patches/00_debian_origin.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/00_debian_origin.patch	2012-12-23 16:48:23 +0000
@@ -0,0 +1,25 @@
+Index: avarice/doc/avarice.1
+===================================================================
+--- avarice.orig/doc/avarice.1	2012-12-24 00:58:22.000000000 +0900
++++ avarice/doc/avarice.1	2012-12-24 01:12:10.051966803 +0900
+@@ -23,7 +23,6 @@
+ 
+ ..
+ .TH avarice 1 "September 29, 2008"
+-.LO 1
+ .SH NAME
+ avarice \- Provides an interface from avr-gdb to Atmel's JTAGICE box.
+ .SH SYNOPSIS
+Index: avarice/src/Makefile.in
+===================================================================
+--- avarice.orig/src/Makefile.in	2012-12-24 00:58:22.000000000 +0900
++++ avarice/src/Makefile.in	2012-12-24 01:12:10.051966803 +0900
+@@ -105,7 +105,7 @@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ LDFLAGS = @LDFLAGS@
+ LIBOBJS = @LIBOBJS@
+-LIBS = @LIBS@
++LIBS = -lusb /usr/lib/libbfd.a -lz -liberty -ldl
+ LTLIBOBJS = @LTLIBOBJS@
+ MAKEINFO = @MAKEINFO@
+ MKDIR_P = @MKDIR_P@
 
=== added file 'debian/patches/series'
--- debian/patches/series	1970-01-01 00:00:00 +0000
+++ debian/patches/series	2012-12-23 16:48:23 +0000
@@ -0,0 +1,1 @@
+00_debian_origin.patch
 
=== added file 'debian/preinst'
--- debian/preinst	1970-01-01 00:00:00 +0000
+++ debian/preinst	2012-12-23 16:48:23 +0000
@@ -0,0 +1,21 @@
+#!/bin/sh
+
+set -e
+
+if [ "$1" = install ] || [ "$1" = upgrade ]; then
+	if [ -L "/etc/udev/rules.d/z60_avarice.rules" ]; then
+		rm -f /etc/udev/rules.d/z60_avarice.rules
+	fi
+
+	if [ -e "/etc/udev/avarice.rules" ]; then
+		if [ "`md5sum \"/etc/udev/avarice.rules\" | sed -e \"s/ .*//\"`" = \
+		     "`dpkg-query -W -f='${Conffiles}' avarice | sed -n -e \"\\\\' /etc/udev/avarice.rules's/.* //p\"`" ]
+		then
+			rm -f "/etc/udev/avarice.rules"
+		else
+			mv "/etc/udev/avarice.rules" "/etc/udev/rules.d/40-avarice.rules"
+		fi
+	fi
+fi
+
+#DEBHELPER#
 
=== added directory 'debian/source'
=== added file 'debian/source/format'
--- debian/source/format	1970-01-01 00:00:00 +0000
+++ debian/source/format	2012-12-23 16:48:23 +0000
@@ -0,0 +1,1 @@
+3.0 (quilt)
 
=== modified file 'doc/avarice.1'
--- doc/avarice.1	2010-01-24 11:21:12 +0000
+++ doc/avarice.1	2012-12-23 16:48:23 +0000
@@ -23,6 +23,7 @@
 
 ..
 .TH avarice 1 "September 29, 2008"
+.LO 1
 .SH NAME
 avarice \- Provides an interface from avr-gdb to Atmel's JTAGICE box.
 .SH SYNOPSIS
 
=== modified file 'src/Makefile.in'
--- src/Makefile.in	2011-12-03 12:23:50 +0000
+++ src/Makefile.in	2012-12-23 16:48:23 +0000
@@ -105,7 +105,7 @@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
-LIBS = -lusb /usr/lib/libbfd.a -lz -liberty -ldl
+LIBS = @LIBS@
 LTLIBOBJS = @LTLIBOBJS@
 MAKEINFO = @MAKEINFO@
 MKDIR_P = @MKDIR_P@