Background: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1011666

Can someone advise me as to the correct procedure for merging upstream
release candidate archives into https://salsa.debian.org/debian/groff ?

I am not a proficient gbp user, but I think I have done what is
necessary.

...except that I don't think I did the upstream merge/tagging right.

I suspect this because if I do a "git rebase -i origin", git goes crazy
and tells me I have merge conflicts. None of the release candidates
were already staged even as reference points, so I had to wade into the
gbp documentation myself, and I probably screwed it up.

*** I have not PUSHED anything. ***

Some relevant shell history is at the end of this message.[1]

But after the point where I merged the upstream tarballs, things are
clean and I can rebase at will.

The upstream diffs are too gigantic to enclose (4,500+ commits since
groff 1.22.4), and not very interesting as they can be seen at groff's
own Git repo.

I'm attaching a git diff -p of my changes after that, meaning the actual packaging work.

For the benefit of people reading this message, here are the commit
messages themselves (git log -r HEAD~21..HEAD).

commit 3cff7c6967e89d187efb160ce7d2a09af5ea82aa (HEAD -> master)
Author: G. Branden Robinson <g.branden.robinson@gmail.com>
Date: Sat Feb 25 22:53:06 2023 -0600

debian/changelog: Add upstream bug closers.

commit 1fd80f4151713e9f1d3cb52a4b749fa643776908
Author: G. Branden Robinson <g.branden.robinson@gmail.com>
Date: Sat Feb 25 22:29:27 2023 -0600

debian/groff{,-base}.install: Add new files

...provided upstream (en.tmac, hyphen.it, it.tmac, groff_font.5,
groff_out.5, groff_tmac.5, groff_man_style.7, groff_rfc1345.7,
FontMap-X11, ptx.tmac, rfc1345.tmac, sanitize.tmac, sboxes.tmac; see
upstream NEWS).

commit 56bf101afd21b9516775f58511e51d85dde06ef1
Author: G. Branden Robinson <g.branden.robinson@gmail.com>
Date: Sat Feb 25 22:09:23 2023 -0600

debian/groff{,-base}.install: Drop files

...that are no longer produced upstream (see upstream NEWS).

commit 9e99a662a4512e1f6656da2b9408f0f411abd311
Author: G. Branden Robinson <g.branden.robinson@gmail.com>
Date: Sat Feb 25 21:53:50 2023 -0600

debian/rules (confflags): Migrate option name.

...to "--with-appdefdir" from "--with-appresdir" per upstream NEWS.

commit 21ca0ea6c2162a95faf850b7f9c208b4d6d05374
Author: G. Branden Robinson <g.branden.robinson@gmail.com>
Date: Sat Feb 25 21:47:03 2023 -0600

Drop {meintro,meref,pic}.txt.

commit 58720f040d16da8bc868eca5466c91ee1a343889
Author: G. Branden Robinson <g.branden.robinson@gmail.com>
Date: Sat Feb 25 21:17:45 2023 -0600

debian/patches/clamp-negative-tab-stop*: Drop

Applied upstream in commit 6692653f7cae4116d4e70318f71b3d0808f2261f,
2021-09-11.

commit 01d76131b10c44f05ba7378a6193a5ce74f10fb9
Author: G. Branden Robinson <g.branden.robinson@gmail.com>
Date: Sat Feb 25 21:14:29 2023 -0600

debian/patches/destructor-segv.patch: Drop

Applied upstream in commit c788cf8c6bbe939fa11f7ec032e525a7e33f41b6,
2020-09-29.

commit 0323958c2ea85b86d24e07907e5718584fe5e746
Author: G. Branden Robinson <g.branden.robinson@gmail.com>
Date: Sat Feb 25 21:11:54 2023 -0600

debian/patches/document-sgr.patch: Resync

...with upstream.

commit 34942d9ebdb365be2765d1cf05850f7a8a6b78ad
Author: G. Branden Robinson <g.branden.robinson@gmail.com>
Date: Sat Feb 25 21:07:36 2023 -0600

debian/patches/bsd-updates.patch: Drop

Applied upstream in commit 5a8af7104f1c581bcfbad12b56033ad403b0afe1,
2019-12-21.

