On 17/03/11 15:26, Michael Diers wrote: > On 2011-03-03 12:05, Michael Diers wrote: >> unless someone has already prepared packages for the imminent upstream >> release, I'll start updating the PPA as soon as appropriate. > > Sorry for the delay. I had problems with pbuilder no longer working for > maverick and natty packaging on a lucid box. So I decided to give natty > a try, which seems to work OK. > > I have commits ready to push. As I've shown some bad judgement as far as > the wording for commit messages and changelog entries go, in the past, > that is, here's the changelog entries and commit messages I'd like to > push to lp:~svn/ubuntu/natty/subversion/ppa.
It might be best to push your proposed branch to Launchpad: bzr push --stacked-on=bzr+ssh://bazaar.launchpad.net/~svn/ubuntu/natty/subversion/ppa lp:~mdiers/ubuntu/natty/subversion/ppa-proposed (The lp: shortcut doesn't work for --stacked-on= at the moment) > Opinions, anyone? > > Cheers, > > Michael > > mdiers@ubudev: ~/lp/ppa-svn/ubuntu/natty/subversion > $ br log -c 55 --include-merges > ------------------------------------------------------------ > revno: 55 [merge] > tags: 1.6.16dfsg-1~ppa-0svn1 You've changed the versioning scheme, and included two hyphens in the string - this is wrong, since it will change the name of the .orig.tar.gz that is looked for. The version should be 1.6.16dfsg-1svn1 i.e. append "svn<number>" to the official package you are deriving from. A hyphen separates the upstream portion of the version string from the packaging portion. Technically it's the last hyphen which does so, but including multiple hyphens is confusing and to be avoided. > mdiers@ubudev: ~/lp/ppa-svn/ubuntu/natty/subversion > $ bzr diff -c 55 debian/changelog > === modified file 'debian/changelog' > --- debian/changelog 2011-03-17 14:37:24 +0000 > +++ debian/changelog 2011-03-17 15:03:03 +0000 > @@ -1,3 +1,29 @@ > +subversion (1.6.16dfsg-1~ppa-0svn1) natty; urgency=low > + > + * Create a PPA build. I guess you copied that from my previous entry? I only said that there because I was starting afresh, based on a merge of the three sources I named. > + * Merge with Debian unstable. Remaining changes: > + - Create pot file on build. > + - Build a python-subversion-dbg package. > + - (Build-)depend on default-jre-headless/-jdk. > + - Do not apply java-build patch. > + - debian/rules: Manually create the doxygen output directory, otherwise > + we get weird build failures when running parallel builds. > + - Disable the serf backend because serf is in universe. > + - Fix FTBFS against Python 2.7 by disabling some problematic tests. Perfect entry for a merge to Ubuntu :-) I might have been lazier in preparing a package for the PPA. Max.
signature.asc
Description: OpenPGP digital signature
_______________________________________________ Mailing list: https://launchpad.net/~svn Post to : svn@lists.launchpad.net Unsubscribe : https://launchpad.net/~svn More help : https://help.launchpad.net/ListHelp
