diff --git a/debian/changelog b/debian/changelog
index f30c958b..f167905f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+gtkmm2.4 (1:2.24.5-5) UNRELEASED; urgency=medium
+
+ * Trim trailing whitespace.
+ * Bump debhelper from old 11 to 13.
+ * Set debhelper-compat version in Build-Depends.
+ * Set upstream metadata fields: Bug-Database, Bug-Submit, Repository-Browse.
+ * Drop transition for old debug package migration.
+ * Update standards version to 4.6.2, no changes needed.
+ * Avoid explicitly specifying -Wl,--as-needed linker flag.
+
+ -- Debian Janitor <janitor@jelmer.uk> Fri, 17 Feb 2023 21:44:05 -0000
+
gtkmm2.4 (1:2.24.5-4) unstable; urgency=medium
* Team upload
@@ -103,7 +115,7 @@ gtkmm2.4 (1:2.24.3-1) unstable; urgency=low
gtkmm2.4 (1:2.24.2-1) unstable; urgency=low
* New upstream release.
- + Remove all patches. Fixed upstream.
+ + Remove all patches. Fixed upstream.
+ Drop mm-common as build-dep. Not needed anymore.
* Refine package descriptions. (Closes: #624356)
@@ -275,7 +287,7 @@ gtkmm2.4 (1:2.14.1-1) experimental; urgency=low
[ Deng Xiyue ]
* New upstream stable release. (Closes: #502592)
+ Now pangomm has been split into a separate package pangomm, hence
- Build-Depends on libpangomm-1.4-dev (>= 2.14.0).
+ Build-Depends on libpangomm-1.4-dev (>= 2.14.0).
+ And tutorial book has been split into gtkmm-documentation.
Recommend it in libgtkmm-2.4-doc, and stop recommending
libglibmm-2.4-doc.
@@ -299,7 +311,7 @@ gtkmm2.4 (1:2.12.7-1) unstable; urgency=low
* New upstream release.
+ Fix a warning on type qualifiers on function return type.
- (Closes: #456972)
+ (Closes: #456972)
* Use a more universal syntax for soname in the sed to get $(SHARED_PKG).
* Fix section in doc-base references.
* Drop `head -n 1' from sed trick.
diff --git a/debian/compat b/debian/compat
deleted file mode 100644
index b4de3947..00000000
--- a/debian/compat
+++ /dev/null
@@ -1 +0,0 @@
-11
diff --git a/debian/control b/debian/control
index 06c9e694..c84cd35d 100644
--- a/debian/control
+++ b/debian/control
@@ -6,8 +6,8 @@ Source: gtkmm2.4
Section: oldlibs
Priority: optional
Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>
-Uploaders: Emilio Pozuelo Monfort <pochu@debian.org>, Jeremy Bicha <jbicha@debian.org>, Michael Biebl <biebl@debian.org>, Sebastian Dröge <slomo@debian.org>
-Build-Depends: debhelper (>= 11),
+Uploaders: Emilio Pozuelo Monfort <pochu@debian.org>, Michael Biebl <biebl@debian.org>, Sebastian Dröge <slomo@debian.org>
+Build-Depends: debhelper-compat (= 13),
gnome-pkg-tools (>= 0.11),
libgtk2.0-dev (>= 2.24.0),
libglibmm-2.4-dev (>= 2.27.93),
@@ -15,7 +15,7 @@ Build-Depends: debhelper (>= 11),
libatkmm-1.6-dev (>= 2.22.2),
mm-common (>= 0.9.5)
Rules-Requires-Root: no
-Standards-Version: 4.3.0
+Standards-Version: 4.6.2
Vcs-Browser: https://salsa.debian.org/gnome-team/gtkmm2.4
Vcs-Git: https://salsa.debian.org/gnome-team/gtkmm2.4.git
Homepage: https://www.gtkmm.org/
diff --git a/debian/control.in b/debian/control.in
index 7a8bc11d..22b09387 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -3,7 +3,7 @@ Section: oldlibs
Priority: optional
Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>
Uploaders: @GNOME_TEAM@
-Build-Depends: debhelper (>= 11),
+Build-Depends: debhelper-compat (= 13),
gnome-pkg-tools (>= 0.11),
libgtk2.0-dev (>= 2.24.0),
libglibmm-2.4-dev (>= 2.27.93),
@@ -11,7 +11,7 @@ Build-Depends: debhelper (>= 11),
libatkmm-1.6-dev (>= 2.22.2),
mm-common (>= 0.9.5)
Rules-Requires-Root: no
-Standards-Version: 4.3.0
+Standards-Version: 4.6.2
Vcs-Browser: https://salsa.debian.org/gnome-team/gtkmm2.4
Vcs-Git: https://salsa.debian.org/gnome-team/gtkmm2.4.git
Homepage: https://www.gtkmm.org/
diff --git a/debian/rules b/debian/rules
index 50a7729c..074d77f7 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,7 +7,7 @@ SHARED_PKG := $(shell sed -rn 's/^Package:[[:space:]]*(libgtkmm-[[:digit:]\.]+-[
SHVER := 1:2.24.0
export DEB_BUILD_MAINT_OPTIONS = hardening=+all
-export DEB_LDFLAGS_MAINT_APPEND = -Wl,-z,defs -Wl,-O1 -Wl,--as-needed
+export DEB_LDFLAGS_MAINT_APPEND = -Wl,-z,defs -Wl,-O1
%:
dh $@ --with gnome
@@ -18,9 +18,6 @@ override_dh_autoreconf:
override_dh_makeshlibs:
dh_makeshlibs -V"$(SHARED_PKG) (>= $(SHVER))"
-override_dh_strip:
- dh_strip --dbgsym-migration='libgtkmm-2.4-dbg (<< 1:2.24.5-1~)'
-
# Don't compress doxygen tag files and demo Makefile*
override_dh_compress:
dh_compress -X.tag -X.cc -XMakefile
diff --git a/debian/upstream/metadata b/debian/upstream/metadata
new file mode 100644
index 00000000..28aaef04
--- /dev/null
+++ b/debian/upstream/metadata
@@ -0,0 +1,4 @@
+---
+Bug-Database: https://gitlab.gnome.org/GNOME/gtkmm/-/issues
+Bug-Submit: https://gitlab.gnome.org/GNOME/gtkmm/-/issues/new
+Repository-Browse: https://gitlab.gnome.org/GNOME/gtkmm
