Skip to content
Commits on Source (8)
Hide whitespace changes
Inline Side-by-side
debian/changelog
View file @ 71ce1689
gnome-pkg-tools (0.22.7ubuntu1) kinetic; urgency=medium
* Merge with Debian. Remaining changes:
- Run dh_translations and dh_scour. Add dependencies for this.
-- Jeremy Bicha <jbicha@ubuntu.com> Tue, 20 Sep 2022 10:54:30 -0400
gnome-pkg-tools (0.22.7) unstable; urgency=medium
* Team upload
* dh_gnome: Match version numbers that are plain integers.
gnome-desktop version 43 is versioned 43, not 43.0. Previously this
failed to match the regular expression, resulting in generating
gnome:UpstreamVersion = "~" and gnome:NextUpstreamVersion = "1~",
and an uninstallable package.
Similarly, accept versions like 43+dfsg1 or 43~git20220920 as being
based on major version 43.
As a safety-catch against this happening again, make the script exit
unsuccessfully if it is unable to find the major version. If necessary
for a particular package, this can be bypassed by using
dh_gnome --no-gnome-versions.
* Standards-Version: 4.6.1 (no changes required)
-- Simon McVittie <smcv@debian.org> Tue, 20 Sep 2022 09:53:05 +0100
gnome-pkg-tools (0.22.6ubuntu1) jammy; urgency=medium
* Merge with Debian. Remaining changes:
......
debian/control
View file @ 71ce1689
......@@ -9,7 +9,7 @@ Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
XSBC-Original-Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>
Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>, Gunnar Hjalmarsson <gunnarhj@debian.org>, Jeremy Bicha <jbicha@ubuntu.com>, Marco Trevisan (Treviño) <marco@ubuntu.com>
Build-Depends: debhelper-compat (= 13)
Standards-Version: 4.5.1
Standards-Version: 4.6.1
Rules-Requires-Root: no
Vcs-Git: https://salsa.debian.org/gnome-team/gnome-pkg-tools.git -b ubuntu/master
Vcs-Browser: https://salsa.debian.org/gnome-team/gnome-pkg-tools/tree/ubuntu/master
......
debian/control.in
View file @ 71ce1689
......@@ -5,7 +5,7 @@ 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 (= 13)
Standards-Version: 4.5.1
Standards-Version: 4.6.1
Rules-Requires-Root: no
Vcs-Git: https://salsa.debian.org/gnome-team/gnome-pkg-tools.git -b ubuntu/master
Vcs-Browser: https://salsa.debian.org/gnome-team/gnome-pkg-tools/tree/ubuntu/master
......
dh/dh_gnome
View file @ 71ce1689
......@@ -88,7 +88,8 @@ sub gnome_versions {
}
}
if (!$gnome_version) {
$dh{VERSION} =~ /^(\d+:)?(\d+)(\.[\d.]+|~(alpha|beta|rc)[\d.]*).*$/;
$dh{VERSION} =~ /^(\d+:)?(\d+)(\.[\d.]+|~(alpha|beta|rc)[\d.]*|[+~])?.*$/
or die "Unable to determine major version from $dh{VERSION}";
$epoch = $1;
$gnome_version = $2 . "~";
$gnome_next_version = $2 + 1 . "~";
......