diff -Nru libgphoto2-2.5.4/debian/changelog libgphoto2-2.5.4/debian/changelog
--- libgphoto2-2.5.4/debian/changelog	2014-10-07 10:38:29.000000000 +0000
+++ libgphoto2-2.5.4/debian/changelog	2014-11-04 08:15:05.000000000 +0000
@@ -1,34 +1,17 @@
-libgphoto2 (2.5.4-1ubuntu4) utopic; urgency=medium
+libgphoto2 (2.5.4-1.1ubuntu1) vivid; urgency=medium
 
-  * debian/libgphoto2-6.udev: Fix typoed label name. (LP: #1376701)
-
- -- Martin Pitt <martin.pitt@ubuntu.com>  Tue, 07 Oct 2014 12:38:08 +0200
-
-libgphoto2 (2.5.4-1ubuntu3) utopic; urgency=medium
-
-  * debian/libgphoto2-6.udev: Fix typo to really make the rule work.
-    (LP: #1296275)
-
- -- Martin Pitt <martin.pitt@ubuntu.com>  Mon, 16 Jun 2014 11:38:27 +0200
-
-libgphoto2 (2.5.4-1ubuntu2) utopic; urgency=medium
-
-  * Add debian/libgphoto2-6.udev: Provide rule for generic "PtP device" to
-    unbreak cameras which aren't explicitly known to libgphoto by
-    vendor/product ID, until either hwdb or gvfs get fixed properly.
-    (LP: #1296275)
+  * Merge with Debian unstable. Remaining Ubuntu changes:
+    - debian/rules: Drop usb udev rules, they are redundant with the hwdb
+      file. (Debian #738522)
 
- -- Martin Pitt <martin.pitt@ubuntu.com>  Tue, 10 Jun 2014 17:43:28 +0200
+ -- Martin Pitt <martin.pitt@ubuntu.com>  Tue, 04 Nov 2014 09:14:31 +0100
 
-libgphoto2 (2.5.4-1ubuntu1) utopic; urgency=medium
+libgphoto2 (2.5.4-1.1) unstable; urgency=low
 
-  * Merge with Debian unstable. Remaining Ubuntu changes:
-    - Re-introduce building with dh-autoreconf instead of just autotools_dev
-      to use latest libtool. Fixes ppc64el build failure.
-    - Stop installing the udev rules; it's redundant with the (much more
-      efficient) hwdb file.
+  * Non-maintainer upload.
+  * Fix FTBFS on ppc64el by using autoreconf. Closes: #759274
 
- -- Martin Pitt <martin.pitt@ubuntu.com>  Mon, 28 Apr 2014 13:50:11 +0200
+ -- Andreas Barth <aba@ayous.org>  Mon, 25 Aug 2014 19:48:24 +0000
 
 libgphoto2 (2.5.4-1) unstable; urgency=medium
 
diff -Nru libgphoto2-2.5.4/debian/control libgphoto2-2.5.4/debian/control
--- libgphoto2-2.5.4/debian/control	2014-04-28 11:50:08.000000000 +0000
+++ libgphoto2-2.5.4/debian/control	2014-11-04 08:15:08.000000000 +0000
@@ -8,7 +8,7 @@
  , Gürkan Sengün <gurkan@phys.ethz.ch>
 Build-Depends:
  debhelper (>= 9)
- , dh-autoreconf
+ , dh-autoreconf,
  , libtool
  , libltdl-dev
  , zlib1g-dev
diff -Nru libgphoto2-2.5.4/debian/libgphoto2-6.udev libgphoto2-2.5.4/debian/libgphoto2-6.udev
--- libgphoto2-2.5.4/debian/libgphoto2-6.udev	2014-10-07 10:38:05.000000000 +0000
+++ libgphoto2-2.5.4/debian/libgphoto2-6.udev	1970-01-01 00:00:00.000000000 +0000
@@ -1,7 +0,0 @@
-ACTION!="add", GOTO="libgphoto2_rules_end"
-SUBSYSTEM!="usb", GOTO="libgphoto2_rules_end"
-ENV{ID_USB_INTERFACES}=="", IMPORT{builtin}="usb_id"
-ENV{ID_USB_INTERFACES}=="*:060101:*", ENV{ID_GPHOTO2}="1", ENV{GPHOTO2_DRIVER}="PTP", MODE="0664", GROUP="plugdev"
-
-LABEL="libgphoto2_rules_end"
-
diff -Nru libgphoto2-2.5.4/debian/rules libgphoto2-2.5.4/debian/rules
--- libgphoto2-2.5.4/debian/rules	2014-06-10 15:46:17.000000000 +0000
+++ libgphoto2-2.5.4/debian/rules	2014-11-04 08:14:28.000000000 +0000
@@ -39,10 +39,13 @@
 override_dh_installudev:
 	# No longer needed with current udev. But check with non-Linux architectures stuff:
 	# rm debian/libgphoto2-2/lib/udev/check-ptp-camera
-	# Generate the hwdb file
+	# Generate the udev file, get it installed, and clean; but ignore the
+	# USB matches, they are redundant with libgphoto2-6.hwdb
+	CAMLIBS=`ls -d debian/libgphoto2-$(major)/usr/lib/$(DEB_HOST_MULTIARCH)/libgphoto2/2*` ./packaging/generic/print-camera-list udev-rules version 175 mode 0664 group plugdev | grep -v ^ATTRS > debian/libgphoto2-$(major).udev
 	mkdir -p debian/libgphoto2-$(major)/lib/udev/hwdb.d/
 	CAMLIBS=`ls -d debian/libgphoto2-$(major)/usr/lib/$(DEB_HOST_MULTIARCH)/libgphoto2/2*` ./packaging/generic/print-camera-list hwdb > debian/libgphoto2-$(major)/lib/udev/hwdb.d/20-libgphoto2-$(major).hwdb
 	dh_installudev
+	rm debian/libgphoto2-$(major).udev
 endif
 
 override_dh_fixperms: