On Wed, Mar 25, 2009 at 03:41:54PM +0100, Jose Carlos Garcia Sogo wrote: > 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.
When I do official releases, I create a tag named barry_0.14.orig.tar.gz that has the debian/ directory removed. This likely doesn't help for general merging and keeping up with HEAD though. In any case, it's not hard to go through and cherry-pick your changes. I've picked the barrybackup menu changes, and the opensync plugin package rename. Some of these were pending for Lenny in a local branch here, but I've finally merged them. I have a question about the menus in Debian... I notice that Debian opts for its own menu hierarchy, and this is where Barry Backup ends up: under Debian/Applications/Mobile Devices. On my system, the Gnome menus had the Debian tree hidden by default. This meant that Barry Backup was unavailable for the average user, if I understand it correctly. Is there a way to add Barry Backup to both places? Would this fit with Debian Policy? > > 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. There are a lot of contributions from Nicolas Vivien and Josh Kropf in the latest tree, so I've added them to debian/copyright. The AUTHORS file is kept more up to date with all contributions, but not all contributions have a copyright notice attached to them. - Chris ------------------------------------------------------------------------------ _______________________________________________ Barry-devel mailing list Barry-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/barry-devel