commit 915e5df22c31ce935de36322f1fa4db933c923e5
Author: G. Branden Robinson <g.branden.robinson@gmail.com>
Date: Sat Feb 25 21:04:51 2023 -0600

debian/patches/mdoc-Lk-arguments.patch: Drop

Applied upstream in commit 76e4db6e839904d2e2a28b29b483678214598f3b,
2019-01-12.

commit 34fe473ff1c2853d823d5acd3362aeef3e634c7b
Author: G. Branden Robinson <g.branden.robinson@gmail.com>
Date: Sat Feb 25 21:00:23 2023 -0600

debian/patches/avoid-perl-diamond.patch: Drop

Applied upstream in commit 27472b5ae548d3dbe933713d488d676708996253,
2019-01-24.

commit 4266e24f1d65d5e7c06ac3c2ae2a202c3d0629ce
Author: G. Branden Robinson <g.branden.robinson@gmail.com>
Date: Sat Feb 25 20:57:25 2023 -0600

debian/patches/sort-perl-hash-keys.patch: Drop

Applied upstream in commit fcf3dc68839d83bfba206d1febffd9514a71ee82,
2015-11-06.

commit cb1cbb55e73e877c73a45d070eed89179699f316
Author: G. Branden Robinson <g.branden.robinson@gmail.com>
Date: Sat Feb 25 20:52:43 2023 -0600

debian/patches/series: Drop display-utc-times.*

commit 2ec0236804bf60e18282526d343068e9c26d6df2
Author: G. Branden Robinson <g.branden.robinson@gmail.com>
Date: Sat Feb 25 20:49:14 2023 -0600

debian/patches/mmse-note.patch: Resync w/ upstream

commit e8e7c6ce1e8267bbf6c65ce5910140ccc5a8993a
Author: G. Branden Robinson <g.branden.robinson@gmail.com>
Date: Sat Feb 25 20:45:39 2023 -0600

debian/patches/load-desc-failure.patch: Resync

...with upstream.

commit b7dc5d92ac984184ab30aef76e5d21752a044fe9
Author: G. Branden Robinson <g.branden.robinson@gmail.com>
Date: Sat Feb 25 20:40:55 2023 -0600

debian/patches/papersize-config.patch: Resync

...with upstream.

commit bb6d8e31ae4f60afd1ede232618dbff17e64ac87
Author: G. Branden Robinson <g.branden.robinson@gmail.com>
Date: Sat Feb 25 20:35:20 2023 -0600

debian/patches/extratmacdirs.patch: Resync

...with upstream.

commit c2714677d1d1bbb46a311bfa41676cfa48b3e210
Author: G. Branden Robinson <g.branden.robinson@gmail.com>
Date: Sat Feb 25 20:33:00 2023 -0600

debian/patches/doc-gzipped.patch: Resync

...with upstream.

commit 43d0f4ebe864f61cb296e4f9c7450b6bd98405b5
Author: G. Branden Robinson <g.branden.robinson@gmail.com>
Date: Sat Feb 25 20:25:21 2023 -0600

debian/patches/doc-gfdl.patch: Resync w/ upstream

ditroff(7) is no more.

commit 54f193419e1a967093b4b034a1cab645e0301b00
Author: G. Branden Robinson <g.branden.robinson@gmail.com>
Date: Sat Feb 25 20:17:10 2023 -0600

debian/patches/nroff-ifs.patch: Resync w/ upstream

commit c0addd1c828607c0e99cbc50fb150c25005d803e
Author: G. Branden Robinson <g.branden.robinson@gmail.com>
Date: Sat Feb 25 20:05:40 2023 -0600

Update build dependencies

