On 16.06.2015 18:37, Emmanuel Bourg wrote: > Le 16/06/2015 00:16, Emmanuel Bourg a écrit : > >> Ok I'll upload it. However I'll copy the bnd repository instead to keep >> the packaging history. > > I uploaded the bnd1.50 package, it installs only versioned jar files > (there is no Maven artifact with a 'debian' or '1.x' version, and the > jar files in /usr/share/java are suffixed with the version 1.50.0). The > command line tool is invoked with 'bnd-1.50'. Thanks for the upload. However I feel that this is another "double work" situation again. (you probably remember the javahelper case). In my opinion we should have continued to work on bnd1. I am always open for improvement suggestions and of course I would have fixed all remaining issues myself. I have put some thought in bnd1, for example my package was co-installable whereas bnd-1.50 breaks/replaces bnd <= 2 now. I don't expect any fatal problems with this decision but this was also true for bnd1. I also think that we don't really need the packaging history because it is clear to everyone that the bnd repository contains all historical information. I would treat bnd1/bnd1.50 simply as a new package with a clean Git history whose sole goal is to simplify the transition to bnd2 and then we should get rid of it as soon as possible. There is no need for fancy Git magic. > I noticed an issue with the Git repository of the bnd package, the > upstream version 1.50.0 has been imported on the top of the version > 2.1.0. On the upstream branch, the files for the version 2.1.0 come > before the files for the version 1.50.0, and on the master branch the > changes from the experimental 2.1.0 branch have been merged and then > replaced with the changes for bnd/1.50.0-9. > > I suggest to clean this by: > 1. reverting the master branch before the merge commit of the > experimental branch, and reapplying the changes from bnd/1.50.0-9 > 2. rebasing the experimental branch and remove the merge commit from the > upstream branch > 3. removing the upstream imports on the upstream branch for both versions > 4. merging the experimental branch on the master branch > > This will leave an empty upstream branch, and a master branch ready for > bnd 2.1.0. The next person working on the package will just have to > reimport the upstream tarball (that may be a more recent version too). The issue with bnd's upstream branch was that someone forgot to push the old 1.50 upstream sources when bnd 1.50 was released. Miguel was the first one who created an initial upstream branch for bnd and pushed the 2.1.0 sources. I don't perceive the current situation as an issue because Git master reflects the current state of affairs in unstable and you still can work with bnd 2.1.0 on the experimental branch. So I am confident everything will be resolved when we eventually upload 2.1.0-2 to unstable and re-import everything with gbp import-dsc on Git master. Regards, Markus
Attachment:
signature.asc
Description: OpenPGP digital signature