diff -pruN 0.0.20081013-1/debian/changelog 0.0.20081013-1ubuntu2/debian/changelog
--- 0.0.20081013-1/debian/changelog	2010-04-20 07:56:01.000000000 +0000
+++ 0.0.20081013-1ubuntu2/debian/changelog	2018-04-03 12:23:57.000000000 +0000
@@ -1,3 +1,16 @@
+fxload (0.0.20081013-1ubuntu2) bionic; urgency=high
+
+  * No change rebuild to pick up -fPIE compiler default
+
+ -- Balint Reczey <rbalint@ubuntu.com>  Tue, 03 Apr 2018 12:23:57 +0000
+
+fxload (0.0.20081013-1ubuntu1) maverick; urgency=low
+
+  * Merge from debian unstable. (LP: #587824)  Remaining changes:
+    - Use DEVNAME from the environment in preference to DEVICE (LP: #156085)
+
+ -- Jean-Louis Dupond <jean-louis@dupond.be>  Wed, 05 May 2010 03:58:58 +0100
+
 fxload (0.0.20081013-1) unstable; urgency=low
 
   * Adopting package (Closes: #541059).
@@ -11,6 +24,13 @@ fxload (0.0.20081013-1) unstable; urgenc
 
  -- Tzafrir Cohen <tzafrir@debian.org>  Tue, 20 Apr 2010 10:53:57 +0300
 
+fxload (0.0.20020411-1.1ubuntu1) jaunty; urgency=low
+
+  * Use DEVNAME from the environment in preference to DEVICE, the former
+    contains the modern /dev/bus/usb path.  LP: #156085.
+
+ -- Scott James Remnant <scott@ubuntu.com>  Tue, 17 Mar 2009 10:02:33 +0000
+
 fxload (0.0.20020411-1.1) unstable; urgency=high
 
   * Non-maintainer upload.
diff -pruN 0.0.20081013-1/debian/control 0.0.20081013-1ubuntu2/debian/control
--- 0.0.20081013-1/debian/control	2010-04-20 05:33:15.000000000 +0000
+++ 0.0.20081013-1ubuntu2/debian/control	2010-06-02 20:29:48.000000000 +0000
@@ -1,7 +1,8 @@
 Source: fxload
 Section: admin
 Priority: optional
-Maintainer: Fumitoshi UKAI <ukai@debian.or.jp>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Fumitoshi UKAI <ukai@debian.or.jp>
 Uploaders: Tzafrir Cohen <tzafrir@debian.org>
 Build-Depends: debhelper (>= 7)
 Standards-Version: 3.8.4
diff -pruN 0.0.20081013-1/debian/patches/series 0.0.20081013-1ubuntu2/debian/patches/series
--- 0.0.20081013-1/debian/patches/series	2010-04-20 05:40:59.000000000 +0000
+++ 0.0.20081013-1ubuntu2/debian/patches/series	2010-06-02 20:29:21.000000000 +0000
@@ -1,2 +1,3 @@
 destdir
 remove_ident
+use_devname
diff -pruN 0.0.20081013-1/debian/patches/use_devname 0.0.20081013-1ubuntu2/debian/patches/use_devname
--- 0.0.20081013-1/debian/patches/use_devname	1970-01-01 00:00:00.000000000 +0000
+++ 0.0.20081013-1ubuntu2/debian/patches/use_devname	2010-06-02 20:29:21.000000000 +0000
@@ -0,0 +1,53 @@
+--- fxload-0.0.20081013.orig/main.c
++++ fxload-0.0.20081013/main.c
+@@ -33,7 +33,7 @@
+  *
+  *     -L <path>       -- Create a symbolic link to the device.
+  *     -m <mode>       -- Set the permissions on the device after download.
+- *     -D <path>       -- Use this device, instead of $DEVICE
++ *     -D <path>       -- Use this device, instead of $DEVNAME or $DEVICE
+  *
+  *     -V              -- Print version ID for program
+  *
+@@ -42,10 +42,10 @@
+  * expects these environment variables which are passed by hotplug to
+  * its sub-scripts:
+  *
+- *     DEVICE=<path>
+- *         This is the path to the device is /proc/bus/usb. It is the
+- *         complete path to the device, that I can pass to open and
+- *         manipulate as a USB device.
++ *     DEVNAME=<path>, DEVICE=<path>
++ *         This is the path to the device in /dev/bus/usb or
++ *         /proc/bus/usb. It is the complete path to the device, that
++ *         I can pass to open and manipulate as a USB device.
+  */
+ 
+ # include  <stdlib.h>
+@@ -90,13 +90,16 @@ int main(int argc, char*argv[])
+ {
+       const char	*link_path = 0;
+       const char	*ihex_path = 0;
+-      const char	*device_path = getenv("DEVICE");
++      const char	*device_path = getenv("DEVNAME");
+       const char	*type = 0;
+       const char	*stage1 = 0;
+       mode_t		mode = 0;
+       int		opt;
+       int		config = -1;
+ 
++      if (!device_path)
++	      device_path = getenv("DEVICE");
++
+       while ((opt = getopt (argc, argv, "2vV?D:I:L:c:lm:s:t:")) != EOF)
+       switch (opt) {
+ 
+@@ -190,7 +193,7 @@ usage:
+ 	    fputs ("\t\t[-I firmware_hexfile] ", stderr);
+ 	    fputs ("[-s loader] [-c config_byte]\n", stderr);
+ 	    fputs ("\t\t[-L link] [-m mode]\n", stderr);
+-	    fputs ("... [-D devpath] overrides DEVICE= in env\n", stderr);
++	    fputs ("... [-D devpath] overrides DEVNAME= and DEVICE= in env\n", stderr);
+ 	    fputs ("... device types:  one of an21, fx, fx2, fx2lp\n", stderr);
+ 	    fputs ("... at least one of -I, -L, -m is required\n", stderr);
+ 	    return -1;
