search

djabberd / DJabberd

The main DJabberd source
89 stars 35 forks source link

Debian packaging updates #26

Closed ioanrogers closed 12 years ago

ioanrogers commented 12 years ago

Hi, I'm about to try getting djabberd into debian, so have updated the packaging.

I'm afraid it's a little messy commit-wise, but I don't know how to squash it all once other people's commits are intermixed :-(

I'm targetting sid, though it should be backportable to wheezy.

Main change highlights are in debian/changelog.

I'm mainly concerned about the debian/copyright file - I'm not sure how up-to-date or accurate the info is.

dominikschulz commented 12 years ago

The commits introduce a lot of changes that have already been merged (possibly from other source), e.g. the Digest::SHA1/SHA conversion. Couldn't you just squash (rebase) your commmits to get a cleaner commit history?

ioanrogers commented 12 years ago

I've rebased it into one commit, but I don't think I can remove the old entries without doing a new pull request. I'll delete this one and open a new one once we've finished discussing the changes, as there will certainly be more commits to be added.

abh commented 12 years ago

@ioanrogers Thanks for cleaning it up! If you force-push to your fork then it should update the pull request – at least I am pretty sure that's how it works at our internal github at work.

ioanrogers commented 12 years ago

I think that ship already sailed. When I first tried to push the rebased version to github they clashed, so I merged them. Now push --force just says everything up to date.

ioanrogers commented 12 years ago

I can't get rid of those old commits, so I will trash this request and resubmit from a clean fork.