Jeremy Bicha · Jeremy Bicha · Jeremy Bicha · Jeremy Bicha · Jeremy Bicha · Jeremy Bicha
--- a/debian/changelog
+++ b/debian/changelog
+rygel (0.40.1-3ubuntu1) impish; urgency=medium
+
+  * Sync with Debian. Remaining change:
+    - Add debian/patches/revert_gst_depends.patch: revert upstream commit
+      'Use GES for time seeking during transcoding', gst-editing-services
+      depends on gstreamer codecs which can't be promoted to main
+
+ -- Jeremy Bicha <jbicha@debian.org>  Sun, 19 Sep 2021 07:25:14 -0400
+
+rygel (0.40.1-3) unstable; urgency=medium
+
+  * Build-Depend on dh-sequence-gnome
+  * debian/rules: Simplify a bit
+  * Bump debhelper-compat to 13
+  * Release to unstable
+
+ -- Jeremy Bicha <jbicha@debian.org>  Tue, 31 Aug 2021 20:45:51 -0400
+
 rygel (0.40.1-2ubuntu1) impish; urgency=medium

  * debian/patches/revert_gst_depends.patch: revert upstream commit

--- a/debian/control
+++ b/debian/control
@@ -5,11 +5,11 @@
 Source: rygel
 Section: net
 Priority: optional
-Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>
 Uploaders: Emilio Pozuelo Monfort <pochu@debian.org>, Iain Lane <laney@debian.org>, Jeremy Bicha <jbicha@debian.org>, Laurent Bigonville <bigon@debian.org>
-Build-Depends: debhelper-compat (= 12),
-               gnome-pkg-tools,
-               gobject-introspection,
+Build-Depends: debhelper-compat (= 13),
+               dh-sequence-gnome,
               gstreamer1.0-plugins-base,
               gtk-doc-tools,
               meson (>= 0.50.0),

--- a/debian/control.in
+++ b/debian/control.in
 Source: rygel
 Section: net
 Priority: optional
-Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>
 Uploaders: @GNOME_TEAM@
-Build-Depends: debhelper-compat (= 12),
-               gnome-pkg-tools,
-               gobject-introspection,
+Build-Depends: debhelper-compat (= 13),
+               dh-sequence-gnome,
               gstreamer1.0-plugins-base,
               gtk-doc-tools,
               meson (>= 0.50.0),

--- a/debian/rules
+++ b/debian/rules
@@ -3,9 +3,9 @@
 DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)

 export DEB_BUILD_MAINT_OPTIONS = hardening=+all
-export DEB_LDFLAGS_MAINT_APPEND = -Wl,-O1 -Wl,-z,defs -Wl,--as-needed
+export DEB_LDFLAGS_MAINT_APPEND = -Wl,-O1 -Wl,-z,defs

-# those gstream plugins are in universe for Ubuntu
+# those gstreamer plugins are in universe for Ubuntu
 ifeq ($(shell dpkg-vendor --derives-from Ubuntu && echo yes),yes)
 	DH_GENCONTROL_ARGS += -Vgst:Suggests="gstreamer1.0-libav, gstreamer1.0-plugins-ugly"
 else
@@ -13,13 +13,12 @@ else
 endif

 %:
-	dh $@ --with gnome
+	dh $@

 override_dh_gencontrol:
 	dh_gencontrol -- $(DH_GENCONTROL_ARGS)

 override_dh_auto_configure:
-	find . -name "*_vala.stamp" | xargs rm -f
 	dh_auto_configure -- \
 		-Dsystemd-user-units-dir=/usr/lib/systemd/user \
 	        -Dapi-docs=true \
@@ -27,18 +26,8 @@ override_dh_auto_configure:
 		-Dexamples=false \
 		-Dplugins=external,gst-launch,media-export,mpris,playbin,ruih,tracker3

-override_dh_strip:
-	dh_strip --dbgsym-migration='rygel-dbg (<< 0.28.3-2~)'
-
 override_dh_makeshlibs:
 	dh_makeshlibs -X /usr/lib/$(DEB_HOST_MULTIARCH)/rygel-2.6/

-override_dh_install:
-	find debian/tmp -name '*.la' -print -delete
-	dh_install
-
-override_dh_missing:
-	dh_missing --fail-missing
-
 override_dh_installsystemduser:
 	dh_installsystemduser --no-enable