On Thu, Dec 07, 2017 at 08:29:25AM -0600, Simon Quigley wrote: > On December 7, 2017 7:40:15 AM CST, "Sébastien Villemot" <sebastien@debian.org> wrote: > >Thanks for sharing. That hack would actually open the door to a 3rd > >transition > >scheme: > >- keeping only the gcompris-qt source package (src:gcompris can be > >immediately > > removed) > >- keeping gcompris-qt as the main binary package > >- having gcompris as a transitional package, generated by > >src:gcompris-qt, and > > would be the only binary package with an epoch number > > > >That scheme looks like a good compromise to me. > > Agreed, I'm +1 on this. Feel free to make the changes in Git, otherwise I can do it this afternoon US time. I don’t have write permission on the repository, so I am attaching a patch to this message (and also an unrelated patch that fixes a small issue). Best, -- ⢀⣴⠾⠻⢶⣦⠀ Sébastien Villemot ⣾⠁⢠⠒⠀⣿⡁ Debian Developer ⢿⡄⠘⠷⠚⠋⠀ http://sebastien.villemot.name ⠈⠳⣄⠀⠀⠀⠀ http://www.debian.org
From 7d0e3fed306462dd7eddb029b2a0c32b235414b5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Villemot?= <sebastien@debian.org> Date: Thu, 7 Dec 2017 16:41:17 +0100 Subject: [PATCH 1/2] Fix versioned Recommends of gcompris-qt-data on gcompris-qt. --- debian/changelog | 3 +++ debian/control | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index f19248f..1b0e477 100644 --- a/debian/changelog +++ b/debian/changelog @@ -10,6 +10,9 @@ gcompris-qt (0.81-1) UNRELEASED; urgency=medium * Migrate to using dbgsym packages instead of explicitly defining a - dbg package in debian/control. + [ Sébastien Villemot ] + * Fix versioned Recommends of gcompris-qt-data on gcompris-qt. + -- Simon Quigley <tsimonq2@ubuntu.com> Sat, 25 Nov 2017 16:26:17 -0600 gcompris-qt (0.81-0ubuntu1) artful; urgency=medium diff --git a/debian/control b/debian/control index e994cfa..d922977 100644 --- a/debian/control +++ b/debian/control @@ -39,7 +39,7 @@ Description: Educational games for small children - Qt rewrite Package: gcompris-qt-data Architecture: all Depends: ${misc:Depends} -Recommends: gcompris-qt (= ${source:Version}) +Recommends: gcompris-qt (= ${binary:Version}) Description: data files for gcompris-qt GCompris is a collection of educational games for small children. . -- 2.11.0
From d21100d0229284d33eddef2781fd9f07f45c6f99 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Villemot?= <sebastien@debian.org> Date: Thu, 7 Dec 2017 16:57:16 +0100 Subject: [PATCH 2/2] Add a transitional "gcompris" package (with an epoch in its version number) to facilitate the transition from older versions to the Qt rewrite. (Closes: #875912) --- debian/changelog | 3 +++ debian/control | 13 +++++++++++++ debian/rules | 6 ++++++ 3 files changed, 22 insertions(+) diff --git a/debian/changelog b/debian/changelog index 1b0e477..248e43d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -12,6 +12,9 @@ gcompris-qt (0.81-1) UNRELEASED; urgency=medium [ Sébastien Villemot ] * Fix versioned Recommends of gcompris-qt-data on gcompris-qt. + * Add a transitional "gcompris" package (with an epoch in its version + number) to facilitate the transition from older versions to the Qt + rewrite. (Closes: #875912) -- Simon Quigley <tsimonq2@ubuntu.com> Sat, 25 Nov 2017 16:26:17 -0600 diff --git a/debian/control b/debian/control index d922977..99bafad 100644 --- a/debian/control +++ b/debian/control @@ -45,3 +45,16 @@ Description: data files for gcompris-qt . This package contains the definitions of these standard boards, along with associated images. + +Package: gcompris +Architecture: all +Section: oldlibs +Depends: gcompris-qt, + ${misc:Depends} +Description: Educational games for small children - transitional package + A large collection of educational games for small children, designed + to be a unified interface to integrate more educational games. + . + This is a transitional package that depends on the new series of GCompris + releases (rewritten using Qt). It can be safely removed once gcompris-qt is + installed. diff --git a/debian/rules b/debian/rules index 77de005..4b3cd93 100755 --- a/debian/rules +++ b/debian/rules @@ -25,6 +25,12 @@ override_dh_installdocs: override_dh_strip: dh_strip --dbgsym-migration='gcompris-qt-dbg (<< 0.81-1~)' +# Use an epoch for the transitional gcompris package, because of the break in +# numbering scheme introduced by the Qt rewrite +override_dh_gencontrol: + dh_gencontrol -pgcompris -- -v1:$$(dpkg-parsechangelog -SVersion) + dh_gencontrol --remaining-packages + override_dh_auto_clean: dh_auto_clean find src -name '*.qrc' -delete -- 2.11.0
Attachment:
signature.asc
Description: PGP signature