quilt and debian-jenkins-glue

2014-11-21 Thread George Shuklin
Hello. I'm using debian-jenkins-glue (and jenkins) to build packages. d-j-g expects to have upstream code in branch 'upstream' and debian part in branch 'debian' or 'master'. It works fine, but I always have problems with quilt. If I want to add patch, or refresh, or change - it always

Re: quilt and debian-jenkins-glue

2014-11-21 Thread Etienne Millon
* George Shuklin george.shuk...@gmail.com [141121 17:23]: quilt expecting 'debian/patches' to be in same tree as upstream code. Hi, Usually in such a setting, upstream is merged into master, ie upstream has only upstream code but master has both. When you are on master with this setting, you