Re: [Xournal-devel] another patch: debian directory

2012-07-04 Thread Carlo Segre
Hi Daniel: I will definitely look into your work. If it improves the packaging, I am all for it. It may take me a bit of time though as I am in the middle of writing a major research proposal. Carlo On Wed, 4 Jul 2012, D M German wrote: > > Hi Denis, > > (carbon copying Carl Segre, debian

Re: [Xournal-devel] working with git

2012-07-04 Thread dmg
On Wed, Jul 4, 2012 at 11:20 AM, Andreas K. Huettel wrote: > > So for me I'd prefer merging Denis' commits into my branch... However, I see > the point that the rebasing makes sure the local patches always apply cleanly > to Denis' HEAD. yes, that is the main reason we need to keep rebasing to hi

[Xournal-devel] another patch: debian directory

2012-07-04 Thread D M German
Hi Denis, (carbon copying Carl Segre, debian maintainer of the package). I have cleaned up the debian directory in xournal. It will allow us to create debian packages for our systems (I can even volunteer to create debian packages for Ubuntu, if there is interest): As usual, branch for-denis in

Re: [Xournal-devel] working with git

2012-07-04 Thread Andreas K. Huettel
Hi Daniel, depends on the application. If I always rebase my branch, I will never be able to properly publish it, because it has a constantly changing history! (Each of "my" commits will be rewritten by the rebase whenever a fresh commit from Denis comes along...) So for me I'd prefer merging

Re: [Xournal-devel] working with git

2012-07-04 Thread Denis Auroux
Hi Daniel, Thanks for the directives and information! Just to let non-git users know -- I'm still equally happy to get patch files from non-git contributors, in fact my workflow with Daniel and other git people, for the time being, will be to browse their git repositories, look at their commit

[Xournal-devel] working with git

2012-07-04 Thread D M German
hi Everybody, the workflow that we need to use to work with Denis is the following: * Denis will not merge from our repositories (at least for the time being). * This means that the work we do in our repositories needs to be synchronized (in git terms rebased) every time he commits to his r