Hi Sébastien, Étienne Mollier, on 2021-06-04: > Sébastien Jodogne, on 2021-06-04: > > In practice, should I first sync my git repository with the tag > > "orthanc-1.9.2+dfsg-1", do the modifications and upload to unstable, > > then merge back my modifications in the mainline of the git repository, > > and finally upload "orthanc-1.9.3+dfsg-2" to experimental? > > As I understand things, again in the context of a revert from to > 1.9.2+dfsg-1 to 1.9.1+dfsg-1, I would probably checkout the > 1.9.1+dfsg-1 to get to the state of the package as it was, both > regarding the upstream and debian branches, then append in > d/changelog the unmodified content of the 1.9.2+dfsg-1 upload > and the entry for 1.9.2+really1.9.1+dfsg-1, which should only > indicate the revert of the package to the state it was in in > version 1.9.1+dfsg-1, and tag debian/1.9.2+really1.9.1+dfsg-1. > > The resulting debdiff between orthanc_1.9.1+dfsg-1.dsc and > orthanc_1.9.2+really1.9.1+dfsg-1.dsc should, ideally, only show > the added entries in the changelog. > > Note I may not have the best git skills in the world, it just > sounds like the simplest approach to me. I implemented the idea I had in mind in the attached debdiff against the source code of the orthanc version in testing. Note that I adjusted a filter on the package version, in order to get the right upstream version out of the package version in case a +really field is applied, otherwise the package would fail to build from source due to attempts to move around libraries with an 1.9.2 soversion, instead of 1.9.1. In doubt I also ran a binary debdiff, to make sure there were no other surprises, at least in terms of file naming. The binary debdiff in attachment shows no difference other than the bump to the +really version. Please have a look and let me know if you are fine with the changes. I'm happy to push the bullseye branch I forked from orthanc debian/1.9.1+dfsg-1 in Salsa if you are okay with it; or you can just cherry pick the debdiff and make the adjustments I might have missed if you prefer. Just a VCS note if you go the bullseye branch route: it won't need to be merged back to your main trunk, but will remain dedicated to the bullseye release life cycle. Have a nice day, :) -- Étienne Mollier <etienne.mollier@mailoo.org> Fingerprint: 8f91 b227 c7d6 f2b1 948c 8236 793c f67e 8f0d 11da Sent from /dev/pts/2, please excuse my verbosity.
diff -Nru orthanc-1.9.1+dfsg/debian/changelog orthanc-1.9.2+really1.9.1+dfsg/debian/changelog --- orthanc-1.9.1+dfsg/debian/changelog 2021-02-25 20:15:55.000000000 +0100 +++ orthanc-1.9.2+really1.9.1+dfsg/debian/changelog 2021-06-04 22:03:18.000000000 +0200 @@ -1,3 +1,18 @@ +orthanc (1.9.2+really1.9.1+dfsg-1) unstable; urgency=medium + + * Team upload. + * Revert orthanc to package version 1.9.1+dfsg-1 since 1.9.2+dfsg-1 was + actually not intended for bullseye + * d/rules: adjust UPSTREAM_VERSION filter to handle +really versions properly + + -- Étienne Mollier <etienne.mollier@mailoo.org> Fri, 04 Jun 2021 22:03:18 +0200 + +orthanc (1.9.2+dfsg-1) unstable; urgency=medium + + * New upstream version + + -- Sebastien Jodogne <s.jodogne@gmail.com> Thu, 22 Apr 2021 15:39:54 +0200 + orthanc (1.9.1+dfsg-1) unstable; urgency=medium * New upstream version diff -Nru orthanc-1.9.1+dfsg/debian/rules orthanc-1.9.2+really1.9.1+dfsg/debian/rules --- orthanc-1.9.1+dfsg/debian/rules 2021-02-25 20:15:55.000000000 +0100 +++ orthanc-1.9.2+really1.9.1+dfsg/debian/rules 2021-06-04 22:03:18.000000000 +0200 @@ -6,7 +6,10 @@ export DOC_DIR := $(DESTDIR)/usr/share/doc/orthanc export FRAMEWORK_VERSION := 1 -export UPSTREAM_VERSION := $(shell echo "$(DEB_VERSION)" | cut -d '+' -f 1) +export UPSTREAM_VERSION := $(shell \ + echo "$(DEB_VERSION)" \ + | sed 's/\(.*+really\)\?\([^+]\+\)\(+dfsg\)\?-.*/\2/' \ +) export BUILDARCH := $(shell dpkg-architecture -qDEB_BUILD_ARCH) export DEB_BUILD_MAINT_OPTIONS = hardening=+all
File lists identical (after any substitutions)
Control files of package liborthancframework-dev: lines which differ (wdiff format)
-----------------------------------------------------------------------------------
Depends: liborthancframework1 (= [-1.9.1+dfsg-1),-] {+1.9.2+really1.9.1+dfsg-1),+} libboost-all-dev, libcivetweb-dev, libdcmtk-dev, libjsoncpp-dev, liblua5.3-dev, libpugixml-dev, libsqlite3-dev
Version: [-1.9.1+dfsg-1-] {+1.9.2+really1.9.1+dfsg-1+}
Control files of package liborthancframework1: lines which differ (wdiff format)
--------------------------------------------------------------------------------
Version: [-1.9.1+dfsg-1-] {+1.9.2+really1.9.1+dfsg-1+}
Control files of package liborthancframework1-dbgsym: lines which differ (wdiff format)
---------------------------------------------------------------------------------------
Depends: liborthancframework1 (= [-1.9.1+dfsg-1)-] {+1.9.2+really1.9.1+dfsg-1)+}
Version: [-1.9.1+dfsg-1-] {+1.9.2+really1.9.1+dfsg-1+}
Control files of package orthanc: lines which differ (wdiff format)
-------------------------------------------------------------------
Version: [-1.9.1+dfsg-1-] {+1.9.2+really1.9.1+dfsg-1+}
Control files of package orthanc-dbgsym: lines which differ (wdiff format)
--------------------------------------------------------------------------
Depends: orthanc (= [-1.9.1+dfsg-1)-] {+1.9.2+really1.9.1+dfsg-1)+}
Version: [-1.9.1+dfsg-1-] {+1.9.2+really1.9.1+dfsg-1+}
Control files of package orthanc-dev: lines which differ (wdiff format)
-----------------------------------------------------------------------
Version: [-1.9.1+dfsg-1-] {+1.9.2+really1.9.1+dfsg-1+}
Control files of package orthanc-doc: lines which differ (wdiff format)
-----------------------------------------------------------------------
Version: [-1.9.1+dfsg-1-] {+1.9.2+really1.9.1+dfsg-1+}
Attachment:
signature.asc
Description: PGP signature