diff --git a/debian/changelog b/debian/changelog
index 996d5f2..62bd781 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
notify-osd (0.9.35+20.04.20191129-1) UNRELEASED; urgency=medium
+ [ Boyuan Yang ]
* Merge new upstream release from Ubuntu. Remaining Debian changes:
- Don't install dbus activation file (See: #640120).
- Install notify-osd.desktop to /etc/xdg/autostart (See: #669136).
@@ -13,6 +14,15 @@ notify-osd (0.9.35+20.04.20191129-1) UNRELEASED; urgency=medium
- debian/source_notify-osd.py: Dropped following Ubuntu upstream.
* Remaining bug: .desktop file does not point to correct executable file.
+ [ Debian Janitor ]
+ * Bump debhelper from old 12 to 13.
+ + debian/rules: Drop --fail-missing argument to dh_missing, which is now the
+ default.
+ * Set upstream metadata fields: Repository-Browse.
+ * Remove unnecessary XS-Testsuite field in debian/control.
+ * Update standards version to 4.6.2, no changes needed.
+ * Avoid explicitly specifying -Wl,--as-needed linker flag.
+
-- Boyuan Yang <byang@debian.org> Fri, 13 Dec 2019 14:39:43 -0500
notify-osd (0.9.35+20.04.20191129-0ubuntu1) focal; urgency=medium
diff --git a/debian/control b/debian/control
index 9711fbf..bcd050b 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: x11
Priority: optional
Maintainer: Ayatana Packagers <pkg-ayatana-devel@lists.alioth.debian.org>
Uploaders: Boyuan Yang <byang@debian.org>
-Build-Depends: debhelper-compat (= 12),
+Build-Depends: debhelper-compat (= 13),
gnome-common,
intltool,
libdbus-1-dev (>= 0.36),
@@ -12,8 +12,7 @@ Build-Depends: debhelper-compat (= 12),
libgtk-3-dev (>= 3.8.0),
libnotify-dev (>= 0.6.1),
libwnck-3-dev,
-XS-Testsuite: autopkgtest
-Standards-Version: 4.4.1
+Standards-Version: 4.6.2
Rules-Requires-Root: no
Homepage: https://launchpad.net/notify-osd
Vcs-Git: https://salsa.debian.org/debian/notify-osd.git
diff --git a/debian/rules b/debian/rules
index bd632fa..6b27694 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,12 +6,6 @@
# see FEATURE AREAS in dpkg-buildflags(1)
export DEB_BUILD_MAINT_OPTIONS = hardening=+all
-# see ENVIRONMENT in dpkg-buildflags(1)
-# package maintainers to append CFLAGS
-#export DEB_CFLAGS_MAINT_APPEND = -Wall -pedantic
-# package maintainers to append LDFLAGS
-export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed
-
export DPKG_GENSYMBOLS_CHECK_LEVEL=4
%:
@@ -28,6 +22,3 @@ override_dh_install:
rm debian/notify-osd/usr/share/dbus-1/services/org.freedesktop.Notifications.service
rmdir debian/notify-osd/usr/share/dbus-1/services/
rmdir debian/notify-osd/usr/share/dbus-1/
-
-override_dh_missing:
- dh_missing --fail-missing
diff --git a/debian/upstream/metadata b/debian/upstream/metadata
new file mode 100644
index 0000000..59712f3
--- /dev/null
+++ b/debian/upstream/metadata
@@ -0,0 +1,2 @@
+---
+Repository-Browse: https://code.launchpad.net/notify-osd