Move disabling of broken features from d/p/series-orig to d/p/series

Also fix fuzz on one of the patches (our private patch system allows
one line of fuzz).

debian/changelog

@@ -24,6 +24,7 @@ linux (4.18~rc7-1~exp1) UNRELEASED; urgency=medium
   * debian/bin/genorig.py: Add support for debian/copyright Files-Excluded
     field
   * Move file exclusion from d/p/debian/dfsg/files-1 to d/copyright
+  * Move disabling of broken features from d/p/series-orig to d/p/series
 
  -- Uwe Kleine-König <ukleinek@debian.org>  Sat, 21 Jul 2018 16:52:01 +0200
 

debian/patches/debian/dfsg/vs6624-disable.patch

@@ -5,8 +5,8 @@ Forwarded: not-needed
 
 --- a/drivers/media/i2c/Kconfig
 +++ b/drivers/media/i2c/Kconfig
-@@ -422,6 +422,7 @@ config VIDEO_OV7670
- 	  controller.
+@@ -768,6 +768,7 @@ config VIDEO_OV13858
+ 	  OV13858 camera.
  
  config VIDEO_VS6624
 +	depends on BROKEN

debian/patches/series

@@ -1,3 +1,10 @@
+# Disable features broken by exclusion of upstream files
+debian/dfsg/arch-powerpc-platforms-8xx-ucode-disable.patch
+debian/dfsg/drivers-media-dvb-dvb-usb-af9005-disable.patch
+debian/dfsg/vs6624-disable.patch
+debian/dfsg/drivers-net-appletalk-cops.patch
+debian/dfsg/video-remove-nvidiafb-and-rivafb.patch
+
 # Changes to support package build system
 debian/version.patch
 debian/uname-version-timestamp.patch

debian/patches/series-orig

@@ -1,5 +0,0 @@
-+ debian/dfsg/arch-powerpc-platforms-8xx-ucode-disable.patch
-+ debian/dfsg/drivers-media-dvb-dvb-usb-af9005-disable.patch
-+ debian/dfsg/vs6624-disable.patch
-+ debian/dfsg/drivers-net-appletalk-cops.patch
-+ debian/dfsg/video-remove-nvidiafb-and-rivafb.patch