Control: tags -1 moreinfo Hi Syed,
> I am looking for a sponsor for my package "flip": > > * Package name : flip > Version : 1.20-7 > Upstream contact : None > * Vcs : https://salsa.debian.org/debian/flip > > > Changes since the last upload: > > flip (1.20-7) unstable; urgency=medium > . > * QA upload. > * Upload to unstable. > * debian/rule: updated build CFLAGS to fix gcc-15 build error (Closes: > #1096643). > * debian/copyright: Update packaging copyright information. > * Added patch for getopt prototype fix gcc-15 build error. > > MR: https://salsa.debian.org/debian/flip/-/merge_requests/3 > You've seem to have found some unexpected mess ;-) It seems that you have based the update on the salsa repso, however the salsa content is not agreeing with the content in the archives. (looking at d/changelog 1.20-5 seems to be different.) As the archive is the canonical location, please base your changes on this version and go from there. Please try to see if anything needs to be cherry-picked from the "unreleased" 1.20-5 on salsa It's likely that the 1.20-6 does not really fit it anymore, but as it has been uploaded experimental it would be ok to "drop" that entry and merge the changes to your 1.20-7, but keeping attribution. In effort to repair the mess: I'll clean up the salsa repo to make sure it is in sync with the archives, to have a starting point. - the master has been deleted. (it could cause havoc to keep it.) - the new debian branch is following DEP14 ideas, named "debian/unstable". It points to the 1.20-5 as it has been uploaded to the archives. - a new branch debian/experimental will habe 1.20-6, including the diverged changes. I will now try to get the diverged changes into a 1.20-7 unreleased and then apply your changes, possibly uploading it later. Marking as moreinfo for now, stay tuned for updates. -- tobi
