diff -Nru fbset-2.1/debian/changelog fbset-2.1/debian/changelog
--- fbset-2.1/debian/changelog	2017-05-09 23:39:37.000000000 +0000
+++ fbset-2.1/debian/changelog	2017-11-11 23:29:03.000000000 +0000
@@ -1,8 +1,12 @@
-fbset (2.1-29ubuntu1) artful; urgency=medium
+fbset (2.1-30) unstable; urgency=medium
 
-  * Fix udeb FTBFS due to applying PIE link flags but not compile flags.
+  * Line-wrap and sort dependency fields.
+  * Now using Standards-Version 4.1.1 (no changes needed).
+  * Switch debhelper compatibility level to 10.
+  * Switch debian/watch format version to 4.
+  * Set Rules-Requires-Root to no.
 
- -- Adam Conrad <adconrad@ubuntu.com>  Tue, 09 May 2017 17:39:37 -0600
+ -- Guillem Jover <guillem@debian.org>  Sun, 12 Nov 2017 00:29:03 +0100
 
 fbset (2.1-29) unstable; urgency=medium
 
diff -Nru fbset-2.1/debian/compat fbset-2.1/debian/compat
--- fbset-2.1/debian/compat	2014-03-02 19:39:47.000000000 +0000
+++ fbset-2.1/debian/compat	2017-11-11 23:24:38.000000000 +0000
@@ -1 +1 @@
-9
+10
diff -Nru fbset-2.1/debian/control fbset-2.1/debian/control
--- fbset-2.1/debian/control	2017-05-09 23:39:37.000000000 +0000
+++ fbset-2.1/debian/control	2017-11-11 23:27:02.000000000 +0000
@@ -1,17 +1,24 @@
 Source: fbset
 Section: admin
 Priority: optional
-Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
-XSBC-Original-Maintainer: Debian QA Group <packages@qa.debian.org>
+Maintainer: Debian QA Group <packages@qa.debian.org>
 Homepage: http://users.telenet.be/geertu/Linux/fbdev/
 Vcs-Browser: https://git.hadrons.org/cgit/debian/pkgs/fbset.git
 Vcs-Git: https://git.hadrons.org/git/debian/pkgs/fbset.git
-Build-Depends: dpkg-dev (>= 1.15.7), debhelper (>= 9), flex, bison
-Standards-Version: 3.9.8
+Standards-Version: 4.1.1
+Rules-Requires-Root: no
+Build-Depends:
+ dpkg-dev (>= 1.15.7),
+ debhelper (>= 10),
+ flex,
+ bison,
 
 Package: fbset
 Architecture: linux-any
-Depends: ${shlibs:Depends}, ${misc:Depends}, udev | makedev (>= 2.3.1-24)
+Depends:
+ ${misc:Depends},
+ ${shlibs:Depends},
+ udev | makedev (>= 2.3.1-24),
 Description: framebuffer device maintenance program
  Program to modify settings for the framebuffer devices (/dev/fb[0-9]*
  or /dev/fb/[0-9]*) on Linux, like depth, virtual resolution, timing
@@ -22,7 +29,9 @@
 Section: debian-installer
 Priority: extra
 Architecture: linux-any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends:
+ ${misc:Depends},
+ ${shlibs:Depends},
 Description: framebuffer device maintenance program
  Program to modify settings for the framebuffer devices (/dev/fb[0-9]*
  or /dev/fb/[0-9]*) on Linux, like depth, virtual resolution, timing
diff -Nru fbset-2.1/debian/rules fbset-2.1/debian/rules
--- fbset-2.1/debian/rules	2017-05-09 23:39:35.000000000 +0000
+++ fbset-2.1/debian/rules	2017-01-19 00:05:02.000000000 +0000
@@ -9,10 +9,12 @@
 
 include /usr/share/dpkg/default.mk
 
-CFLAGS_UDEB := $(CFLAGS)
+CFLAGS_UDEB := -Wall
 DIR_FLAGS = srcdir=.. VPATH=..
 
-ifeq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
+ifneq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
+	CFLAGS_UDEB += -O0
+else
 	CFLAGS_UDEB += -Os -fomit-frame-pointer
 endif
 
diff -Nru fbset-2.1/debian/watch fbset-2.1/debian/watch
--- fbset-2.1/debian/watch	2009-03-22 22:25:05.000000000 +0000
+++ fbset-2.1/debian/watch	2017-11-11 23:25:56.000000000 +0000
@@ -1,2 +1,2 @@
-version=3
+version=4
 http://users.telenet.be/geertu/Linux/fbdev/ fbset-(.*)\.tar\.gz debian uupdate