diff -pruN 0.22.7/debian/changelog 0.22.7ubuntu1/debian/changelog --- 0.22.7/debian/changelog 2022-09-20 08:53:05.000000000 +0000 +++ 0.22.7ubuntu1/debian/changelog 2022-09-20 14:54:30.000000000 +0000 @@ -1,3 +1,10 @@ +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 Tue, 20 Sep 2022 10:54:30 -0400 + gnome-pkg-tools (0.22.7) unstable; urgency=medium * Team upload @@ -16,12 +23,28 @@ gnome-pkg-tools (0.22.7) unstable; urgen -- Simon McVittie Tue, 20 Sep 2022 09:53:05 +0100 +gnome-pkg-tools (0.22.6ubuntu1) jammy; urgency=medium + + * Merge with Debian. Remaining changes: + - Run dh_translations and dh_scour, to match behaviour of our cdbs + gnome.mk. Add dependencies for this. + + -- Jeremy Bicha Fri, 18 Mar 2022 20:13:15 -0400 + gnome-pkg-tools (0.22.6) unstable; urgency=medium * pkg-gnome.team: Update my email address -- Jeremy Bicha Fri, 18 Mar 2022 20:10:02 -0400 +gnome-pkg-tools (0.22.5ubuntu1) jammy; urgency=medium + + * Merge with Debian. Remaining changes: + - Run dh_translations and dh_scour, to match behaviour of our cdbs + gnome.mk. Add dependencies for this. + + -- Jeremy Bicha Tue, 08 Mar 2022 10:05:47 -0500 + gnome-pkg-tools (0.22.5) unstable; urgency=medium * dh_gnome: Add ~ to GNOME versions to handle GNOME 40 style pre-releases @@ -29,6 +52,26 @@ gnome-pkg-tools (0.22.5) unstable; urgen -- Jeremy Bicha Tue, 08 Mar 2022 09:57:59 -0500 +gnome-pkg-tools (0.22.4ubuntu2) jammy; urgency=medium + + * Revert "debian/control: Do not explicitly depend on python3-gi" + * debian/control: Include myself in the uploaders + + -- Marco Trevisan (Treviño) Tue, 22 Feb 2022 14:00:21 +0100 + +gnome-pkg-tools (0.22.4ubuntu1) jammy; urgency=medium + + * Merge with Debian. Remaining changes: + - Run dh_translations and dh_scour, to match behaviour of our cdbs + gnome.mk. Add dependencies for this. + * debian/control: Do not explicitly depend on python3-gi. + To (temporary) avoid having a circle dependency we need to remove the + explicit dependencies on python3-gi and friends as python-gobject + is also depending on gnome-pkg-tools, and without this change it won't + ever build in a new serie. + + -- Marco Trevisan (Treviño) Tue, 26 Oct 2021 23:38:56 +0200 + gnome-pkg-tools (0.22.4) unstable; urgency=medium * pkg-gnome.team: Update me to match my $DEBFULLNAME and $DEBEMAIL. @@ -43,6 +86,15 @@ gnome-pkg-tools (0.22.3) unstable; urgen -- Gunnar Hjalmarsson Wed, 18 Aug 2021 12:24:54 +0200 +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) 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. @@ -96,6 +148,14 @@ gnome-pkg-tools (0.22.0) experimental; u -- Marco Trevisan (Treviño) 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 Wed, 17 Feb 2021 17:45:51 +0100 + gnome-pkg-tools (0.21.2) unstable; urgency=medium * Team upload @@ -108,6 +168,14 @@ gnome-pkg-tools (0.21.2) unstable; urgen -- Simon McVittie Fri, 16 Aug 2019 10:22:10 +0100 +gnome-pkg-tools (0.21.1ubuntu1) disco; urgency=medium + + * Sync with Debian. Remaining changes: + - Run dh_translations and dh_scour, to match behaviour of our cdbs + gnome.mk. Add dependencies for this. + + -- Jeremy Bicha Wed, 16 Jan 2019 06:55:37 -0500 + gnome-pkg-tools (0.21.1) unstable; urgency=medium * Add Provides: dh-sequence-gnome @@ -116,6 +184,14 @@ gnome-pkg-tools (0.21.1) unstable; urgen -- Jeremy Bicha Tue, 15 Jan 2019 19:07:03 -0500 +gnome-pkg-tools (0.21.0ubuntu1) disco; urgency=medium + + * Sync with Debian. Remaining changes: + - Run dh_translations and dh_scour, to match behaviour of our cdbs + gnome.mk. Add dependencies for this. + + -- Jeremy Bicha Mon, 26 Nov 2018 12:37:16 -0500 + gnome-pkg-tools (0.21.0) unstable; urgency=medium * Drop unused rules files: @@ -136,6 +212,29 @@ gnome-pkg-tools (0.20.3) unstable; urgen -- Jeremy Bicha Mon, 15 Oct 2018 11:25:32 -0400 +gnome-pkg-tools (0.20.2ubuntu3) cosmic; urgency=medium + + * Drop pkg-gnome-compat-desktop-file: + - The Ubuntu Desktop Team no longer uses this script + * Update Vcs fields + + -- Jeremy Bicha Fri, 28 Sep 2018 20:01:08 -0400 + +gnome-pkg-tools (0.20.2ubuntu2) bionic; urgency=medium + + * Fix typo in previous upload + + -- Jeremy Bicha Sun, 18 Mar 2018 13:10:06 -0400 + +gnome-pkg-tools (0.20.2ubuntu1) bionic; urgency=medium + + * Sync with Debian. Remaining changes: + - Run dh_translations and dh_scour, to match behaviour of our cdbs + gnome.mk. Add dependencies for this. + - Add pkg-gnome-compat-desktop-file: script to provide copies of .desktop + + -- Jeremy Bicha Sun, 18 Mar 2018 12:50:45 -0400 + gnome-pkg-tools (0.20.2) unstable; urgency=medium [ Tim Lunn ] @@ -950,3 +1049,4 @@ gnome-pkg-tools (0.1) unstable; urgency= * Initial Release. -- Sebastien Bacher Wed, 8 Oct 2003 16:19:13 +0200 + diff -pruN 0.22.7/debian/control 0.22.7ubuntu1/debian/control --- 0.22.7/debian/control 2022-09-20 08:53:05.000000000 +0000 +++ 0.22.7ubuntu1/debian/control 2022-09-20 14:54:30.000000000 +0000 @@ -5,17 +5,26 @@ Source: gnome-pkg-tools Section: devel Priority: optional -Maintainer: Debian GNOME Maintainers -Uploaders: Gunnar Hjalmarsson , Jeremy Bicha , Marco Trevisan (Treviño) +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Debian GNOME Maintainers +Uploaders: Debian GNOME Maintainers , Gunnar Hjalmarsson , Jeremy Bicha , Marco Trevisan (Treviño) Build-Depends: debhelper-compat (= 13) Standards-Version: 4.6.1 Rules-Requires-Root: no -Vcs-Browser: https://salsa.debian.org/gnome-team/gnome-pkg-tools -Vcs-Git: https://salsa.debian.org/gnome-team/gnome-pkg-tools.git +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 Package: gnome-pkg-tools Architecture: all Depends: ${misc:Depends}, ${perl:Depends}, + dh-translations, + gir1.2-rsvg-2.0, + gir1.2-glib-2.0, + python3, + python3-gi-cairo, + scour (>= 0.36-1~) Recommends: git-buildpackage Provides: dh-sequence-gnome (= ${binary:Version}) Multi-Arch: foreign diff -pruN 0.22.7/debian/control.in 0.22.7ubuntu1/debian/control.in --- 0.22.7/debian/control.in 2022-09-20 08:53:05.000000000 +0000 +++ 0.22.7ubuntu1/debian/control.in 2022-09-20 14:54:30.000000000 +0000 @@ -1,17 +1,26 @@ Source: gnome-pkg-tools Section: devel Priority: optional -Maintainer: Debian GNOME Maintainers +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Debian GNOME Maintainers Uploaders: @GNOME_TEAM@ Build-Depends: debhelper-compat (= 13) Standards-Version: 4.6.1 Rules-Requires-Root: no -Vcs-Browser: https://salsa.debian.org/gnome-team/gnome-pkg-tools -Vcs-Git: https://salsa.debian.org/gnome-team/gnome-pkg-tools.git +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 Package: gnome-pkg-tools Architecture: all Depends: ${misc:Depends}, ${perl:Depends}, + dh-translations, + gir1.2-rsvg-2.0, + gir1.2-glib-2.0, + python3, + python3-gi-cairo, + scour (>= 0.36-1~) Recommends: git-buildpackage Provides: dh-sequence-gnome (= ${binary:Version}) Multi-Arch: foreign diff -pruN 0.22.7/debian/gbp.conf 0.22.7ubuntu1/debian/gbp.conf --- 0.22.7/debian/gbp.conf 2022-09-20 08:53:05.000000000 +0000 +++ 0.22.7ubuntu1/debian/gbp.conf 2022-09-20 14:54:30.000000000 +0000 @@ -1,3 +1,4 @@ [DEFAULT] pristine-tar = True -debian-branch = debian/master +debian-branch = ubuntu/master +debian-tag = ubuntu/%(version)s diff -pruN 0.22.7/dh/gnome.pm 0.22.7ubuntu1/dh/gnome.pm --- 0.22.7/dh/gnome.pm 2022-09-20 08:53:05.000000000 +0000 +++ 0.22.7ubuntu1/dh/gnome.pm 2022-09-20 14:54:30.000000000 +0000 @@ -5,6 +5,8 @@ use strict; use Debian::Debhelper::Dh_Lib; 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"); 1; diff -pruN 0.22.7/.gitignore 0.22.7ubuntu1/.gitignore --- 0.22.7/.gitignore 2022-09-20 08:53:05.000000000 +0000 +++ 0.22.7ubuntu1/.gitignore 1970-01-01 00:00:00.000000000 +0000 @@ -1,16 +0,0 @@ -# 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