On 2014-11-25, Vagrant Cascadian wrote: > On 2014-11-25, Peter Howard wrote: >> we should start using a git repo for the debian-specific work. >> Vagrant - can you set up a git repo for ZM and clone from ZM upstream? >> We can then bring over the debian directory, apply the recent NMU >> patches, and make that the basis for further work. > > Yeah, I can migrate it over to git, and at least preserve some of the > history. I've actually been using git-remote-hg lately, but the > histories of the repositories are different... but I can probably get > them both into one repository, even if I have to use a hammer.
Ok, hammered them together using "git merge -X theirs v1.28.0" followed up with removing files not present upstream (other than the debian dir, obviously), and uploaded the repository to collab-maint git. There were a few upstream tags that conflicted with the tags generated from mercurial, I kept the upstream ones. Isaac, you'll want to get an alioth account and get yourself added to the collab-maint group: https://alioth.debian.org/account/register.php https://wiki.debian.org/Alioth/PackagingProject When you've got an account, I can send the mail to NM. Information about accessing alioth git repositories: https://wiki.debian.org/Alioth/Git The repository should be available here, once it's done syncing: git clone git://git.debian.org/git/collab-maint/zoneminder.git Web frontend: https://anonscm.debian.org/cgit/collab-maint/zoneminder.git/ >> I'd say we branch from the 1.28 release and then make a _quick_ upload >> of that, then work on a "nice" version. Vagrant, if you're around to do >> the actual upload, I'll coordinate with Isaac to get him going with the >> debian-specific builds. > > I'm also happy to help with packaging and sponsoring the occasional > upload. I didn't update the packaging to 1.28.0, but the master branch on alioth has 1.28.0 upstream merged in. Not sure how much work it will be to update the packaging, but happy to help. Also, might want to consider some of the proposed naming conventions laid out in: http://dep.debian.net/deps/dep14/ Thanks for helping out with zoneminder! live well, vagrant
signature.asc
Description: PGP signature
