On Wed, Mar 25, 2009 at 12:09 AM, Chris Frey <cdf...@foursquare.net> wrote: > On Tue, Mar 24, 2009 at 11:41:07PM +0100, Jose Carlos Garcia Sogo wrote: >> Hi, >> >> I have been preparing packages for 0.15. For that I have merged all >> your changes (upstream development and changes in packaging) in a new >> branch called barry-015, which I have published at github (in case I >> had messed something, I'd like to have git.debian.org) as clean as >> possible. > > Thanks very much! I appreciate your help getting this into Debian unstable.
And my lagging on doing that. > > >> So, if I understand this right, you can pull my branch back in your >> upstream and everything will be in place. >> git://github.com/jcsogo/barry015.git > > I can fetch from there, but it has autogenerated files in the barry-015 > branch, so I can't merge it wholesale into my main master branch. I'd like > to snag your opensync packaging changes though. I can do that through cherry > picking. Yeah, you're right. That's the problem that we have exposed other times. I need a complete "upstream" source for Debian packaging and you want your debian/ dir to be in your master branch. This can be solved, but at the cost of moving debian/ to a different 'packaging' branch. > > Just out of curiosity, why did you remove part of the license notice in > debian/copyright? It was just a copy from vformat.c, so it's still there, > just wondering the reason. > I have to check merges. I remember some conflict there in which a copy from a file conflicted with standard licensing text. Usually, licensing text has to be used, but I should check. I have also to check that new patches have not introduced new copyrights. >> I have started to work as well on packages for opensync 0.4 plugin. >> The problem I have found is that the plugin fails to compile with >> libopensync package in Debian. > > We're working directly from the opensync SVN tree, which compiles for me > here. Are the debian packages you're using updated to the latest? > There were some API changes recently, and the plugins are catching up at > their own pace. I have used latest packages available in debian/. But perhaps they can be outadet, or the plugin is tracking more close opensync CVS. -- José Carlos García Sogo js...@debian.org ------------------------------------------------------------------------------ _______________________________________________ Barry-devel mailing list Barry-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/barry-devel
