Need someone to check my code

[Hefee]

Hey,

great, now you can merge upstream/010.0 into master.

and a new changelog entry with the new version
pkgkde-dch -v 0.10.0-1
and commit this change.

pkgkde-dch is a alias described in:
https://qt-kde-team.pages.debian.net/changelogstandard.html

also make sure you set /etc/devscripts.conf or ~/.devscripts.

Now you can do whatever you need to do in the debian directory to get this 
compile and update to new defaults. Keep in mind to split your commits to 
something self containing (roughly one line in debian/changelog). The team 
policy is always to update changelog in the same commit.

My workflow is like that for each commit:
prepare the commit in stage (git add ...)
run dch # enter my change in changelog
git add debian/changelog
debcommit # that will take the new changelog entry as git commit message

Regards,

hefee

--
On Mittwoch, 12. März 2025 08:50:28 Mitteleuropäische Normalzeit Bob Wong 
wrote:
> Hefee <hefee at debian.org> 于2025年3月12日周三 02:02写道：
> 
> > Hey,
> > 
> > you have two commits on upstream branch - why?
> > -  the files you delete in 43f0a95c4cd0d2d8ca73e102c0bbfe4c8cf585a6 are
> > they shipped in upstream tar ball or not?
> > If yes - you are not allowed to delete a file in upstream branch - Please
> > remove this commit.
> > If not - it is fine - but I would squash the two commits ( but this is
> > purly personal decision) - for me it is normal to have one commit that
> > adds/delete files from a new version.
> > The important part here is: the upstream branch must 100% the same like
> > the
> > content of the tarball, otherwiese everything will fail.
> 
> Sorry, this is a mistake. Personally speaking, I'd also like to squash
> them into a single one. But when I first implement upstream source, I
> forgot to delete files that are no longer needed in version 0.10.0. So
> I use git rebase and squash the second commit to first one. Now
> they're all included in a single commit.
> 
> > on master branch you first should import the version that were not reflect
> > in git with:
> > dget
> > https://deb.debian.org/debian/pool/main/k/kup-backup/kup-backup_0.9.1-2.d
> > sc gbp import-dsc PATHTO/DSC
> > 
> > to make sure, that master represents the changes of 0.9.1-2.
> 
> Done.
> 
> What should I do next? Thanks for pointing it out to me.
> 
> Regards,
> 
> Bob

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 833 bytes
Desc: This is a digitally signed message part.
URL: <http://alioth-lists.debian.net/pipermail/pkg-kde-talk/attachments/20250312/195958f1/attachment.sig>