Skip to content
Commits on Source (27)
Hide whitespace changes
Inline Side-by-side
.gitignore deleted 100755 → 0
View file @ 57813228
# A simulation of Subversion default ignores, generated by reposurgeon.
*.o
*.lo
*.la
*.al
.libs
*.so
*.so.[0-9]*
*.a
*.pyc
*.pyo
*.rej
*~
.#*
.*.swp
.DS_store
debian/changelog
View file @ 0da205f9
gnome-pkg-tools (0.22.2ubuntu1) impish; urgency=medium
* Merge from Debian. Remaining changes:
- Run dh_translations and dh_scour, to match behaviour of our cdbs
gnome.mk. Add dependencies for this.
debian/control*: update VCS informations to point to ubuntu salsa branch
-- Marco Trevisan (Treviño) <marco@ubuntu.com> Fri, 11 Jun 2021 04:07:10 +0200
gnome-pkg-tools (0.22.2) experimental; urgency=medium
* dh_gnome: Go back including the epoch in gnome:(Next)?Version.
In the previous changes we considered the epoch not as part of the
gnome version (as it's not), but given that some packages relied on that
being included, gome:(Next?)Version will include it again, while newly
exported gnome:Uptstream(Next?)Version variables will refer to the
upstream version only
* dh_gnome: Add back support for old gnome versions.
In case a package is compiled with newer pkg-tools-gnome and still uses
an old gnome version, we didn't properly handle the gnome:Version and
the gnome:NextVersion (for packages with version <= 3.36 only), so add
back compatibility for old versioning, as we may still keep some package
using the old versioning schema.
So if a package will use an old version schema (so it's major version is
minor than 40), then we'll just use the same logic as before.
The only exception is for 3.38.x versions as we'll always consider 40 to
be the next version, as unfortunately there's no way to predict if the
project changed schema or not.
-- Marco Trevisan (Treviño) <marco@ubuntu.com> Thu, 10 Jun 2021 18:40:23 +0200
gnome-pkg-tools (0.22.1) experimental; urgency=medium
* debian/control: Use versioned provides.
In order to depend on a versioned dh-sequence-gnome without having to
specify both this and an explicit versioned dependency on
gnome-pkg-tools we need to use a versioned provides.
* dh_gnome: Do not capture dots in major version group
* debian/changelog: Fix spelling error on previous release
-- Marco Trevisan (Treviño) <marco@ubuntu.com> Mon, 31 May 2021 13:18:51 +0200
gnome-pkg-tools (0.22.0) experimental; urgency=medium
[ Daniel Kahn Gillmor ]
* fix substvars typo in dh_gnome documentation
* Add myself to pkg-gnome.team, as i am cleaning up Balsa
* d/changelog: strip trailing whitespace
[ Marco Trevisan (Treviño) ]
* Bump version, to make it easier to depend on give it's required by
gnome-40 packages using version replacement.
* Add myself to pkg-gnome.team.
Happy to join the uploaders party!
* dh_gnome: Update gnome_versions to support new GNOME versioning schema.
We also support older versions for packages that may use a mixed
versioning schema
* debian/control: Use debhelper 13
* debian/control: Bump Standards-Version (no change required)
-- Marco Trevisan (Treviño) <marco@ubuntu.com> Sun, 30 May 2021 19:33:57 +0200
gnome-pkg-tools (0.21.2ubuntu1) hirsute; urgency=low
* Merge from Debian unstable. Remaining changes:
- Run dh_translations and dh_scour, to match behaviour of our cdbs
gnome.mk. Add dependencies for this.
-- Lukas Märdian <slyon@ubuntu.com> Wed, 17 Feb 2021 17:45:51 +0100
gnome-pkg-tools (0.21.2) unstable; urgency=medium
* Team upload
* Run dh_gnome before dh_icons instead of before dh_gconf.
The precise order is unimportant, as long as it runs in the install
phase but after dh_install, and avoiding an explicit reference
to dh_gconf means we don't block its removal. (Closes: #931883)
* Standards-Version: 4.4.0 (no changes required)
* Set Rules-Requires-Root to no
-- Simon McVittie <smcv@debian.org> Fri, 16 Aug 2019 10:22:10 +0100
gnome-pkg-tools (0.21.1ubuntu1) disco; urgency=medium
* Sync with Debian. Remaining changes:
......@@ -880,4 +962,3 @@ gnome-pkg-tools (0.1) unstable; urgency=low
-- Sebastien Bacher <seb128@debian.org> Wed, 8 Oct 2003 16:19:13 +0200
debian/control
View file @ 0da205f9
......@@ -8,10 +8,11 @@ Priority: optional
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>, Jeremy Bicha <jbicha@debian.org>
Build-Depends: debhelper-compat (= 12)
Standards-Version: 4.3.0
Vcs-Browser: https://code.launchpad.net/~ubuntu-desktop/ubuntu/+source/gnome-pkg-tools/+git/gnome-pkg-tools
Vcs-Git: https://git.launchpad.net/~ubuntu-desktop/ubuntu/+source/gnome-pkg-tools
Build-Depends: debhelper-compat (= 13)
Standards-Version: 4.5.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
XS-Debian-Vcs-Browser: https://salsa.debian.org/gnome-team/gnome-pkg-tools
XS-Debian-Vcs-Git: https://salsa.debian.org/gnome-team/gnome-pkg-tools.git
......@@ -25,7 +26,7 @@ Depends: ${misc:Depends}, ${perl:Depends},
python3-gi-cairo,
scour (>= 0.36-1~)
Recommends: git-buildpackage
Provides: dh-sequence-gnome
Provides: dh-sequence-gnome (= ${binary:Version})
Multi-Arch: foreign
Description: Tools for the Debian GNOME Packaging Team
This package contains some useful tools for the Debian GNOME Packaging Team
......
debian/control.in 100755 → 100644
View file @ 0da205f9
......@@ -4,10 +4,11 @@ Priority: optional
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)
Standards-Version: 4.3.0
Vcs-Browser: https://code.launchpad.net/~ubuntu-desktop/ubuntu/+source/gnome-pkg-tools/+git/gnome-pkg-tools
Vcs-Git: https://git.launchpad.net/~ubuntu-desktop/ubuntu/+source/gnome-pkg-tools
Build-Depends: debhelper-compat (= 13)
Standards-Version: 4.5.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
XS-Debian-Vcs-Browser: https://salsa.debian.org/gnome-team/gnome-pkg-tools
XS-Debian-Vcs-Git: https://salsa.debian.org/gnome-team/gnome-pkg-tools.git
......@@ -21,7 +22,7 @@ Depends: ${misc:Depends}, ${perl:Depends},
python3-gi-cairo,
scour (>= 0.36-1~)
Recommends: git-buildpackage
Provides: dh-sequence-gnome
Provides: dh-sequence-gnome (= ${binary:Version})
Multi-Arch: foreign
Description: Tools for the Debian GNOME Packaging Team
This package contains some useful tools for the Debian GNOME Packaging Team
......
dh/dh_gnome
View file @ 0da205f9
......@@ -34,7 +34,7 @@ provided by your packages' .la files.
=item B<--no-gnome-versions>
Use this flag if you do not want to generate GNOME subsvars for your packages.
Use this flag if you do not want to generate GNOME substvars for your packages.
=back
......@@ -72,26 +72,33 @@ sub clean_la_files {
sub gnome_versions {
# Generate ${gnome:Version} and ${gnome:NextVersion} substvars
# Generates ${gnome:Version}, ${gnome:NextVersion},
# ${gnome:UpstreamVersion} and ${gnome:NextUpstreamVersion} substvars
foreach my $package (@{$dh{DOPACKAGES}}) {
my $gnome_version;
my $gnome_next_version;
my $epoch;
isnative($package);
$dh{VERSION} =~ /^([0-9]+:)?([0-9]\.[0-9]+)\..*$/;
if ($1) {
$gnome_version = $1.$2;
} else {
$gnome_version = $2;
if ($dh{VERSION} =~ /^(\d+:)?(\d+)\.(\d+)\.[\d.]+.*$/) {
if ($2 < 40) {
$epoch = $1;
$gnome_version = "$2.$3";
$gnome_next_version = ($2 == 3 && $3 == 38 ? "" : "$2.") .
($3 + 2);
}
}
$gnome_version =~ /^([0-9]+:)?([0-9]\.)([0-9]+)$/;
if ($1) {
$gnome_next_version = $1.$2.($3+1);
} else {
$gnome_next_version = $2.($3+1);
if (!$gnome_version) {
$dh{VERSION} =~ /^(\d+:)?(\d+)(\.[\d.]+|~(alpha|beta|rc)[\d.]*).*$/;
$epoch = $1;
$gnome_version = $2;
$gnome_next_version = $gnome_version + 1;
}
$epoch = $epoch ? $epoch : "";
open FILE, ">>", "debian/$package.substvars" or die $!;
print FILE "gnome:Version=$gnome_version\n";
print FILE "gnome:NextVersion=$gnome_next_version\n";
print FILE "gnome:Version=$epoch$gnome_version\n";
print FILE "gnome:UpstreamVersion=$gnome_version\n";
print FILE "gnome:NextVersion=$epoch$gnome_next_version\n";
print FILE "gnome:NextUpstreamVersion=$gnome_next_version\n";
close FILE;
}
......
dh/dh_gnome.1
View file @ 0da205f9
......@@ -89,7 +89,7 @@ Use this flag if you do not want to automatically empty dependency_libs fields
provided by your packages' .la files.
.IP "\fB\-\-no\-gnome\-versions\fR" 4
.IX Item "--no-gnome-versions"
Use this flag if you do not want to generate \s-1GNOME\s0 subsvars for your packages.
Use this flag if you do not want to generate \s-1GNOME\s0 substvars for your packages.
.SH "SEE ALSO"
.IX Header "SEE ALSO"
\&\fIdebhelper\fR\|(7)
......
dh/gnome.pm
View file @ 0da205f9
......@@ -4,7 +4,7 @@ use warnings;
use strict;
use Debian::Debhelper::Dh_Lib;
insert_before("dh_gconf", "dh_gnome");
insert_before("dh_icons", "dh_gnome");
insert_before("dh_compress", "dh_translations");
insert_after("dh_link", "dh_scour");
insert_before("dh_clean", "dh_gnome_clean");
......
pkg-gnome.team
View file @ 0da205f9
Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>,
Alberto Garcia <berto@igalia.com>,
Dmitry Shachnev <mitya57@debian.org>,
Daniel Kahn Gillmor <dkg@fifthhorseman.net>,
Emilio Pozuelo Monfort <pochu@debian.org>,
Frederic Peters <fpeters@debian.org>,
Gustavo Noronha Silva <kov@debian.org>,
......@@ -12,6 +13,7 @@ Josselin Mouette <joss@debian.org>,
Julian Andres Klode <jak@debian.org>,
Kilian Krause <kilian@debian.org>,
Laurent Bigonville <bigon@debian.org>,
Marco Trevisan <marco@trevi.me>,
Martin Pitt <mpitt@debian.org>,
Matthias Klumpp <mak@debian.org>,
Michael Biebl <biebl@debian.org>,
......