Hello Sean, On Fri, Jun 09, 2017 at 03:18:40PM +0100, Sean Whitton wrote: > > Renaming branches is equivalent to rewinding history, so please avoid > that. > > We're going to need two source packages, so I think we should have two > repos, organised like this: > > emacs-ivy-doc -- just 'master' branch > > emacs-ivy -- 'upstream' branch with cleaned sources, 'master' branch > including debian/ dir
Thanks again for the help :-) Emacs-ivy currently has a master-dfsg branch created by copying the debian/* from master to the imported upstream-dfsg source. I've renamed upstream-dfsg to upstream. Unfortunately I didn't 'git checkout master -- debian' from within the master-dfsg branch, so when I merged master-dfsg to master I had to allow unrelated histories and the end result is messier than I'd like. The emacs-ivy-doc repo is going to be easier because I can rebase as necessary before the initial push. Would you like to see all the docs in emacs-ivy-doc, or only the two non-free ones? By the way, how soon do we (as pkg-emacsen) have to implement policy 12.4, and can you provide an example of the style we're going to use? Do we also provide the .org and .md markdown files or convert everything using pandoc and install that? Sincerely, Nicholas
signature.asc
Description: Digital signature
