Package: subversion
Version: 1.1.4-2
Severity: minor

While attempting to build a bleeding-edge subversion package with the
1.2.0 tarball and python2.4 (I don't have python2.3-dev installed), I
discovered that the autogenerated control file contained an unexpected
blank line:

> Package: python2.4-subversion
> Section: python
> 
> Architecture: any
> Depends: python`'PYTHON_VER`', subversion, ${shlibs:Depends}
> Description: python modules for interfacing with Subversion (aka. svn)
>  Subversion is a version control system much like the Concurrent
>  Versions System (CVS).  Version control systems allow many
>  individuals (who may be distributed geographically) to collaborate on
>  a set of files (typically source code).  Subversion has all the major
>  features of CVS, plus certain new features that CVS users often wish
>  they had.
>  . 
>  These modules are required to interface with Subversion from Python.
>  This would be useful if you wanted to, for example, write a Python
>  script that manipulates a subversion repository or working copy.
>  .
>  Homepage: http://subversion.tigris.org

This is because the source code placed the terminating newline for the
optional Conflicts/Replaces clause after the ifelse() rather than inside it:

> Package: python`'PYTHON_VER`'-subversion
> Section: python
> ifelse(PYTHON_VER,2.3,`Conflicts: python2.1-subversion
> Replaces: python2.1-subversion')
> Architecture: any

I corrected it as follows.

) Package: python`'PYTHON_VER`'-subversion
) Section: python
) ifelse(PYTHON_VER,2.3,`Conflicts: python2.1-subversion
) Replaces: python2.1-subversion
) ')ifelse(PYTHON_VER,2.4,`Conflicts: python2.3-subversion
) Replaces: python2.3-subversion
) ')Architecture: any


If anyone else is trying this, the edits to debian/rules are pretty
straightforward.

The only thing you need to do is fix up debian/patches/*.  The fate of
the patches relative to the 1.2.0 tarball is:

jikes_compile_1.patch   - applied upstream; no longer needed
jikes_compile_2.patch   - applied upstream; no longer needed
kaffe-cast.patch        - still applicable
kaffe.patch             - still applicable; HAND EDIT REQUIRED:
                          trailing context has changed.
ltmain.sh.patch         - applied upstream, AFAICT.  Some hunks differ.
r11771.patch            - applied upstream; no longer needed
repos-templates.patch   - still applicable
rpath.patch             - still applicable; HAND EDITS REQUIRED:
                          gen_base.py hunk2 (preceding lines now indented +2)
                          gen_make.py hunk 1 ("source" -> "link_dep", 6x)
series                  - HAND EDIT (obviously)
svnshell.patch          - Aww, that takes all the fun out of things.

It's compiling now, although it hasn't finished yet...


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]

Reply via email to