Add m4; drop bison, texinfo (closes: #1011666).

How do I move forward with this? I am anxious about the closing of the
soft freeze window.

Regards,
Branden

[1] Here are my clumsy attempts to get those release candidate archives
in. (I expanded some git aliases that I have set up.)

587 git branch upstream
592 git commit -v debian/watch
598 gbp import-orig --upstream-branch=upstream https://alpha.gnu.org/gnu/groff/groff-1.23.0.rc1.tar.gz
599 gbp import-orig --upstream-branch=upstream https://alpha.gnu.org/gnu/groff/groff-1.23.0.rc2.tar.gz
600 gbp import-orig --upstream-branch=upstream https://alpha.gnu.org/gnu/groff/groff-1.23.0.rc3.tar.gz
604 cd debian/
617 vi changelog
618 git add -p
619 git commit -v
635 git tag debian/1.23.0_rc3-1
643 git tag upstream/1.23.0_rc1 bc599bf23fcb428295d769c7944bdfd97d8a203d
644 git tag upstream/1.23.0_rc2 ff6560eb9b39d2c45a0f8a0c1cc12527edaf270d
645 git tag upstream/1.23.0_rc3 ff12aaae2c82beece4d9ff6bb90f019ab142ed06
647 git tag -d upstream/1.23.0.rc1
648 git tag -d upstream/1.23.0.rc2
649 git tag -d upstream/1.23.0.rc3

At that point I was able to get "gbp buildpackage" to run, and it was
just a matter of doing ordinary packaging work, as illustrated in the
commit messages above.

Advice is appreciated!

-----BEGIN PGP SIGNATURE-----

iQIzBAABCAAdFiEEh3PWHWjjDgcrENwa0Z6cfXEmbc4FAmP69tIACgkQ0Z6cfXEm bc5L1Q//bsUQmagctudEZdnyZPx+vYUfRzmBMvveHtguW+8kcc6YbJaEks81jdTA KVm3dXcnxqhNpf5tv/M90gTLSbDBkCYq8fipZUuKL25pjiMPbbTMNi/RtxYfAW+p Kky8IuE5nOzWH9v6Sg/YPBckX6qBJJgIUKT1t3pnxijrYa3Xroy5WmZk7PcqkEl3 +iyJ3xcTijrV+rBsmacfpGteiOUVXoimTMTJSiwH9jT9G74zTIPTpNz+Z5IfuRTn dDjq+5mpOBtY89Xv7p4TzcGKFend4oHX4jGb5buOxo6VLdmCQ4Ixuke8NMNL86ei Wd8c8+xHYtA1pHkHaiNg5sNfdSAOQBRpCS3ZdayJsaZdr/HvVtBmvyydWLPHVDQw Qgb34mKWuIsN1noKUQ5MsMKvcT8yrC1pr/QwLhefpKNtyLDGxjSyCK/cBrRebSeE +HtK6zVKx4Ozd2CcLyAq9RLzxFpRQLR5HAXIUYGOhJFTs9IR0LUPsHj4LGVHh3hI 6yoXS6Um3ecNiSTbL9H32G0uwxVncTDyE7bHqrOmdajPprWXib+4yHXNZbhaLUzT 0nh8r6eb5mjwniRsRJZ+3kY2p8aIImvWctms5im4pc6tj3FhqZys3cQdm/Sree5m 6tn7lzNePj5taOOhjCw0Q5rjjrUE39HNpHoFLFkAadYLM/1zhas=
=8Tqj
-----END PGP SIGNATURE-----

--- SoupGate-Win32 v1.05
* Origin: fsxNet Usenet Gateway (21:1/5)

On Sun, Feb 26, 2023 at 12:06:18AM -0600, G. Branden Robinson wrote:

Background: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1011666

Can someone advise me as to the correct procedure for merging upstream release candidate archives into https://salsa.debian.org/debian/groff ?

Just import them? Do you have any specific questions or problems with
this?

...except that I don't think I did the upstream merge/tagging right.

You shouldn't do merging or taging manually, gbp import-orig does that for
you.

I suspect this because if I do a "git rebase -i origin", git goes crazy
and tells me I have merge conflicts.

Why are you running this command and what do expect to get after running
it? And if it's in a pushed branch then you shouldn't ever do that.

None of the release candidates were already staged even as reference
points, so I had to wade into the gbp documentation myself, and I
probably screwed it up.

Not sure what do you mean by this but importing upstream tarballs is a
very basic gbp action that's hard to screw assuming the repo was already n
a good shape. And it doesn't matter that tarballs are "release candidates" unless that implies something else.

[1] Here are my clumsy attempts to get those release candidate archives
in. (I expanded some git aliases that I have set up.)

587 git branch upstream

But the repo already has the upstream branch.

592 git commit -v debian/watch

The upstream branch doesn't have a debian/watch file. Have you confused
master and upstream by running the previous command? Or are some commands missing?

598 gbp import-orig --upstream-branch=upstream https://alpha.gnu.org/gnu/groff/groff-1.23.0.rc1.tar.gz
599 gbp import-orig --upstream-branch=upstream https://alpha.gnu.org/gnu/groff/groff-1.23.0.rc2.tar.gz
600 gbp import-orig --upstream-branch=upstream https://alpha.gnu.org/gnu/groff/groff-1.23.0.rc3.tar.gz

(--upstream-branch=upstream should be the default)

643 git tag upstream/1.23.0_rc1 bc599bf23fcb428295d769c7944bdfd97d8a203d
644 git tag upstream/1.23.0_rc2 ff6560eb9b39d2c45a0f8a0c1cc12527edaf270d
645 git tag upstream/1.23.0_rc3 ff12aaae2c82beece4d9ff6bb90f019ab142ed06
647 git tag -d upstream/1.23.0.rc1
648 git tag -d upstream/1.23.0.rc2
649 git tag -d upstream/1.23.0.rc3

None of this should be needed if you tell import-orig that the versions
are 1.23.0~rcN instead of the default 1.23.0.rc1.

At that point I was able to get "gbp buildpackage" to run, and it was
just a matter of doing ordinary packaging work, as illustrated in the
commit messages above.

Advice is appreciated!

Again, which advice? You said that it works for you.

--- SoupGate-Win32 v1.05
* Origin: fsxNet Usenet Gateway (21:1/5)

At 2023-02-26T11:52:39+0100, Andrey Rakhmatullin wrote:

Just import them? Do you have any specific questions or problems with
this?

[...]

Again, which advice? You said that it works for you.

Hi Andrey,

I think at least some of my confusion arose from trying to use gbp with
a git-dpm-based repository. I was working in a big hurry, trying to
make the Bullseye release but that is now looking hopeless.

Thanks for responding so swiftly to my plea for help.

Regards,
Branden

-----BEGIN PGP SIGNATURE-----

iQIzBAABCAAdFiEEh3PWHWjjDgcrENwa0Z6cfXEmbc4FAmP8qOwACgkQ0Z6cfXEm bc60Iw//WZylAJCf0qBM5xA+D8rEV/idLT/TZmvVwQ/BM9LDdJ7wHrUxUN4n1zVr lUPaQk9qB0+r09cJEL4huQWy/xW0B8usY9hN/2GU12mlwZb6HZSsm1Peh2K3M23c 3yQaGmxW0uIy+ptd32ba/feADgsPon/Z2h4nb2MCryraFONaGFjYYBHHHGIJRQBz ZoKcJK1r8xEmL364r9L1rVdLEDxUxbWUPdFIZcHgM8lTiBysHsIykiqlMLw74OO1 RcC3zmRr3fXeSaEqZI1E9WoVSjQHgTATC8RnO8DvcVkanqb25rZgS4d48D5W1K8g nHVjSPAAVpuCnP+BI/VchkEVJtqc+yiXEu/RrDXL2WCb/LsQuO7ZI5rzr9xjK34h wlxcee2aAMQ44xNmk6ng3xMSxmXfEichHxUVjcpTdAW5lSBkvbXDELePOXg0AzxE 2dyyXXjd3tawFIWonUSDWOaJYY6E17R17leWWelVe7gSZtc+oHILoiNwxvDCdy6/ FqBDx4YFs0MbMx5snnTICqvGXx7nDMuKJ4R6FqMOToxcBucpieKSDLMYOnr8XHTQ lPey9p5Fspf/cSJtiQjH0p6zgYqrQJ8eB7vuYuR65C2NaMYlpXVcT7sfyIoAavOd wmvcmxA90iRn4kLDm32ZLOfcsWGAiZMY4If7sXBeMg7S6wRDb88=
=sETZ
-----END PGP SIGNATURE-----

--- SoupGate-Win32 v1.05
* Origin: fsxNet Usenet Gateway (21:1/5)