--- subversion-1.5.1dfsg1.orig/build/ltoptions.m4 +++ subversion-1.5.1dfsg1/build/ltoptions.m4 @@ -0,0 +1,368 @@ +# Helper functions for option handling. -*- Autoconf -*- +# +# Copyright (C) 2004, 2005, 2007, 2008 Free Software Foundation, Inc. +# Written by Gary V. Vaughan, 2004 +# +# This file is free software; the Free Software Foundation gives +# unlimited permission to copy and/or distribute it, with or without +# modifications, as long as this notice is preserved. + +# serial 6 ltoptions.m4 + +# This is to help aclocal find these macros, as it can't see m4_define. +AC_DEFUN([LTOPTIONS_VERSION], [m4_if([1])]) + + +# _LT_MANGLE_OPTION(MACRO-NAME, OPTION-NAME) +# ------------------------------------------ +m4_define([_LT_MANGLE_OPTION], +[[_LT_OPTION_]m4_bpatsubst($1__$2, [[^a-zA-Z0-9_]], [_])]) + + +# _LT_SET_OPTION(MACRO-NAME, OPTION-NAME) +# --------------------------------------- +# Set option OPTION-NAME for macro MACRO-NAME, and if there is a +# matching handler defined, dispatch to it. Other OPTION-NAMEs are +# saved as a flag. +m4_define([_LT_SET_OPTION], +[m4_define(_LT_MANGLE_OPTION([$1], [$2]))dnl +m4_ifdef(_LT_MANGLE_DEFUN([$1], [$2]), + _LT_MANGLE_DEFUN([$1], [$2]), + [m4_warning([Unknown $1 option `$2'])])[]dnl +]) + + +# _LT_IF_OPTION(MACRO-NAME, OPTION-NAME, IF-SET, [IF-NOT-SET]) +# ------------------------------------------------------------ +# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise. +m4_define([_LT_IF_OPTION], +[m4_ifdef(_LT_MANGLE_OPTION([$1], [$2]), [$3], [$4])]) + + +# _LT_UNLESS_OPTIONS(MACRO-NAME, OPTION-LIST, IF-NOT-SET) +# ------------------------------------------------------- +# Execute IF-NOT-SET unless all options in OPTION-LIST for MACRO-NAME +# are set. +m4_define([_LT_UNLESS_OPTIONS], +[m4_foreach([_LT_Option], m4_split(m4_normalize([$2])), + [m4_ifdef(_LT_MANGLE_OPTION([$1], _LT_Option), + [m4_define([$0_found])])])[]dnl +m4_ifdef([$0_found], [m4_undefine([$0_found])], [$3 +])[]dnl +]) + + +# _LT_SET_OPTIONS(MACRO-NAME, OPTION-LIST) +# ---------------------------------------- +# OPTION-LIST is a space-separated list of Libtool options associated +# with MACRO-NAME. If any OPTION has a matching handler declared with +# LT_OPTION_DEFINE, dispatch to that macro; otherwise complain about +# the unknown option and exit. +m4_defun([_LT_SET_OPTIONS], +[# Set options +m4_foreach([_LT_Option], m4_split(m4_normalize([$2])), + [_LT_SET_OPTION([$1], _LT_Option)]) + +m4_if([$1],[LT_INIT],[ + dnl + dnl Simply set some default values (i.e off) if boolean options were not + dnl specified: + _LT_UNLESS_OPTIONS([LT_INIT], [dlopen], [enable_dlopen=no + ]) + _LT_UNLESS_OPTIONS([LT_INIT], [win32-dll], [enable_win32_dll=no + ]) + dnl + dnl If no reference was made to various pairs of opposing options, then + dnl we run the default mode handler for the pair. For example, if neither + dnl `shared' nor `disable-shared' was passed, we enable building of shared + dnl archives by default: + _LT_UNLESS_OPTIONS([LT_INIT], [shared disable-shared], [_LT_ENABLE_SHARED]) + _LT_UNLESS_OPTIONS([LT_INIT], [static disable-static], [_LT_ENABLE_STATIC]) + _LT_UNLESS_OPTIONS([LT_INIT], [pic-only no-pic], [_LT_WITH_PIC]) + _LT_UNLESS_OPTIONS([LT_INIT], [fast-install disable-fast-install], + [_LT_ENABLE_FAST_INSTALL]) + ]) +])# _LT_SET_OPTIONS + + +## --------------------------------- ## +## Macros to handle LT_INIT options. ## +## --------------------------------- ## + +# _LT_MANGLE_DEFUN(MACRO-NAME, OPTION-NAME) +# ----------------------------------------- +m4_define([_LT_MANGLE_DEFUN], +[[_LT_OPTION_DEFUN_]m4_bpatsubst(m4_toupper([$1__$2]), [[^A-Z0-9_]], [_])]) + + +# LT_OPTION_DEFINE(MACRO-NAME, OPTION-NAME, CODE) +# ----------------------------------------------- +m4_define([LT_OPTION_DEFINE], +[m4_define(_LT_MANGLE_DEFUN([$1], [$2]), [$3])[]dnl +])# LT_OPTION_DEFINE + + +# dlopen +# ------ +LT_OPTION_DEFINE([LT_INIT], [dlopen], [enable_dlopen=yes +]) + +AU_DEFUN([AC_LIBTOOL_DLOPEN], +[_LT_SET_OPTION([LT_INIT], [dlopen]) +AC_DIAGNOSE([obsolete], +[$0: Remove this warning and the call to _LT_SET_OPTION when you +put the `dlopen' option into LT_INIT's first parameter.]) +]) + +dnl aclocal-1.4 backwards compatibility: +dnl AC_DEFUN([AC_LIBTOOL_DLOPEN], []) + + +# win32-dll +# --------- +# Declare package support for building win32 dll's. +LT_OPTION_DEFINE([LT_INIT], [win32-dll], +[enable_win32_dll=yes + +case $host in +*-*-cygwin* | *-*-mingw* | *-*-pw32*) + AC_CHECK_TOOL(AS, as, false) + AC_CHECK_TOOL(DLLTOOL, dlltool, false) + AC_CHECK_TOOL(OBJDUMP, objdump, false) + ;; +esac + +test -z "$AS" && AS=as +_LT_DECL([], [AS], [0], [Assembler program])dnl + +test -z "$DLLTOOL" && DLLTOOL=dlltool +_LT_DECL([], [DLLTOOL], [0], [DLL creation program])dnl + +test -z "$OBJDUMP" && OBJDUMP=objdump +_LT_DECL([], [OBJDUMP], [0], [Object dumper program])dnl +])# win32-dll + +AU_DEFUN([AC_LIBTOOL_WIN32_DLL], +[AC_REQUIRE([AC_CANONICAL_HOST])dnl +_LT_SET_OPTION([LT_INIT], [win32-dll]) +AC_DIAGNOSE([obsolete], +[$0: Remove this warning and the call to _LT_SET_OPTION when you +put the `win32-dll' option into LT_INIT's first parameter.]) +]) + +dnl aclocal-1.4 backwards compatibility: +dnl AC_DEFUN([AC_LIBTOOL_WIN32_DLL], []) + + +# _LT_ENABLE_SHARED([DEFAULT]) +# ---------------------------- +# implement the --enable-shared flag, and supports the `shared' and +# `disable-shared' LT_INIT options. +# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'. +m4_define([_LT_ENABLE_SHARED], +[m4_define([_LT_ENABLE_SHARED_DEFAULT], [m4_if($1, no, no, yes)])dnl +AC_ARG_ENABLE([shared], + [AS_HELP_STRING([--enable-shared@<:@=PKGS@:>@], + [build shared libraries @<:@default=]_LT_ENABLE_SHARED_DEFAULT[@:>@])], + [p=${PACKAGE-default} + case $enableval in + yes) enable_shared=yes ;; + no) enable_shared=no ;; + *) + enable_shared=no + # Look at the argument we got. We use all the common list separators. + lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," + for pkg in $enableval; do + IFS="$lt_save_ifs" + if test "X$pkg" = "X$p"; then + enable_shared=yes + fi + done + IFS="$lt_save_ifs" + ;; + esac], + [enable_shared=]_LT_ENABLE_SHARED_DEFAULT) + + _LT_DECL([build_libtool_libs], [enable_shared], [0], + [Whether or not to build shared libraries]) +])# _LT_ENABLE_SHARED + +LT_OPTION_DEFINE([LT_INIT], [shared], [_LT_ENABLE_SHARED([yes])]) +LT_OPTION_DEFINE([LT_INIT], [disable-shared], [_LT_ENABLE_SHARED([no])]) + +# Old names: +AC_DEFUN([AC_ENABLE_SHARED], +[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[shared]) +]) + +AC_DEFUN([AC_DISABLE_SHARED], +[_LT_SET_OPTION([LT_INIT], [disable-shared]) +]) + +AU_DEFUN([AM_ENABLE_SHARED], [AC_ENABLE_SHARED($@)]) +AU_DEFUN([AM_DISABLE_SHARED], [AC_DISABLE_SHARED($@)]) + +dnl aclocal-1.4 backwards compatibility: +dnl AC_DEFUN([AM_ENABLE_SHARED], []) +dnl AC_DEFUN([AM_DISABLE_SHARED], []) + + + +# _LT_ENABLE_STATIC([DEFAULT]) +# ---------------------------- +# implement the --enable-static flag, and support the `static' and +# `disable-static' LT_INIT options. +# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'. +m4_define([_LT_ENABLE_STATIC], +[m4_define([_LT_ENABLE_STATIC_DEFAULT], [m4_if($1, no, no, yes)])dnl +AC_ARG_ENABLE([static], + [AS_HELP_STRING([--enable-static@<:@=PKGS@:>@], + [build static libraries @<:@default=]_LT_ENABLE_STATIC_DEFAULT[@:>@])], + [p=${PACKAGE-default} + case $enableval in + yes) enable_static=yes ;; + no) enable_static=no ;; + *) + enable_static=no + # Look at the argument we got. We use all the common list separators. + lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," + for pkg in $enableval; do + IFS="$lt_save_ifs" + if test "X$pkg" = "X$p"; then + enable_static=yes + fi + done + IFS="$lt_save_ifs" + ;; + esac], + [enable_static=]_LT_ENABLE_STATIC_DEFAULT) + + _LT_DECL([build_old_libs], [enable_static], [0], + [Whether or not to build static libraries]) +])# _LT_ENABLE_STATIC + +LT_OPTION_DEFINE([LT_INIT], [static], [_LT_ENABLE_STATIC([yes])]) +LT_OPTION_DEFINE([LT_INIT], [disable-static], [_LT_ENABLE_STATIC([no])]) + +# Old names: +AC_DEFUN([AC_ENABLE_STATIC], +[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[static]) +]) + +AC_DEFUN([AC_DISABLE_STATIC], +[_LT_SET_OPTION([LT_INIT], [disable-static]) +]) + +AU_DEFUN([AM_ENABLE_STATIC], [AC_ENABLE_STATIC($@)]) +AU_DEFUN([AM_DISABLE_STATIC], [AC_DISABLE_STATIC($@)]) + +dnl aclocal-1.4 backwards compatibility: +dnl AC_DEFUN([AM_ENABLE_STATIC], []) +dnl AC_DEFUN([AM_DISABLE_STATIC], []) + + + +# _LT_ENABLE_FAST_INSTALL([DEFAULT]) +# ---------------------------------- +# implement the --enable-fast-install flag, and support the `fast-install' +# and `disable-fast-install' LT_INIT options. +# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'. +m4_define([_LT_ENABLE_FAST_INSTALL], +[m4_define([_LT_ENABLE_FAST_INSTALL_DEFAULT], [m4_if($1, no, no, yes)])dnl +AC_ARG_ENABLE([fast-install], + [AS_HELP_STRING([--enable-fast-install@<:@=PKGS@:>@], + [optimize for fast installation @<:@default=]_LT_ENABLE_FAST_INSTALL_DEFAULT[@:>@])], + [p=${PACKAGE-default} + case $enableval in + yes) enable_fast_install=yes ;; + no) enable_fast_install=no ;; + *) + enable_fast_install=no + # Look at the argument we got. We use all the common list separators. + lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," + for pkg in $enableval; do + IFS="$lt_save_ifs" + if test "X$pkg" = "X$p"; then + enable_fast_install=yes + fi + done + IFS="$lt_save_ifs" + ;; + esac], + [enable_fast_install=]_LT_ENABLE_FAST_INSTALL_DEFAULT) + +_LT_DECL([fast_install], [enable_fast_install], [0], + [Whether or not to optimize for fast installation])dnl +])# _LT_ENABLE_FAST_INSTALL + +LT_OPTION_DEFINE([LT_INIT], [fast-install], [_LT_ENABLE_FAST_INSTALL([yes])]) +LT_OPTION_DEFINE([LT_INIT], [disable-fast-install], [_LT_ENABLE_FAST_INSTALL([no])]) + +# Old names: +AU_DEFUN([AC_ENABLE_FAST_INSTALL], +[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[fast-install]) +AC_DIAGNOSE([obsolete], +[$0: Remove this warning and the call to _LT_SET_OPTION when you put +the `fast-install' option into LT_INIT's first parameter.]) +]) + +AU_DEFUN([AC_DISABLE_FAST_INSTALL], +[_LT_SET_OPTION([LT_INIT], [disable-fast-install]) +AC_DIAGNOSE([obsolete], +[$0: Remove this warning and the call to _LT_SET_OPTION when you put +the `disable-fast-install' option into LT_INIT's first parameter.]) +]) + +dnl aclocal-1.4 backwards compatibility: +dnl AC_DEFUN([AC_ENABLE_FAST_INSTALL], []) +dnl AC_DEFUN([AM_DISABLE_FAST_INSTALL], []) + + +# _LT_WITH_PIC([MODE]) +# -------------------- +# implement the --with-pic flag, and support the `pic-only' and `no-pic' +# LT_INIT options. +# MODE is either `yes' or `no'. If omitted, it defaults to `both'. +m4_define([_LT_WITH_PIC], +[AC_ARG_WITH([pic], + [AS_HELP_STRING([--with-pic], + [try to use only PIC/non-PIC objects @<:@default=use both@:>@])], + [pic_mode="$withval"], + [pic_mode=default]) + +test -z "$pic_mode" && pic_mode=m4_default([$1], [default]) + +_LT_DECL([], [pic_mode], [0], [What type of objects to build])dnl +])# _LT_WITH_PIC + +LT_OPTION_DEFINE([LT_INIT], [pic-only], [_LT_WITH_PIC([yes])]) +LT_OPTION_DEFINE([LT_INIT], [no-pic], [_LT_WITH_PIC([no])]) + +# Old name: +AU_DEFUN([AC_LIBTOOL_PICMODE], +[_LT_SET_OPTION([LT_INIT], [pic-only]) +AC_DIAGNOSE([obsolete], +[$0: Remove this warning and the call to _LT_SET_OPTION when you +put the `pic-only' option into LT_INIT's first parameter.]) +]) + +dnl aclocal-1.4 backwards compatibility: +dnl AC_DEFUN([AC_LIBTOOL_PICMODE], []) + +## ----------------- ## +## LTDL_INIT Options ## +## ----------------- ## + +m4_define([_LTDL_MODE], []) +LT_OPTION_DEFINE([LTDL_INIT], [nonrecursive], + [m4_define([_LTDL_MODE], [nonrecursive])]) +LT_OPTION_DEFINE([LTDL_INIT], [recursive], + [m4_define([_LTDL_MODE], [recursive])]) +LT_OPTION_DEFINE([LTDL_INIT], [subproject], + [m4_define([_LTDL_MODE], [subproject])]) + +m4_define([_LTDL_TYPE], []) +LT_OPTION_DEFINE([LTDL_INIT], [installable], + [m4_define([_LTDL_TYPE], [installable])]) +LT_OPTION_DEFINE([LTDL_INIT], [convenience], + [m4_define([_LTDL_TYPE], [convenience])]) --- subversion-1.5.1dfsg1.orig/build/ltsugar.m4 +++ subversion-1.5.1dfsg1/build/ltsugar.m4 @@ -0,0 +1,123 @@ +# ltsugar.m4 -- libtool m4 base layer. -*-Autoconf-*- +# +# Copyright (C) 2004, 2005, 2007 Free Software Foundation, Inc. +# Written by Gary V. Vaughan, 2004 +# +# This file is free software; the Free Software Foundation gives +# unlimited permission to copy and/or distribute it, with or without +# modifications, as long as this notice is preserved. + +# serial 5 ltsugar.m4 + +# This is to help aclocal find these macros, as it can't see m4_define. +AC_DEFUN([LTSUGAR_VERSION], [m4_if([0.1])]) + + +# lt_join(SEP, ARG1, [ARG2...]) +# ----------------------------- +# Produce ARG1SEPARG2...SEPARGn, omitting [] arguments and their +# associated separator. +# Needed until we can rely on m4_join from Autoconf 2.62, since all earlier +# versions in m4sugar had bugs. +m4_define([lt_join], +[m4_if([$#], [1], [], + [$#], [2], [[$2]], + [m4_if([$2], [], [], [[$2]_])$0([$1], m4_shift(m4_shift($@)))])]) +m4_define([_lt_join], +[m4_if([$#$2], [2], [], + [m4_if([$2], [], [], [[$1$2]])$0([$1], m4_shift(m4_shift($@)))])]) + + +# lt_car(LIST) +# lt_cdr(LIST) +# ------------ +# Manipulate m4 lists. +# These macros are necessary as long as will still need to support +# Autoconf-2.59 which quotes differently. +m4_define([lt_car], [[$1]]) +m4_define([lt_cdr], +[m4_if([$#], 0, [m4_fatal([$0: cannot be called without arguments])], + [$#], 1, [], + [m4_dquote(m4_shift($@))])]) +m4_define([lt_unquote], $1) + + +# lt_append(MACRO-NAME, STRING, [SEPARATOR]) +# ------------------------------------------ +# Redefine MACRO-NAME to hold its former content plus `SEPARATOR'`STRING'. +# Note that neither SEPARATOR nor STRING are expanded; they are appended +# to MACRO-NAME as is (leaving the expansion for when MACRO-NAME is invoked). +# No SEPARATOR is output if MACRO-NAME was previously undefined (different +# than defined and empty). +# +# This macro is needed until we can rely on Autoconf 2.62, since earlier +# versions of m4sugar mistakenly expanded SEPARATOR but not STRING. +m4_define([lt_append], +[m4_define([$1], + m4_ifdef([$1], [m4_defn([$1])[$3]])[$2])]) + + + +# lt_combine(SEP, PREFIX-LIST, INFIX, SUFFIX1, [SUFFIX2...]) +# ---------------------------------------------------------- +# Produce a SEP delimited list of all paired combinations of elements of +# PREFIX-LIST with SUFFIX1 through SUFFIXn. Each element of the list +# has the form PREFIXmINFIXSUFFIXn. +m4_define([lt_combine], +[m4_if([$2], [], [], + [m4_if([$4], [], [], + [lt_join(m4_quote(m4_default([$1], [[, ]])), + lt_unquote(m4_split(m4_normalize(m4_foreach(_Lt_prefix, [$2], + [m4_foreach(_Lt_suffix, lt_car([m4_shiftn(3, $@)]), + [_Lt_prefix[]$3[]_Lt_suffix ])])))))])])dnl +]) + + +# lt_if_append_uniq(MACRO-NAME, VARNAME, [SEPARATOR], [UNIQ], [NOT-UNIQ]) +# ----------------------------------------------------------------------- +# Iff MACRO-NAME does not yet contain VARNAME, then append it (delimited +# by SEPARATOR if supplied) and expand UNIQ, else NOT-UNIQ. +m4_define([lt_if_append_uniq], +[m4_ifdef([$1], + [m4_if(m4_index([$3]m4_defn([$1])[$3], [$3$2$3]), [-1], + [lt_append([$1], [$2], [$3])$4], + [$5])], + [lt_append([$1], [$2], [$3])$4])]) + + +# lt_dict_add(DICT, KEY, VALUE) +# ----------------------------- +m4_define([lt_dict_add], +[m4_define([$1($2)], [$3])]) + + +# lt_dict_add_subkey(DICT, KEY, SUBKEY, VALUE) +# -------------------------------------------- +m4_define([lt_dict_add_subkey], +[m4_define([$1($2:$3)], [$4])]) + + +# lt_dict_fetch(DICT, KEY, [SUBKEY]) +# ---------------------------------- +m4_define([lt_dict_fetch], +[m4_ifval([$3], + m4_ifdef([$1($2:$3)], [m4_defn([$1($2:$3)])]), + m4_ifdef([$1($2)], [m4_defn([$1($2)])]))]) + + +# lt_if_dict_fetch(DICT, KEY, [SUBKEY], VALUE, IF-TRUE, [IF-FALSE]) +# ----------------------------------------------------------------- +m4_define([lt_if_dict_fetch], +[m4_if(lt_dict_fetch([$1], [$2], [$3]), [$4], + [$5], + [$6])]) + + +# lt_dict_filter(DICT, [SUBKEY], VALUE, [SEPARATOR], KEY, [...]) +# -------------------------------------------------------------- +m4_define([lt_dict_filter], +[m4_if([$5], [], [], + [lt_join(m4_quote(m4_default([$4], [[, ]])), + lt_unquote(m4_split(m4_normalize(m4_foreach(_Lt_key, lt_car([m4_shiftn(4, $@)]), + [lt_if_dict_fetch([$1], _Lt_key, [$2], [$3], [_Lt_key ])])))))])[]dnl +]) --- subversion-1.5.1dfsg1.orig/build/ltversion.m4 +++ subversion-1.5.1dfsg1/build/ltversion.m4 @@ -0,0 +1,23 @@ +# ltversion.m4 -- version numbers -*- Autoconf -*- +# +# Copyright (C) 2004 Free Software Foundation, Inc. +# Written by Scott James Remnant, 2004 +# +# This file is free software; the Free Software Foundation gives +# unlimited permission to copy and/or distribute it, with or without +# modifications, as long as this notice is preserved. + +# Generated from ltversion.in. + +# serial 2976 ltversion.m4 +# This file is part of GNU Libtool + +m4_define([LT_PACKAGE_VERSION], [2.2.4]) +m4_define([LT_PACKAGE_REVISION], [1.2976]) + +AC_DEFUN([LTVERSION_VERSION], +[macro_version='2.2.4' +macro_revision='1.2976' +_LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?]) +_LT_DECL(, macro_revision, 0) +]) --- subversion-1.5.1dfsg1.orig/build/lt~obsolete.m4 +++ subversion-1.5.1dfsg1/build/lt~obsolete.m4 @@ -0,0 +1,92 @@ +# lt~obsolete.m4 -- aclocal satisfying obsolete definitions. -*-Autoconf-*- +# +# Copyright (C) 2004, 2005, 2007 Free Software Foundation, Inc. +# Written by Scott James Remnant, 2004. +# +# This file is free software; the Free Software Foundation gives +# unlimited permission to copy and/or distribute it, with or without +# modifications, as long as this notice is preserved. + +# serial 4 lt~obsolete.m4 + +# These exist entirely to fool aclocal when bootstrapping libtool. +# +# In the past libtool.m4 has provided macros via AC_DEFUN (or AU_DEFUN) +# which have later been changed to m4_define as they aren't part of the +# exported API, or moved to Autoconf or Automake where they belong. +# +# The trouble is, aclocal is a bit thick. It'll see the old AC_DEFUN +# in /usr/share/aclocal/libtool.m4 and remember it, then when it sees us +# using a macro with the same name in our local m4/libtool.m4 it'll +# pull the old libtool.m4 in (it doesn't see our shiny new m4_define +# and doesn't know about Autoconf macros at all.) +# +# So we provide this file, which has a silly filename so it's always +# included after everything else. This provides aclocal with the +# AC_DEFUNs it wants, but when m4 processes it, it doesn't do anything +# because those macros already exist, or will be overwritten later. +# We use AC_DEFUN over AU_DEFUN for compatibility with aclocal-1.6. +# +# Anytime we withdraw an AC_DEFUN or AU_DEFUN, remember to add it here. +# Yes, that means every name once taken will need to remain here until +# we give up compatibility with versions before 1.7, at which point +# we need to keep only those names which we still refer to. + +# This is to help aclocal find these macros, as it can't see m4_define. +AC_DEFUN([LTOBSOLETE_VERSION], [m4_if([1])]) + +m4_ifndef([AC_LIBTOOL_LINKER_OPTION], [AC_DEFUN([AC_LIBTOOL_LINKER_OPTION])]) +m4_ifndef([AC_PROG_EGREP], [AC_DEFUN([AC_PROG_EGREP])]) +m4_ifndef([_LT_AC_PROG_ECHO_BACKSLASH], [AC_DEFUN([_LT_AC_PROG_ECHO_BACKSLASH])]) +m4_ifndef([_LT_AC_SHELL_INIT], [AC_DEFUN([_LT_AC_SHELL_INIT])]) +m4_ifndef([_LT_AC_SYS_LIBPATH_AIX], [AC_DEFUN([_LT_AC_SYS_LIBPATH_AIX])]) +m4_ifndef([_LT_PROG_LTMAIN], [AC_DEFUN([_LT_PROG_LTMAIN])]) +m4_ifndef([_LT_AC_TAGVAR], [AC_DEFUN([_LT_AC_TAGVAR])]) +m4_ifndef([AC_LTDL_ENABLE_INSTALL], [AC_DEFUN([AC_LTDL_ENABLE_INSTALL])]) +m4_ifndef([AC_LTDL_PREOPEN], [AC_DEFUN([AC_LTDL_PREOPEN])]) +m4_ifndef([_LT_AC_SYS_COMPILER], [AC_DEFUN([_LT_AC_SYS_COMPILER])]) +m4_ifndef([_LT_AC_LOCK], [AC_DEFUN([_LT_AC_LOCK])]) +m4_ifndef([AC_LIBTOOL_SYS_OLD_ARCHIVE], [AC_DEFUN([AC_LIBTOOL_SYS_OLD_ARCHIVE])]) +m4_ifndef([_LT_AC_TRY_DLOPEN_SELF], [AC_DEFUN([_LT_AC_TRY_DLOPEN_SELF])]) +m4_ifndef([AC_LIBTOOL_PROG_CC_C_O], [AC_DEFUN([AC_LIBTOOL_PROG_CC_C_O])]) +m4_ifndef([AC_LIBTOOL_SYS_HARD_LINK_LOCKS], [AC_DEFUN([AC_LIBTOOL_SYS_HARD_LINK_LOCKS])]) +m4_ifndef([AC_LIBTOOL_OBJDIR], [AC_DEFUN([AC_LIBTOOL_OBJDIR])]) +m4_ifndef([AC_LTDL_OBJDIR], [AC_DEFUN([AC_LTDL_OBJDIR])]) +m4_ifndef([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH], [AC_DEFUN([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH])]) +m4_ifndef([AC_LIBTOOL_SYS_LIB_STRIP], [AC_DEFUN([AC_LIBTOOL_SYS_LIB_STRIP])]) +m4_ifndef([AC_PATH_MAGIC], [AC_DEFUN([AC_PATH_MAGIC])]) +m4_ifndef([AC_PROG_LD_GNU], [AC_DEFUN([AC_PROG_LD_GNU])]) +m4_ifndef([AC_PROG_LD_RELOAD_FLAG], [AC_DEFUN([AC_PROG_LD_RELOAD_FLAG])]) +m4_ifndef([AC_DEPLIBS_CHECK_METHOD], [AC_DEFUN([AC_DEPLIBS_CHECK_METHOD])]) +m4_ifndef([AC_LIBTOOL_PROG_COMPILER_NO_RTTI], [AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_NO_RTTI])]) +m4_ifndef([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE], [AC_DEFUN([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE])]) +m4_ifndef([AC_LIBTOOL_PROG_COMPILER_PIC], [AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_PIC])]) +m4_ifndef([AC_LIBTOOL_PROG_LD_SHLIBS], [AC_DEFUN([AC_LIBTOOL_PROG_LD_SHLIBS])]) +m4_ifndef([AC_LIBTOOL_POSTDEP_PREDEP], [AC_DEFUN([AC_LIBTOOL_POSTDEP_PREDEP])]) +m4_ifndef([LT_AC_PROG_EGREP], [AC_DEFUN([LT_AC_PROG_EGREP])]) +m4_ifndef([LT_AC_PROG_SED], [AC_DEFUN([LT_AC_PROG_SED])]) +m4_ifndef([_LT_CC_BASENAME], [AC_DEFUN([_LT_CC_BASENAME])]) +m4_ifndef([_LT_COMPILER_BOILERPLATE], [AC_DEFUN([_LT_COMPILER_BOILERPLATE])]) +m4_ifndef([_LT_LINKER_BOILERPLATE], [AC_DEFUN([_LT_LINKER_BOILERPLATE])]) +m4_ifndef([_AC_PROG_LIBTOOL], [AC_DEFUN([_AC_PROG_LIBTOOL])]) +m4_ifndef([AC_LIBTOOL_SETUP], [AC_DEFUN([AC_LIBTOOL_SETUP])]) +m4_ifndef([_LT_AC_CHECK_DLFCN], [AC_DEFUN([_LT_AC_CHECK_DLFCN])]) +m4_ifndef([AC_LIBTOOL_SYS_DYNAMIC_LINKER], [AC_DEFUN([AC_LIBTOOL_SYS_DYNAMIC_LINKER])]) +m4_ifndef([_LT_AC_TAGCONFIG], [AC_DEFUN([_LT_AC_TAGCONFIG])]) +m4_ifndef([AC_DISABLE_FAST_INSTALL], [AC_DEFUN([AC_DISABLE_FAST_INSTALL])]) +m4_ifndef([_LT_AC_LANG_CXX], [AC_DEFUN([_LT_AC_LANG_CXX])]) +m4_ifndef([_LT_AC_LANG_F77], [AC_DEFUN([_LT_AC_LANG_F77])]) +m4_ifndef([_LT_AC_LANG_GCJ], [AC_DEFUN([_LT_AC_LANG_GCJ])]) +m4_ifndef([AC_LIBTOOL_RC], [AC_DEFUN([AC_LIBTOOL_RC])]) +m4_ifndef([AC_LIBTOOL_LANG_C_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_C_CONFIG])]) +m4_ifndef([_LT_AC_LANG_C_CONFIG], [AC_DEFUN([_LT_AC_LANG_C_CONFIG])]) +m4_ifndef([AC_LIBTOOL_LANG_CXX_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_CXX_CONFIG])]) +m4_ifndef([_LT_AC_LANG_CXX_CONFIG], [AC_DEFUN([_LT_AC_LANG_CXX_CONFIG])]) +m4_ifndef([AC_LIBTOOL_LANG_F77_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_F77_CONFIG])]) +m4_ifndef([_LT_AC_LANG_F77_CONFIG], [AC_DEFUN([_LT_AC_LANG_F77_CONFIG])]) +m4_ifndef([AC_LIBTOOL_LANG_GCJ_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_GCJ_CONFIG])]) +m4_ifndef([_LT_AC_LANG_GCJ_CONFIG], [AC_DEFUN([_LT_AC_LANG_GCJ_CONFIG])]) +m4_ifndef([AC_LIBTOOL_LANG_RC_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_RC_CONFIG])]) +m4_ifndef([_LT_AC_LANG_RC_CONFIG], [AC_DEFUN([_LT_AC_LANG_RC_CONFIG])]) +m4_ifndef([AC_LIBTOOL_CONFIG], [AC_DEFUN([AC_LIBTOOL_CONFIG])]) +m4_ifndef([_LT_AC_FILE_LTDLL_C], [AC_DEFUN([_LT_AC_FILE_LTDLL_C])]) --- subversion-1.5.1dfsg1.orig/debian/contrib-license-audit +++ subversion-1.5.1dfsg1/debian/contrib-license-audit @@ -0,0 +1,75 @@ +Files in 'contrib' are not necessarily copyrighted and licensed +consistently with the rest of Subversion. So they must be audited +individually for copyright statements and license terms. + +Last updated 13 Mar 2008 by Peter Samuelson for 1.5.0-beta1 tarball. + +* Same copyright and license as subversion: + cgi/tweak-log.cgi + client-side/diff-wrap.sh + client-side/incremental-update.py + client-side/search-svnlog.pl + client-side/svn-hgmerge.py + client-side/svn-push/svn-push.c + client-side/svn_update.pl + client-side/svnmerge/svnmerge-migrate-history.py + hook-scripts/check-mime-type.pl + hook-scripts/commit-block-joke.py + hook-scripts/pre-commit-check.py + hook-scripts/pre-lock-require-needs-lock.py + hook-scripts/remove-zombie-locks.py + server-side/mod_dontdothat/* + server-side/svn-fast-backup + server-side/svn-tweak-author.py + +* Same license as subversion: + client-side/svnmucc/svnmucc.c + client-side/wcgrep + hook-scripts/case-insensitive.py + server-side/svnmirror.sh + +* GNU GPL v2 or later: + client-side/asvn + client-side/emacs/dsvn.el + client-side/emacs/psvn.el + client-side/svn-clean + client-side/svn-merge-vendor.py + client-side/svn_apply_autoprops.py + client-side/svn_export_empty_files.py + client-side/svncopy/* + client-side/svnmerge/svnmerge.py + client-side/svnmerge/svnmerge_test.py + hook-scripts/syntax-check.sh + server-side/fsfsverify.py + +* Apache license v2: + server-side/authz_svn_group.py + +* MIT-like: + client-side/svn-resolve + client-side/svn-viewdiff + hook-scripts/enforcer/* + +* BSD-like: + client-side/svn2cl/* + client-side/svnmerge.sh + +* No license :(, must remove from tarball: + cgi/mirror_dir_through_svn.* + client-side/diff3wrap.bat + client-side/diffwrap.bat + client-side/svn-log.pl + client-side/svn_all_diffs.pl + client-side/svn_load_dirs/* + client-side/vim/* + hook-scripts/detect-merge-conflicts.sh + server-side/backup-recipe.sh + server-side/load_repo_with_mergesensitive_copy.sh + +* No license, but... + client-side/emacs/vc-svn.el - assumed same as the newer version on + savannah.gnu.org, which says GNU GPL v2 or later + client-side/svnmerge/svnmerge-migrate-test.sh - assumed same as + svnmerge-migrate-history.py + client-side/svnmucc/svnmucc-test.py - assumed same as svnmucc.c + server-side/svnmirror-test.sh - assumed same as svnmirror.sh --- subversion-1.5.1dfsg1.orig/debian/libapache2-svn.prerm +++ subversion-1.5.1dfsg1/debian/libapache2-svn.prerm @@ -0,0 +1,15 @@ +#!/bin/sh -e + +# hack: disabling a disabled module is not allowed - +# at least, not until apache2.2-common 2.2.3-3. +safe_a2dismod () { + if [ -e /etc/apache2/mods-enabled/$1.load ]; then + /usr/sbin/a2dismod $1 + fi +} + +if [ "$1" = "remove" ] ; then + safe_a2dismod dav_svn +fi + +#DEBHELPER# --- subversion-1.5.1dfsg1.orig/debian/subversion-tools.docs +++ subversion-1.5.1dfsg1/debian/subversion-tools.docs @@ -0,0 +1 @@ +contrib/client-side/svnmerge/svnmerge.README --- subversion-1.5.1dfsg1.orig/debian/subversion.preinst +++ subversion-1.5.1dfsg1/debian/subversion.preinst @@ -0,0 +1,43 @@ +#!/bin/sh -e + +# Periodically subversion's internal file system format changes. The change +# necessitates a dump using an older version of svnadmin (a version that +# understands the old filesystem format). Then a new svnadmin and the dumpfile +# created by the old svnadmin can be used to create a repository in the new +# format. + +# To facilitate users moving the repository from the old to the new format we +# included a statically linked copy of svnadmin starting with version 0.15.0. + + +OLD_VERSION="$2" + +case "$1" in + upgrade) + # before 0.15.0 we didn't create a static binary. + if dpkg --compare-versions "$OLD_VERSION" ge 0.15.0 ; then + if dpkg --compare-versions "$OLD_VERSION" lt 0.28.0 ; then + # Remove any previously saved versions >>= 0.15.0 and << 0.28.0 + # One might be left behind if the system has been upgraded + # from << 0.28.0 to >> 0.28.0 more than once with different + # OLD_VERSION's + rm /usr/bin/svnadmin-0.1[5-9].[0-9]* > /dev/null 2>&1 || true + rm /usr/bin/svnadmin-0.2[0-7].[0-9]* > /dev/null 2>&1 || true + cp /usr/bin/svnadmin-static /usr/bin/svnadmin-$OLD_VERSION + fi + if dpkg --compare-versions "$OLD_VERSION" lt 0.35.1 ; then + rm /usr/bin/svnadmin-0.3[0-3].[0-1]* > /dev/null 2>&1 || true + cp /usr/bin/svnadmin-static /usr/bin/svnadmin-$OLD_VERSION + fi + fi + ;; + abort-upgrade|install) + + ;; + *) + echo "preinst called with unknown argument \`$1'" >&2 + exit 1 + ;; +esac + +#DEBHELPER# --- subversion-1.5.1dfsg1.orig/debian/libapache2-svn.install +++ subversion-1.5.1dfsg1/debian/libapache2-svn.install @@ -0,0 +1,3 @@ +debian/tmp/usr/lib/apache2/modules/*.so usr/lib/apache2/modules +debian/dav_svn.load debian/dav_svn.conf etc/apache2/mods-available +tools/xslt/svnindex.* var/www/apache2-default --- subversion-1.5.1dfsg1.orig/debian/subversion.docs +++ subversion-1.5.1dfsg1/debian/subversion.docs @@ -0,0 +1,6 @@ +HACKING +README +notes/sasl.txt +notes/webdav-proxy +notes/svnsync.txt +debian/svn_1.5_releasenotes.html --- subversion-1.5.1dfsg1.orig/debian/python-subversion.examples +++ subversion-1.5.1dfsg1/debian/python-subversion.examples @@ -0,0 +1 @@ +tools/examples/*.py --- subversion-1.5.1dfsg1.orig/debian/subversion-tools.dirs +++ subversion-1.5.1dfsg1/debian/subversion-tools.dirs @@ -0,0 +1,3 @@ +usr/bin +usr/share/doc/subversion-tools +usr/share/doc/subversion/examples --- subversion-1.5.1dfsg1.orig/debian/subversion-tools.NEWS +++ subversion-1.5.1dfsg1/debian/subversion-tools.NEWS @@ -0,0 +1,16 @@ +subversion-tools (1.2.3dfsg1-1) unstable; urgency=low + + /usr/lib/subversion has moved to /usr/share/subversion; a symlink has + been left behind. This only affects installations where repositories + have been configured to use hook scripts shipped in /usr/lib/subversion, + without making local copies of the scripts. After the release of Debian + Etch, the compatibility symlink will disappear. Please update your + repository configurations accordingly. + + The other script affected is /usr/lib/subversion/hot-backup.py, which + has now moved into /usr/share/doc/subversion/examples. It was never a + supported executable (or it would live in /usr/bin). It is also no + longer needed, because "svnadmin hotcopy" now includes the same + functionality. Please use "svnadmin hotcopy" instead. + + -- Peter Samuelson Sat, 15 Oct 2005 20:09:52 -0500 --- subversion-1.5.1dfsg1.orig/debian/subversion.README.Debian +++ subversion-1.5.1dfsg1/debian/subversion.README.Debian @@ -0,0 +1,56 @@ +Subversion for Debian +===================== + +Subversion is maintained by a team at: + + http://pkg-subversion.alioth.debian.org/ + + +NFS and Repositories +-------------------- +You should never host a BDB-format repository on an NFS volume: it can +lead to data corruption and data loss. We recommend the svn:// +(svnserve) or svn+ssh:// (ssh tunnel) access methods instead. + +A FSFS repository can be hosted on NFS, but make sure you have the +'lockd' daemon (from the 'nfs-common' package) running on both client +and server. See also this Subversion FAQ entry: + + http://subversion.tigris.org/faq.html#nfs + + +The umask issue +--------------- +If you are sharing BDB repositories between multiple users, you may +wish to use the 'svnwrap' script after setting proper permissions. +This sets 'umask 002' before running the real subversion binary. See +'man svnwrap' for details. + + +Emacs and Subversion +-------------------- +There are two packages that provide support for Subversion in Emacs: + +* psvn.el: + + A PCL-CVS-style interface for Subversion. + +* vc-svn.el: + + A Subversion backend for the Emacs VC system. This is no longer + included in the Subversion package; maintainership has been taken + over by the Emacs project. It will be included in Emacs 22, and is + now available in the 'emacs-snapshot' package. It is not currently + in Xemacs. + + If you use Emacs 21 (vc-svn appears to be incompatible with Xemacs), + you will need to manually install an older version of vc-svn.el from + the Subversion site; the Emacs 22 version of vc-svn.el does not work + with older Emacsen. You can download it using Subversion itself: + + svn export \ + http://svn.collab.net/repos/svn/trunk/contrib/client-side/vc-svn.el@9195 + + Place it in /usr/local/share/emacs/21.4/site-lisp/ or elsewhere in + your autoload path. Then ensure that 'SVN appears in the list of the + custom variable vc-handled-backends. --- subversion-1.5.1dfsg1.orig/debian/libsvn-perl.install +++ subversion-1.5.1dfsg1/debian/libsvn-perl.install @@ -0,0 +1,3 @@ +debian/tmp/usr/lib/perl5 usr/lib +debian/tmp/usr/lib/libsvn_swig_perl*.so.* usr/lib +debian/tmp/usr/share/man/man3/SVN::*.3perl usr/share/man/man3 --- subversion-1.5.1dfsg1.orig/debian/libsvn-ruby.links +++ subversion-1.5.1dfsg1/debian/libsvn-ruby.links @@ -0,0 +1 @@ +usr/share/doc/libsvn-ruby1.8 usr/share/doc/libsvn-ruby --- subversion-1.5.1dfsg1.orig/debian/watch +++ subversion-1.5.1dfsg1/debian/watch @@ -0,0 +1,5 @@ +# 'man uscan' for the format and usage of this file +version=3 +opts=dversionmangle=s/\.dfsg\d+$// \ + http://subversion.tigris.org/servlets/ProjectDocumentList?folderID=260&expandFolder=74 \ + http://subversion.tigris.org/downloads/subversion-(\d+.\d+.\d+).tar.gz --- subversion-1.5.1dfsg1.orig/debian/rules +++ subversion-1.5.1dfsg1/debian/rules @@ -0,0 +1,452 @@ +#!/usr/bin/make -f + +# DEB_BUILD_OPTIONS supported: +# noopt Compile with gcc -O0 rather than -O2 +# nostrip Do not strip binaries and libraries +# debug Enable additional debug support +# nocheck Skip test suites (synonym 'notest') +# with-javahl, no-javahl | +# with-apache, no-apache | enable/disable certain packages +# with-ruby, no-ruby | + +export DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) +export DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) +export DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH) + +# Fully functional Java support is still a bit spotty on some Debian +# architectures. DISABLE_JAVAHL_ARCHS overrides ENABLE_JAVAHL=yes. +# Note: the Build-Depends line in debian/control must be kept in sync +# with DISABLE_JAVAHL_ARCHS. + +ENABLE_JAVAHL := yes +DISABLE_JAVAHL_ARCHS := alpha arm hppa m68k mips mipsel hurd-i386 +ifneq (,$(filter $(DEB_HOST_ARCH), $(DISABLE_JAVAHL_ARCHS))) + ENABLE_JAVAHL := +endif + +# We may need to disable libapache2-svn and/or libsvn-ruby*. +ENABLE_APACHE := yes +ENABLE_RUBY := yes + +DEB_BUILDDIR := BUILD +MAKE_B := $(MAKE) -C $(DEB_BUILDDIR) + +export LANG := C +export HOME := $(DEB_BUILDDIR)/dummy_home + +include /usr/share/quilt/quilt.make + +# ENABLE_FOO -> DEB_OPT_WITH_FOO=1 +# DEB_BUILD_OPTIONS='foo bar' -> DEB_OPT_FOO=1, DEB_OPT_BAR=1 +# DEB_BUILD_OPTIONS='no-foo' -> DEB_OPT_WITH_FOO="" +$(foreach o, JAVAHL APACHE RUBY, $(if $(filter y yes 1,$(ENABLE_$o)), \ + $(eval DEB_OPT_WITH_$o := 1),$(eval DEB_OPT_WITH_$o :=))) +d_b_o:=$(shell echo "$$DEB_BUILD_OPTIONS" | tr 'a-z-,' 'A-Z_ ') +$(foreach o, $(d_b_o), \ + $(if $(findstring =,$o), $(eval DEB_OPT_$o), $(eval DEB_OPT_$o := 1))) +$(foreach o, $(filter NO_%,$(d_b_o)), $(eval DEB_OPT_$(subst NO_,WITH_,$o) :=)) +$(if $(DEB_OPT_PARALLEL),$(eval MAKEFLAGS += -j$(DEB_OPT_PARALLEL))) + +# How to fix "#!/usr/bin/env " lines: $(call fix_shebangs_in, /your/dir) +fix_shebangs_in = \ + find $1 -type f | xargs -r egrep -m1 -c '^\#! ?/' | sed -n 's/:1//p' |\ + xargs -r sed -i -e 's:^\#! */usr/bin/env perl.*:\#!/usr/bin/perl -w:' \ + -e 's:^\#! */usr/bin/env pyth.*:\#!/usr/bin/python:' \ + -e 's:^\#! */usr/bin/env ruby.*:\#!/usr/bin/$(RUBY):' + +PERL_DIR := $(DEB_BUILDDIR)/subversion/bindings/swig/perl/native +PY_DIR := $(DEB_BUILDDIR)/subversion/bindings/swig/python +PYVERSIONS := $(shell pyversions -vr) +PYDEFAULT := $(shell pyversions -vd) + +allpy = \ + set -e; for v in $(PYVERSIONS); do \ + $(RM) $(PY_DIR); \ + ln -fs python$$v $(PY_DIR); \ + $1; \ + done + +allpydbg = \ + set -e; for v in $(PYVERSIONS); do \ + $(RM) $(PY_DIR); \ + ln -fs python$$v-dbg $(PY_DIR); \ + $1; \ + done + +confflags := \ + --prefix=/usr \ + --mandir=\$${prefix}/share/man \ + --with-apr=/usr \ + --with-apr-util=/usr \ + --with-neon=/usr \ + --with-berkeley-db=/usr \ + --with-sasl=/usr \ + --with-editor=/usr/bin/editor \ + --with-ruby-sitedir=/usr/lib/ruby \ + --with-swig=/usr + +ifdef DEB_OPT_DEBUG + confflags+= --enable-debug +endif +export EXTRA_CFLAGS := -O2 +ifdef DEB_OPT_NOOPT + EXTRA_CFLAGS := -O0 +endif + +export DH_OPTIONS +ifdef DEB_OPT_WITH_JAVAHL + # jikes 1.22 cannot compile javahl. + confflags += --enable-javahl --without-jikes \ + --with-jdk=/usr/lib/jvm/default-java \ + --with-junit=/usr/share/java/junit.jar +else + DH_OPTIONS += -Nlibsvn-java + confflags += --disable-javahl +endif + +ifdef DEB_OPT_WITH_APACHE + confflags += --with-apxs=/usr/bin/apxs2 --disable-mod-activation +else + confflags += --without-apxs + DH_OPTIONS += -Nlibapache2-svn +endif + +RUBY := $(shell dh_listpackages | sed -ne '/libsvn-ruby1/s//ruby1/p') +ifndef DEB_OPT_WITH_RUBY + DH_OPTIONS += -Nlibsvn-ruby -Nlibsvn-$(RUBY) + RUBY := fooby +endif + + +# Set autoconf cross-compile mode correctly. +# Also disable testsuite if cross-compiling. +ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE)) + confflags += --build $(DEB_HOST_GNU_TYPE) +else + confflags += --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE) + DEB_OPT_NOCHECK := 1 +endif + + +# I'm not trying to be difficult: this check exists because building as +# root really _does_ fail. The failure mode as of 1.4.0 is test 17 +# from switch_tests.py. Upstream response is "so don't build as root". +# (fakeroot does not fail, as it does not wrap the access(2) syscall.) +# +# We run this code from build-arch, since that's what actually fails as +# root, but also from autogen, since that will halt the build earlier. +define DONT_BE_ROOT + @if [ $$(id -u) = 0 ] && [ -z "$(FAKEROOTKEY)" ]; then \ + echo >&2 "***"; \ + echo >&2 "*** Building as root is not supported ***"; \ + false; \ + fi +endef + +debian/stamp-autogen: $(QUILT_STAMPFN) + $(DONT_BE_ROOT) + ./autogen.sh + touch $@ + +debian/stamp-configure: $(QUILT_STAMPFN) debian/stamp-autogen + dh_testdir + + test -e patches || ln -s debian/patches patches + mkdir -p $(DEB_BUILDDIR) + cd $(DEB_BUILDDIR) && \ + PYTHON=/usr/bin/python RUBY=/usr/bin/$(RUBY) \ + $(CURDIR)/configure $(confflags) + + # Subversion upstream ships with Swig 1.3.25 pregenerated + # files, which may interact badly with the build if Debian swig + # is not version 1.3.25 - particularly with swig 1.3.24. + # Thus we unconditionally delete the pregenerated files. + +$(MAKE_B) extraclean-swig + for v in $(PYVERSIONS); do \ + cp -la $(PY_DIR) $(PY_DIR)$$v; \ + done + for v in $(PYVERSIONS); do \ + cp -la $(PY_DIR) $(PY_DIR)$$v-dbg; \ + done + $(RM) -r $(PY_DIR) + + touch $@ + +build: debian/stamp-build-arch debian/stamp-build-indep + +check_defs := CLEANUP=true LC_ALL=C +check_swig := check-swig-py check-swig-pl $(if $(DEB_OPT_WITH_RUBY),check-swig-rb) +check_all := $(check_swig) $(if $(DEB_OPT_WITH_JAVAHL),check-javahl) check +check-help: + @echo "$(MAKE) $(check_all)" + +check check-swig-rb check-javahl: + +$(MAKE_B) $@ $(check_defs) + +check-swig-pl: + +$(MAKE_B) $@ $(check_defs) + $(MAKE) -C $(PERL_DIR) test LC_ALL=C + +check-swig-py: + $(call allpy, \ + $(MAKE_B) $@ PYTHON=python$$v PYVER=$$v $(check_defs)) + $(call allpydbg, \ + $(MAKE_B) $@ PYTHON=python$$v-dbg PYVER=$${v}_d \ + PYTHON_INCLUDES=-I/usr/include/python$${v}_d $(check_defs)) + +build-arch: debian/stamp-build-arch +debian/stamp-build-arch: debian/stamp-configure + dh_testdir + $(DONT_BE_ROOT) + + # note: autogen-swig does not support -jN + $(call allpy, $(MAKE_B) -j1 autogen-swig) + $(call allpydbg, $(MAKE_B) -j1 autogen-swig) + ln -sf python$(PYDEFAULT) $(PY_DIR) + +$(MAKE_B) all tools SVN_DB_LIBS=-ldb + $(call allpy, \ + $(MAKE_B) swig-py PYTHON=python$$v PYVER=$$v \ + PYTHON_INCLUDES=-I/usr/include/python$$v \ + swig_pydir=/usr/lib/python$$v/site-packages/libsvn \ + swig_pydir_extra=/usr/lib/python$$v/site-packages/svn) + $(call allpydbg, \ + $(MAKE_B) swig-py PYTHON=python$$v PYVER=$${v}_d \ + PYTHON_INCLUDES=-I/usr/include/python$${v}_d \ + EXTRA_SWIG_PY_CFLAGS=-O0 \ + swig_pydir=/usr/lib/python$$v/site-packages/libsvn \ + swig_pydir_extra=/usr/lib/python$$v/site-packages/svn) + ln -sf python$(PYDEFAULT) $(PY_DIR) + # note: swig-pl seems to have trouble with -jN + +$(MAKE_B) -j1 swig-pl + $(MAKE) -C $(PERL_DIR) all \ + OPTIMIZE="-g -Wall $(EXTRA_CFLAGS)" +ifdef DEB_OPT_WITH_RUBY + +$(MAKE_B) swig-rb +endif +ifdef DEB_OPT_WITH_JAVAHL + +$(MAKE_B) -j1 javahl +endif + touch $@ + +ifndef DEB_OPT_NOCHECK + @echo "###################################################" + @echo "Running testsuite - may take a while. To disable," + @echo "use DEB_BUILD_OPTIONS=nocheck or edit debian/rules." + @echo + $(MAKE) -f debian/rules $(check_swig) + + ifdef DEB_OPT_WITH_JAVAHL + # This fails on current free JVMs, according to Blair Zajac. + # Thus the "-" prefix, to ignore failure, for now. + -$(MAKE) -f debian/rules check-javahl + endif + + # Run 'check' last, as it takes longest. 'cat tests.log' is for + # obtaining diagnostics from buildd logs. + @if ! $(MAKE) -f debian/rules check; then \ + echo "###################################################"; \ + echo "Testsuite failed, 'tests.log' follows:"; echo; \ + cat $(DEB_BUILDDIR)/tests.log; \ + exit 1; \ + fi +endif + touch $@ + +build-indep: debian/stamp-build-indep +debian/stamp-build-indep: debian/stamp-configure + +$(MAKE_B) doc-api + $(MAKE) -C $(DEB_BUILDDIR) locale-gnu-pot + touch $@ + +clean: unpatch + dh_testdir + dh_clean + $(RM) patches + $(MAKE) -C debian/tools clean + ! [ -f $(DEB_BUILDDIR)/Makefile ] || $(MAKE_B) extraclean-swig distclean + $(RM) -r $(DEB_BUILDDIR) + $(RM) build-outputs.mk gen-make.opts subversion/svn_private_config.h.in + find * -name \*.pyc -print0 | xargs -0 $(RM) + # these are (re)generated by autogen.sh + $(RM) subversion/bindings/swig/proxy/*.swg + $(RM) configure build/libtool.m4 build/ltmain.sh + $(RM) subversion/po/subversion.pot + $(RM) -r debian/tmp-dbg + $(RM) debian/stamp-* + +debian/stamp-install-common: + dh_testdir + dh_testroot + dh_clean -k + for package in `dh_listpackages` ; do \ + lintiandir=debian/$$package/usr/share/lintian/overrides; \ + if grep -q ^$$package: debian/lintian-overrides; then \ + mkdir -p $$lintiandir; \ + grep -B1 ^$$package: debian/lintian-overrides \ + > $$lintiandir/$$package; \ + fi; \ + done + touch $@ + +debian/stamp-install-indep: debian/stamp-build-indep debian/stamp-install-common + dh_installdirs -i + dh_install -i + + mkdir -p debian/libsvn-doc/usr/share/doc/libsvn1 + mkdir -p debian/libsvn-doc/usr/share/doc/libsvn-doc + cp -a $(DEB_BUILDDIR)/doc/doxygen/html \ + debian/libsvn-doc/usr/share/doc/libsvn1/ + ln -s ../libsvn1/html debian/libsvn-doc/usr/share/doc/libsvn-doc/ + mkdir debian/libsvn-doc/usr/share/doc/libsvn1/examples + ln -s ../libsvn1/examples debian/libsvn-doc/usr/share/doc/libsvn-doc/ + + # Install files for 'subversion-tools' package. + install $(DEB_BUILDDIR)/tools/backup/hot-backup.py \ + debian/subversion-tools/usr/bin/svn-hot-backup + + rm debian/subversion-tools/usr/share/subversion/hook-scripts/*.in + rm -r debian/subversion-tools/usr/share/subversion/hook-scripts/mailer/tests +ifndef DEB_OPT_WITH_RUBY + rm debian/subversion-tools/usr/share/subversion/hook-scripts/*.rb +endif + + # Fix some scripts not to use #!/usr/bin/env. + $(call fix_shebangs_in, debian/*/usr/bin \ + debian/subversion-tools/usr/share/subversion/hook-scripts) + cd debian/subversion-tools/usr/share/subversion/hook-scripts; \ + chmod 0755 commit-email.pl commit-access-control.pl \ + mailer/mailer.py verify-po.py svnperms.py; + + # Remove suffixes from binaries in /usr/bin + prename 's/\.(sh|pl|rb|py)$$//' debian/*/usr/bin/* + + pod2man -c 'User Commands' -r "" contrib/client-side/svn-clean \ + $(DEB_BUILDDIR)/contrib/client-side/svn-clean.1 + + touch $@ + +debian/stamp-install-arch: debian/stamp-build-arch debian/stamp-install-common + dh_installdirs -s + + $(MAKE_B) local-install install-tools \ + DESTDIR=$(CURDIR)/debian/tmp toolsdir=/usr/bin + sed -i 's:/usr/lib/lib\([^ ]*\).la:-l\1:g' debian/tmp/usr/lib/*.la + + $(call allpydbg, \ + $(MAKE_B) install-swig-py DESTDIR=$(CURDIR)/debian/tmp \ + PYTHON=python$$v-dbg PYVER=$${v}_d \ + PYTHON_INCLUDES=-I/usr/include/python$${v}_d \ + EXTRA_SWIG_PY_CFLAGS=-O0 \ + swig_pydir=/usr/lib/python$$v/site-packages/libsvn \ + swig_pydir_extra=/usr/lib/python$$v/site-packages/svn) + for i in $$(find debian/tmp/usr/lib/python* -name '*.so'); do \ + b=$$(basename $$i .so); \ + mv $$i $$(dirname $$i)/$${b}_d.so; \ + done + find debian/tmp/usr/lib/python* \ + ! -type d ! -name '*.so' ! -name '*.so.*' | xargs -r rm -f + $(call allpy, \ + $(MAKE_B) install-swig-py DESTDIR=$(CURDIR)/debian/tmp \ + PYTHON=python$$v PYVER=$$v \ + swig_pydir=/usr/lib/python$$v/site-packages/libsvn \ + swig_pydir_extra=/usr/lib/python$$v/site-packages/svn) + $(RM) debian/tmp/usr/lib/python*/site-packages/libsvn/*.la + $(RM) debian/tmp/usr/lib/python*/site-packages/libsvn/*.a + +ifdef DEB_OPT_WITH_JAVAHL + $(MAKE_B) install-javahl \ + DESTDIR=$(CURDIR)/debian/tmp \ + javahl_javadir=/usr/share/java \ + javahl_libdir=/usr/lib \ + javahl_javahdir=/usr/include/svn-javahl +endif + + # Create our default configuration files to be installed in + # /etc/subversion/ + $(MAKE) -C debian/tools \ + LD_LIBRARY_PATH=$(CURDIR)/debian/tmp/usr/lib \ + DEB_SRCDIR=$(CURDIR) DEB_BUILDDIR=$(CURDIR)/$(DEB_BUILDDIR) + + $(MAKE_B) install-swig-pl-lib \ + DESTDIR=$(CURDIR)/debian/tmp + $(MAKE) -C $(PERL_DIR) install \ + MAN3EXT=3perl DESTDIR=$(CURDIR)/debian/tmp + +ifdef DEB_OPT_WITH_RUBY + $(MAKE_B) install-swig-rb \ + DESTDIR=$(CURDIR)/debian/tmp + find debian/tmp/usr/lib/ruby \( -name \*.a -o -name \*.la \) -print0 | \ + xargs -0 $(RM) +endif + dh_install -s + + # move the python debug modules to the -dbg package + (cd debian/python-subversion && tar cf - $$(find -name '*_d.so')) \ + | (cd debian/python-subversion-dbg && tar xf - ) + mv debian/python-subversion/usr/lib/libsvn_swig_py*d-1.so.* \ + debian/python-subversion-dbg/usr/lib/ + find debian/python-subversion -name '*_d.so' | xargs rm -f + + install -m644 tools/client-side/bash_completion \ + debian/subversion/etc/bash_completion.d/subversion + +ifdef DEB_OPT_WITH_JAVAHL + install subversion/mod_authz_svn/INSTALL \ + debian/libapache2-svn/usr/share/doc/libapache2-svn/INSTALL.authz +endif + + cp tools/examples/svnshell.py debian/python-subversion/usr/bin/svnshell + $(call fix_shebangs_in, debian/python-subversion/usr/bin/svnshell) + + touch $@ + +binary-indep: debian/stamp-install-indep + dh_testdir + dh_testroot + dh_link -i + dh_installdocs -i + dh_installexamples -i + $(call fix_shebangs_in, debian/*/usr/share/doc/*/examples) + dh_installman -i + dh_installchangelogs -i CHANGES + dh_compress -i + dh_fixperms -i + dh_perl -i + dh_installdeb -i + dh_gencontrol -i + dh_md5sums -i + dh_builddeb -i + +binary-arch: debian/stamp-install-arch + dh_testdir + dh_testroot + dh_link -s + dh_installdocs -s + dh_installexamples -s + $(call fix_shebangs_in, debian/*/usr/share/doc/*/examples) + dh_installchangelogs -s CHANGES + dh_fixperms -s + dh_strip -s -Npython-subversion -Npython-subversion-dbg + DH_COMPAT=5 dh_strip -ppython-subversion --dbg-package=python-subversion-dbg + rm -rf debian/python-subversion-dbg/usr/share/doc/python-subversion-dbg + ln -s python-subversion \ + debian/python-subversion-dbg/usr/share/doc/python-subversion-dbg + dh_compress -s + + # dh_makeshlibs (1) creates shlibs files and (2) generates + # calls to 'ldconfig' in postinst/postrm. We want (1) only for + # libsvn1, but (2) for the swig packages too. + dh_makeshlibs -s -Xjava -V'libsvn1 (>= 1.5.0)' + $(RM) debian/libsvn-*/DEBIAN/shlibs debian/python-subversion/DEBIAN/shlibs + dh_perl -s + dh_pysupport -s + dh_installdeb -s + dh_shlibdeps -s -l$(CURDIR)/debian/libsvn1/usr/lib + dh_gencontrol -s + dh_md5sums -s + dh_builddeb -s + +binary: binary-indep binary-arch + +.PHONY: build build-arch build-indep binary binary-arch binary-indep +.PHONY: clean check-help $(check_all) --- subversion-1.5.1dfsg1.orig/debian/svnwrap.sh +++ subversion-1.5.1dfsg1/debian/svnwrap.sh @@ -0,0 +1,35 @@ +#!/bin/sh +# +# svnwrap.sh: wrapper subversion client programs, which sets umask=002. +# +# Copyright 2006 by Peter Samuelson +# Permission is granted to everyone to use and distribute this work, +# without limitation, modified or unmodified, in any way, for any purpose. +# +# This script is not always needed: for somewhat complicated reasons, +# subversion already Does The Right Thing for FSFS repositories but +# cannot feasibly do so for BDB. +# +# See the manpage for more details. + +umask 002 + +known_progs='svn svnlook svnserve svnadmin svnversion' +known_progs_path=/usr/bin + +usage () { + echo >&2 "Usage: svnwrap {program} [args...]" + echo >&2 "Valid programs: $known_progs" + exit 1 +} + +exe= +arg0=$(basename "$0") +case " $known_progs " in + *" $arg0 "*) exe=$arg0 ;; + *" $1 "*) exe=$1; shift ;; + *) usage ;; +esac +case "$exe" in *" "*) usage ;; esac + +exec $known_progs_path/$exe "$@" --- subversion-1.5.1dfsg1.orig/debian/dav_svn.load +++ subversion-1.5.1dfsg1/debian/dav_svn.load @@ -0,0 +1,3 @@ +# Depends: dav +LoadModule dav_svn_module /usr/lib/apache2/modules/mod_dav_svn.so +LoadModule authz_svn_module /usr/lib/apache2/modules/mod_authz_svn.so --- subversion-1.5.1dfsg1.orig/debian/changelog +++ subversion-1.5.1dfsg1/debian/changelog @@ -0,0 +1,2147 @@ +subversion (1.5.1dfsg1-1ubuntu2) intrepid; urgency=low + + * (Build-)depend on default-jre-headless/-jdk. + * Do not apply java-build patch. + + -- Matthias Klose Thu, 31 Jul 2008 08:29:58 +0000 + +subversion (1.5.1dfsg1-1ubuntu1) intrepid; urgency=low + + * Merge with Debian; remaining changes: + - Create pot file on build. + - Build a python-subversion-dbg package. + + -- Matthias Klose Sun, 27 Jul 2008 11:21:14 +0200 + +subversion (1.5.1dfsg1-1) unstable; urgency=low + + * New upstream release. + - Fixes some major corner cases in merge tracking. + - Fixes several crash bugs and regressions from 1.4 -> 1.5. + - patches/ruby-test-wc-normalize-compared-value: Remove, applied upstream. + * Symlink libsvn_ra_dav-1.so.1 -> libsvn_ra_neon-1.so.1 to avoid + breaking old packages that mistakenly linked to ra_dav. This was not + and is not supported, but at least one package did it. (Closes: #490423) + * Add a NEWS entry for 1.5.x in general. + * debian/watch: Add dversionmangle setting, thanks to lintian. + + -- Peter Samuelson Thu, 24 Jul 2008 15:48:17 -0500 + +subversion (1.5.0dfsg1-4ubuntu2) intrepid; urgency=low + + * Explicitely build-depend on libdb4.6-dev to match the db dependency + of libaprutil1-dev. + + -- Matthias Klose Mon, 07 Jul 2008 14:15:22 +0200 + +subversion (1.5.0dfsg1-4ubuntu1) intrepid; urgency=low + + * Merge with Debian; remaining changes: + - Create pot file on build. + - Build a python-subversion-dbg package. + + -- Matthias Klose Mon, 07 Jul 2008 13:44:50 +0200 + +subversion (1.5.0dfsg1-4) unstable; urgency=medium + + * Work around bug where 'make javahl' is not -j-safe. + + -- Peter Samuelson Mon, 07 Jul 2008 01:37:38 -0500 + +subversion (1.5.0dfsg1-3) unstable; urgency=medium + + * Bump shlibs file to libsvn1 (>= 1.5.0). (Closes: #488949) + * Fix typo in Build-Conflicts (libsvn-dev, not libsvn1-dev). + * Fix svnwrap(1) manpage inetd.conf example. (Closes: #462313) + + -- Peter Samuelson Wed, 02 Jul 2008 08:23:31 -0500 + +subversion (1.5.0dfsg1-2) unstable; urgency=low + + * Reenable Java support. + * patches/java-build: New patch to hack around incompatibilities between + Sun javah and gcj javah. + * Remove the last remnants of libsvn-javahl from the source package. + * Include upstream release notes file svn_1.5_releasenotes.html. + * Add svn-populate-node-origins-index (used in upgrading a repository + to 1.5) and svnmucc (useful client tool) to the subversion package. + + -- Peter Samuelson Mon, 30 Jun 2008 00:22:28 -0500 + +subversion (1.5.0dfsg1-1ubuntu2) intrepid; urgency=low + + * Do not build-depend on serf. The client can be compiled against either + libneon or libserf (or both), as they offer competing implementations. + serf is available in universe only. + + -- Matthias Klose Tue, 24 Jun 2008 15:05:21 +0000 + +subversion (1.5.0dfsg1-1ubuntu1) intrepid; urgency=low + + * Merge with Debian; remaining changes: + - Create pot file on build. + - Build a python-subversion-dbg package. + + -- Matthias Klose Tue, 24 Jun 2008 14:13:13 +0200 + +subversion (1.5.0dfsg1-1) experimental; urgency=low + + * New upstream release + - Fixes many bugs including: + - Translation errors (Closes: #404982, #451514) + - Now exports externals from a working copy. (Closes: #448864) + - Newer psvn.el provided. (Closes: #393651, #441994) + - 'svn export' handles externals now. (Closes: #448864) + - Perl module destructor doesn't crash. (Closes: #401340) + - Update debian/contrib-license-audit, README.Debian-tarball + - Remove obsolete patches: jelmer-python-bindings, kaffe, + kaffe-javah, limit-zlib-link, neon27, python-memleak, + ruby-newswig, ruby-test-ra-race, svn-clean-manpage, + svn_load_dirs, swig-warning-124, testsuite-dont-use-os-popen3 + * rules: Run autogen-swig for each python version. + (Not strictly needed, but it is the simplest approach.) + * Switch from dpatch to quilt. + * Policy 3.8.0: + - copyright: Delete copy of common-licenses/Apache-2.0 + - control: Add Homepage field; + Wrap Uploaders field, which was > 80 columns + - rules: Support DEB_BUILD_OPTIONS=parallel=n; + Require DEB_BUILD_OPTIONS to be space-separated + - README.source: New file explaining quilt + * control: Add XS-Python-Version header, to suppress a warning + * control: Build-Conflicts: libsvn1-dev (<< 1.5); libtool can cause + trouble with installed .so files that don't contain needed symbols. + * control: New Build-Depends: libserf-0-0-dev, libsasl2-dev. + * control: Simplify Depends/Recommends to assume etch or newer. (Keep + some old Conflicts/Replaces/Provides.) Delete the libsvn-javahl etch + transition package. + * control: libsvn-java: I believe it needs java5 now, not just java2. + Hence gij | java5-runtime-headless. + * patches/perl-test-syntax-error: New patch borrowed from upstream, to + fix a perl5.10 issue in one of the tests. + * patches/ruby-test-wc-normalize-compared-value: New patch borrowed from + upstream, to fix a ruby test failure. + * patches/svn2cl: Split into svn2cl-upstream and svn2cl-debian. + Update svn2cl-upstream to 0.10 from upstream trunk. + * patches/apr-abi: Small adjustment to reduce libtool warnings. + * patches/out-of-tree-build-fixes: New patch: fix a few issues with + building outside the source tree. + * rules: Disable Java for the first upload to experimental, as I'm still + working on fixing that. + + -- Peter Samuelson Fri, 20 Jun 2008 21:53:29 -0500 + +subversion (1.4.6dfsg1-5) UNRELEASED; urgency=low + + * Downgrade libsvn-dev "Depends: libneon27-gnutls-dev" to Suggests and + add zlib1g-dev. These are for static linking. (Closes: #482512) + + -- Peter Samuelson Thu, 29 May 2008 20:29:41 -0500 + +subversion (1.4.6dfsg1-4) unstable; urgency=low + + * Disable java on alpha and hppa, as requested by Matthias Klose. + (Closes: #477908) + * Switch from neon27 to neon27-gnutls. (Closes: #478142) + * patches/testsuite-dont-use-os-popen3: New patch (from upstream): + use popen2.Popen3 instead of os.popen3. (Closes: #479079) + * patches/svn-clean-ignore: New feature patch, a mechanism to specify + files which, though unversioned, 'svn-clean' should not remove. + Suggested by Jonathan Hall. + * Add another -j1 to debian/rules, to fix a parallel build problem. + * patches/ssh-no-controlmaster: New patch to avoid a bad interaction + with OpenSSH connection sharing. (Closes: #413102) + + -- Peter Samuelson Sat, 03 May 2008 00:35:18 -0500 + +subversion (1.4.6dfsg1-3) unstable; urgency=low + + * patches/neon27: update for neon 0.28. (Closes: #476117) + * Build for all supported python versions. Loosely based on an Ubuntu + patch by Matthias Klose. (Closes: #446636) + + -- Peter Samuelson Mon, 14 Apr 2008 11:08:22 -0500 + +subversion (1.4.6dfsg1-2ubuntu1) hardy; urgency=low + + * Merge with Debian; remaining changes: + - Create pot file on build. + - Fix bashisms in tools/po/po-update.sh. + - Build for all supported python versions. + - Build a python-subversion-dbg package. + - debian/rules: Do not let the failed ruby swig tests fail the build. They + are currently broken, work in progress in Debian (Debian #453166). + - Drop hppa java support. + + -- Matthias Klose Tue, 11 Mar 2008 06:28:25 +0000 + +subversion (1.4.6dfsg1-2) unstable; urgency=low + + * subversion.NEWS: Add a note about the db4.6 upgrade. (Closes: #465432) + * rules: use dh_link rather than hand-rolled symlink management. + Closes: #465609 in the process. + * rules: Define DEB_HOST_ARCH and friends before using them, to fix + FTBFSes on the non-java architectures. + + -- Peter Samuelson Sat, 08 Mar 2008 14:27:22 -0600 + +subversion (1.4.6dfsg1-0ubuntu1) hardy; urgency=low + + * Merge with Debian svn repository (trunk r823); remaining changes: + - Create pot file on build. + - Fix bashisms in tools/po/po-update.sh. + - Build for all supported python versions. + - Build a python-subversion-dbg package. + - debian/rules: Do not let the failed ruby swig tests fail the build. They + are currently broken, work in progress in Debian (Debian #453166). + - Drop hppa java support. + + -- Matthias Klose Wed, 30 Jan 2008 12:45:05 +0100 + +subversion (1.4.6dfsg1-1) unstable; urgency=low + + * New upstream version. + * Build with db 4.6, to match apr-util. + * patches/svn-clean-manpage: New patch, fix a small typo. (Closes: #441827) + * patches/neon27: New patch from upstream trunk to support neon 0.27. + - control: build-depend on libneon27-dev. + - rules: no longer --disable-neon-version-check. + * patches/ruby-newswig: Support swig 1.3.33. (Closes: #453166) + * patches/python-memleak: New patch to fix a serious memory leak in the + Python bindings. Thanks to Jelmer Vernooij. (Closes: #428755) + * control: Policy 3.7.3. + * control: spell 'Source-Version' as 'binary:Version' for political + correctness. (Or for clarity.) + * control: add appropriate Vcs-Svn and Vcs-Browser fields. + * control: subversion-tools Recommends: rsync. (Closes: #459023) + * patches/svn2cl: update svn2cl to 0.9 (from upstream trunk). + * patches/commit-email: use original 'sendmail' commit-email.pl mode, + rather than the direct SMTP feature. (Closes: #447824) + * rules: do not run 'dh_testroot' or 'make extraclean' in clean rule. + * rules: rewrite DEB_BUILD_OPTIONS support; remove 'notest' synonym, as + the world seems to be standardizing on 'nocheck'. + * rules: remove 'DEB_BUILD_OPTIONS=-j[N]' support, add support for the + new 'dpkg-buildpackage -j[N]' feature. + * rules: add an option to disable ruby bindings. Though it turns out + we don't need it ... yet. + + -- Peter Samuelson Mon, 11 Feb 2008 23:49:02 -0600 + +subversion (1.4.4dfsg1-1ubuntu5) hardy; urgency=medium + + * Add debian/patches/python-memleak: Fix major memory leak in the + Python bindings. Taken from Debian SVN head. (LP: #54253) + + -- Jelmer Vernooij Fri, 18 Jan 2008 01:28:28 +0100 + +subversion (1.4.4dfsg1-1ubuntu4) hardy; urgency=low + + * debian/control: + - libneon 26 -> 27. + - libdb 4.4 -> 4.6. + - Bump libaprutil1-dev build dependency to ensure that we build against + one that also links against db4.6. + * Add debian/patches/neon27: Fix configure tests for defining the + right version #defines for libneon27. Taken from Debian SVN head. + * Add debian/patches/ruby-newswig: Fix duplicate symbols in SWIG so that it + actually builds. Taken from Debian SVN head. (Debian #458771) + * debian/rules: Do not let the failed ruby swig tests fail the build. They + are currently broken, work in progress in Debian (Debian #453166). + + -- Martin Pitt Thu, 03 Jan 2008 10:16:24 +0100 + +subversion (1.4.4dfsg1-1ubuntu3) gutsy; urgency=low + + * Build separate libsvn_swig_py libraries for each python version. + LP: #91848. + + -- Matthias Klose Thu, 27 Sep 2007 11:10:46 +0200 + +subversion (1.4.4dfsg1-1ubuntu2) gutsy; urgency=low + + * Drop hppa java support for now + + -- LaMont Jones Mon, 13 Aug 2007 15:43:46 -0600 + +subversion (1.4.4dfsg1-1ubuntu1) gutsy; urgency=low + + * Merge with Debian; remaining changes: + - Create pot file on build. + - Fix bashisms in tools/po/po-update.sh. + - Build for all supported python versions. + - Build a python-subversion-dbg package. + + -- Matthias Klose Mon, 11 Jun 2007 11:24:52 +0200 + +subversion (1.4.4dfsg1-1) unstable; urgency=low + + * New upstream version. + - Fixes rare case of data loss / repository corruption. (Closes: #419348) + - Fixes minor security inconsistency regarding restricted paths being + copied to unrestricted paths, CVE-2007-2448. (Closes: #428194) + * Fix note in README.Debian about how to download vc-svn.el. + Thanks to Michael Richters. (Closes: #416582) + * rules: configure --disable-neon-version-check, to allow use of neon 0.26.3. + * rules: replace $(PWD) with $(CURDIR) to appease lintian. + Our use of PWD was safe, this is just a cleanup. + * rules: ship a shlibs file only for libsvn1; nobody should ever link to + the libraries in other packages. (Thanks again to lintian.) + - lintian-overrides: inform lintian that it's ok not to have shlibs + files in the swig-based packages + + -- Peter Samuelson Thu, 07 Jun 2007 00:57:11 -0500 + +subversion (1.4.3dfsg1-1ubuntu1) feisty; urgency=low + + * Merge from Debian experimental; remaining changes: + - Create pot file on build. + - Fix bashisms in tools/po/po-update.sh. + - Build for all supported python versions. + - Build a python-subversion-dbg package. + + -- Matthias Klose Tue, 20 Mar 2007 06:47:26 +0100 + +subversion (1.4.3dfsg1-1) experimental; urgency=low + + [ Peter Samuelson ] + * New upstream version. + - patches/neon26 removed; applied upstream + * rules: Small cleanups, thanks to Patrick Desnoyers. + * patches/jelmer-python-bindings: Remove some python2.4isms (should help + with porting to sarge and elsewhere). Thanks to Romain Francoise, and + upstream. + + -- Peter Samuelson Thu, 25 Jan 2007 18:30:04 -0600 + +subversion (1.4.2dfsg1-2ubuntu5) feisty; urgency=low + + * Build-depend on python-all-dev, python-all-dbg. + + -- Matthias Klose Sun, 18 Feb 2007 15:44:48 +0100 + +subversion (1.4.2dfsg1-2ubuntu4) feisty; urgency=low + + * Build a python-subversion-dbg package. + * Add modules for all supported python versions. + * Set Ubuntu maintainer address. + + -- Matthias Klose Sun, 18 Feb 2007 00:43:04 +0100 + +subversion (1.4.2dfsg1-2ubuntu3) feisty; urgency=low + + * Rebuild for python2.5 as the default python version. + + -- Matthias Klose Fri, 12 Jan 2007 13:18:35 +0000 + +subversion (1.4.2dfsg1-2ubuntu2) feisty; urgency=low + + * Fix bashisms in tools/po/po-update.sh. + + -- Matthias Klose Wed, 13 Dec 2006 20:29:01 +0100 + +subversion (1.4.2dfsg1-2ubuntu1) feisty; urgency=low + + * Merge with Debian unstable; remaining changes: + - Create pot file on build. + + -- Matthias Klose Wed, 13 Dec 2006 17:57:16 +0100 + +subversion (1.4.2dfsg1-2) unstable; urgency=medium + + [ Peter Samuelson ] + * rules: fix 'dontberoot' target not to run when it shouldn't. + (Closes: #396435) + * Add subversion-tools Conflicts: kdesdk-scripts (<= 4:3.5.5-1). + I'm told that their next release will remove the 'svn-clean' script, + which is quite similar to the one in subversion-tools. (See: #397874) + * Add manpages for svn-clean, svn-hot-backup, svn-fast-backup, and + svn-backup-dumps. Troy Heber helped write the last three. + * Ship svnmerge.README in subversion-tools. + + -- Peter Samuelson Fri, 10 Nov 2006 08:45:01 -0600 + +subversion (1.4.2dfsg1-1) unstable; urgency=low + + [ Peter Samuelson ] + * New upstream release. + - No longer ships IETF draft spec. (Closes: #393414) + - patches/svnsync-manpage, parts of patches/neon26, patches/svnshell: + Obsolete, removed. + - Re-roll upstream tarball to remove some unlicensed files from the + "contrib" directory. Update debian/copyright regarding other files + in "contrib". (Closes: #394395) + * patches/neon26: update for 1.4.2, add neon 0.26.2 to the whitelist. + * Improve libapache2-svn installation experience: + - Use a2enmod/a2dismod instead of hand-hacking. + - dav_svn.conf: Comment everything out. (Many will want to use + sites-available/* rather than dav_svn.conf anyway.) Fix some of + the text and add more. (Closes: #392805) + * libsvn-java: Remove alternative Depends: java1-runtime. + It does in fact require JRE 1.2 (java2-runtime). + * Build with neon26 instead of neon25. + * Ship some example code from upstream in the various devel packages. + - patches/examples-compile-instructions: New patch, some small doc fixes. + * Ship a lot more scripts in subversion-tools, including svnmerge + (Closes: #293528), svn2cl (Closes: #350133). + - List these scripts in the Description. (Closes: #357506) + - Downgrade most Depends to Recommends, augment Recommends and Suggests + to match the scripts. + * rules: Add explicit check and informative error message for trying to + build as root. (Closes: #396435) + * libapache2-svn Description: it's Apache 2.2, not 2.0. (Closes: #397113) + * patches/ruby-test-ra-race: replace my fix by upstream's better one, + should _really_ fix m68k build this time. (Closes: #397173) + * patches/jelmer-python-bindings: New patch: backport python binding + improvements by Jelmer Vernooij from trunk. This is needed for + certain advanced python-based tools. + + -- Peter Samuelson Thu, 9 Nov 2006 00:07:42 -0600 + +subversion (1.4.0-5) unstable; urgency=medium + + [ Peter Samuelson ] + * rules: Set HOME to a dummy value to prevent a build failure if the + real HOME is mode -x. Plus a few minor cleanups. + * rules: Link -ldb explicitly (rather than implicitly via -laprutil-1). + This is required for libdb symbol versioning to propagate. + Thanks to Pitr Jansen for help tracking this down. + * patches/svnshell: Fix insufficient argument checking in 'setrev' + command. (Closes: #392004) + + -- Peter Samuelson Wed, 11 Oct 2006 03:30:03 -0500 + +subversion (1.4.0-4) unstable; urgency=medium + + [ Peter Samuelson ] + * patches/apr-abi: switch to a simpler test that actually DTRT on 64-bit + platforms. (Closes: #391744) + + -- Peter Samuelson Sun, 8 Oct 2006 09:26:04 -0500 + +subversion (1.4.0-3) unstable; urgency=low + + [ Peter Samuelson ] + * patches/ruby-test-ra-race: New patch for another testsuite race + discovered on m68k. + * patches/ruby-typemap-digest: New patch to fix a m68k failure, quite + possibly the same failure we've seen sporadically on other arches + in the past. Thanks to Roman Zippel. (Closes: #387996) + * rules: sed *.la to change internal *.la references to -l form. + (Closes: #388733) + * control,rules: Reinstate libsvn-javahl as a dummy package, for + sarge upgrades. (Closes: #387901) + * control,rules: Disable Java on hurd-i386, requested by Cyril Brulebois. + * Build with apache 2.2 / apr1 / aprutil1 again, now that apache 2.2 is + going into unstable. + - aprutil1 always links to libdb4.4 nowadays. (Closes: #387396) + * libapache2-svn.postinst: Do not enable the dav_fs module: not needed + for a Subversion server. + + [ Troy Heber ] + * debian/control clean up of Maintainer and Uploaders fields to reflect the + current team. + + -- Troy Heber Tue, 3 Oct 2006 07:45:31 -0600 + +subversion (1.4.0-2) unstable; urgency=low + + [ Peter Samuelson ] + * Run tests in 'build' target, not 'binary' target. This prevents a + build failure if 'binary' is run as root (not fakeroot). + * patches/svnsync-manpage: trivial typo fix from upstream. + * Delete README.db4.4: the upgrade procedure it describes is now fully + automatic. + + -- Peter Samuelson Sun, 10 Sep 2006 05:05:47 -0500 + +subversion (1.4.0-1) unstable; urgency=low + + [ Peter Samuelson ] + * New upstream version - well, not really new, it's rc5 rebranded. + * Revert libsvn1/apache2.2 change, since apache 2.2 is not yet in + unstable. libsvn1 is libsvn0 again, for now. + * patches/no-extra-libs: detect apr0/apr1 correctly, and use + pkg-config for neon. + * patches/neon26: new patch to build cleanly with neon 0.26.1. + Though we won't actually use it until #386652 is fixed. + * Document BDB 4.4 upgrade better; also, move the NEWS entry from + 'libsvn0' to 'subversion' where it is more likely to actually be + read. + * patches/no-extra-libs-2: Tweak to remove more unnecessary linking. + + -- Peter Samuelson Thu, 7 Sep 2006 21:03:06 -0500 + +subversion (1.4.0~rc5-1) experimental; urgency=low + + * New upstream version. + - patches/ruby-txtdelta-apply-instructions: remove (obsolete). + + -- Peter Samuelson Thu, 24 Aug 2006 05:31:24 -0500 + +subversion (1.4.0~rc4-2) experimental; urgency=low + + [ Peter Samuelson ] + * Reenable apache support; build-depend on apache2-threaded-dev 2.2, + now that it's in experimental. + * Build-Depends: remove bison, relax python version again (as python + handling is now done by python-support). + * patches/ruby-txtdelta-apply-instructions: new patch from upstream, + fixes the test failure on amd64. + * Compile against libdb4.4, which should fix the famous "wedged + repository" issue. + - Build-Depends: libaprutil1-dev (>= 1.2.7+dfsg-1) + - Update rules, control, README.db4.4 + - Add note to libsvn1.NEWS - please read it! + + -- Peter Samuelson Fri, 18 Aug 2006 13:06:49 -0500 + +subversion (1.4.0~rc4-1) experimental; urgency=low + + * There is a known issue with amd64 and the SvnDeltaTest in the ruby + testsuite. + + [ Peter Samuelson ] + * New upstream release. + - commit-email.pl has option not to send diffs. (Closes: #217133) + - Help text clarified for options like --file. (Closes: #233099) + - Rediff patches. Delete patches already included upstream: + apache-crash-fix, bash_completion, lc_ctype, perl-test-clean, + svn_load_dirs-symlinks, swig-1.3.28. + - Add Build-Depends: zlib1g-dev. + * Bump subversion-tools dependencies on the other packages to >= 1.4. + * Support ENABLE_APACHE macro, to disable 'libapache2-svn'. + Disable apache until apache 2.2 makes its way into experimental. + * Switch to libapr1, which entails an ABI change to libsvn. + - libsvn0 -> libsvn1 + - libsvn0-dev -> libsvn-dev + - patches/apr-abi: New patch: change the libsvn_* SONAMEs. + (This type of change should be upstream-driven, but upstream has + declined to do it.) + - patches/fix-bdb-version-detection: New patch: tweak BDB version + detection not to rely on an apr-util misfeature (#387105). + * Rename libsvn-javahl to libsvn-java, to comply (in spirit) with the + Java Policy. (Closes: #377119) + * Rename libsvn-core-perl to libsvn-perl, because it provides several + modules in the SVN:: namespace, not just SVN::Core. + * patches/limit-zlib-link: New patch from upstream to prevent + unnecessary -lz linkage in client binaries. + * Update copyright file again. + * Switch to python-support. + * subversion-tools: downgrade rcs and exim4 to Recommends. + * Add NEWS entry to libsvn1, explaining compatibility issues - please + read it, folks! + + [ Troy Heber ] + * tweaked rpath patch HUNK 2, so it would apply cleanly. + + -- Peter Samuelson Thu, 10 Aug 2006 20:43:19 -0500 + +subversion (1.3.2-6) unstable; urgency=low + + [ Peter Samuelson ] + * Add libsvn0 Conflicts: subversion (<< 1.3) to prevent chaos from + linking to both neon24 and neon25. + * Add libsvn0 Conflicts: python2.3-subversion (<< 1.2.3dfsg1-1) + because of the libsvn_swig_py move. (Closes: #385146) + * Link with Berkeley DB 4.4. (Closes: #385589, #383880 again) + - patches/bdb-44: new patch cobbled together from upstream trunk + * patches/ruby-test-svnserve-race: update from our 'sleep 3' hack to + what I hope is a proper fix. Thanks to Kobayashi Noritada, Wouter + Verhelst and Roman Zippel. (Closes: #378837) + * Switch to python-support. + + -- Peter Samuelson Sat, 2 Sep 2006 05:04:09 -0500 + +subversion (1.3.2-5) unstable; urgency=medium + + [ Peter Samuelson ] + * python-subversion.{prerm,postinst}: use pyversions, fix stupid bug + (Closes: #379278) in prerm. Tighten python build-dep to ensure + availability of pyversions. + * patches/ruby-test-svnserve-race: increase 'sleep 1' hack to 'sleep 3' + for now. Not a proper fix, but should build on m68k. + * control: downgrade subversion Depends: patch to Suggests. You can do + a lot with subversion without a 'patch' program. + + -- Troy Heber Mon, 24 Jul 2006 14:01:49 -0600 + +subversion (1.3.2-4) unstable; urgency=low + + [ Peter Samuelson ] + * control, rules, patches/*: switch from cdbs-simple-patchsys to dpatch. + Remove .patch suffixes, change build-depends. + * rules: separate the *-arch and *-indep targets properly. + * copyright: updates, mention licenses for the bits in the tarball which we + don't use. + * Support new python policy, building for version 'current'. + Thanks to Max Bowsher. (Closes: #373387) + * Improve package descriptions. (Closes: #375469) + * Add java2-runtime alternative to libsvn-javahl JVM dependency. + (Closes: #377529) + * Add libsvn0 Conflicts: libsvn-core-perl (<< 1.2.3dfsg1-1) to force a + necessary upgrade. (Closes: #376565) + + [ Guilherme de S. Pastore ] + * control: updated e-mail address. + + -- Troy Heber Mon, 17 Jul 2006 08:39:20 -0600 + +subversion (1.3.2-3ubuntu2) edgy; urgency=low + + * Backport improved python bindings (Jelmer Vernooij), + cleanup patch and adapt for 1.3.2. Ubuntu #51304. + + -- Matthias Klose Wed, 4 Oct 2006 21:36:23 +0000 + +subversion (1.3.2-3ubuntu1) edgy; urgency=low + + * Merge from debian unstable, remaining changes: + - create pot file on build, + - python2.4. + + -- Scott James Remnant Mon, 10 Jul 2006 16:22:15 +0100 + +subversion (1.3.2-3) unstable; urgency=low + + [ Troy Heber] + * Adding arm to list of javahl disabled architectures + + -- Troy Heber Wed, 14 Jun 2006 14:26:44 -0600 + +subversion (1.3.2-2) unstable; urgency=low + + [ Peter Samuelson ] + * control, rules: switch from kaffe to java-gcj-compat-dev. Thanks to + Bastian Blank. Also reenable libsvn-javahl, for now, on all + architectures except m68k, mips, mipsel. (Closes: #370228) + * ruby-test-svnserve-race.patch: new kludge to avoid a race condition in + the ruby testsuite on really slow machines. + + -- Peter Samuelson Mon, 12 Jun 2006 18:50:08 -0500 + +subversion (1.3.2-1) unstable; urgency=low + + [ Peter Samuelson ] + * New upstream release. + - Remove patches applied upstream: apache-crash-fix.patch, + svn_load_dirs-symlinks.patch, swig-1.3.28.patch + * debian/watch: new file for use by 'uscan' from devscripts. + * Standards version 3.7.2. (No changes.) + * control: upgrade Build-Conflicts to libsvn0 (<< 1.3). + This is that old workaround for #291641. + * rules: rework testsuite invocation: + - Add 'check' series of targets, and 'check-help' to remind one + of what they are + - Conditionalise javahl tests on ENABLE_JAVAHL + - Reorder the checks to put the core tests at the end; they are by far + the most time-consuming, and rarely fail anyway + - Only 'cat tests.log' if the core tests fail: the other testsuites + don't use that file anyway + + -- Peter Samuelson Thu, 1 Jun 2006 04:10:19 -0500 + +subversion (1.3.1-3ubuntu1) dapper; urgency=low + + * Merge new upstream version from Debian, UVF exception approved by mdz. + * Very (very, very) carefully merge our Java-related changes with Debian's + rather different Java changes to produce something that should work. + * Create a python2.4-subversion transitional package to smooth upgrades. + + -- Adam Conrad Mon, 8 May 2006 14:07:51 +1000 + +subversion (1.3.1-3) unstable; urgency=medium + + [ Peter Samuelson ] + * Tighten dependency between subversion and libsvn0, to reduce user + confusion. It is almost always the library version that matters, as + far as bugs and features are concerned. (Closes: #359315) + * Disable java bindings on hppa and ia64, since kaffe is broken on + those architectures. It's been broken on ia64 for a long time, and it + looks as though hppa may remain broken for awhile too (see #364819). + * ssh-no-sigkill.patch: new patch to SIGTERM (instead of SIGKILL) the + tunnel agent, which is usually ssh. We can do this now that #313371 + is fixed. (Closes: #335528) + * rules: add -V'libsvn0 (>= 1.3.0)' to dh_makeshlibs to loosen the + shlibs file a bit. Upstream guarantees that the library ABI won't be + augmented during any single x.y.* cycle. + * svnwrap.sh, man/svnwrap.1: new script for subversion-tools package to + optionally wrap subversion client commands with 'umask 002'. + (Closes: #242368, #259226, #282468, #292358) + * lc_ctype.patch: new patch to make locale errors non-fatal, suggested + by upstream developer Peter Lundblad. (Closes: #363983) + * last-changed-date-charset.patch: new patch: convert $LastChangedDate$ + keyword from UTF-8 to local character set. (Closes: #290774) + * apache-crash-fix.patch: new patch to fix a crash in mod_dav_svn. + * swig-warning-124.patch: new patch to disable swig typemap warning, + drastically shrinking the build log. + + [ Troy Heber ] + * changing from UNRELEASED to unstable and uploading + + -- Troy Heber Fri, 05 May 2006 18:14:57 -0600 + +subversion (1.3.1-2) unstable; urgency=low + + [ Peter Samuelson ] + * Fix libsvn-ruby1.8: actually ship the swig glue, which we had overlooked. + Thanks to Thiago Avancini for the report and some Ruby help. + * Exclude Java bindings on kfreebsd-amd64. (Closes: #361488) + + -- Peter Samuelson Sun, 9 Apr 2006 05:10:42 -0500 + +subversion (1.3.1-1) unstable; urgency=low + + [ Peter Samuelson ] + * New upstream version. + - Delete obsolete neon-0.25.5.patch. + * swig-1.3.28.patch: add a few more upstream patches. + + -- Troy Heber Tue, 04 Apr 2006 15:05:12 -0600 + +subversion (1.3.0-5) unstable; urgency=high + + * rpath.patch: Delete rpaths for apache2 modules. + (Closes: #359234, also see CVE-2006-1564) + - rules: Do not override INSTALL_MOD_SHARED, this is no longer needed + - libapache2-svn.install: Use modules from the install, not from + the build tree + + -- Peter Samuelson Tue, 28 Mar 2006 00:56:59 -0600 + +subversion (1.3.0-4) unstable; urgency=low + + [ Peter Samuelson ] + * rules: Support DEB_BUILD_OPTIONS=-jN, passed to child make processes. + Invoke 'make autogen-swig' separately as it has problems with -j. + Be more paranoid about cleaning out old swig headers. + Document all the DEB_BUILD_OPTIONS we now support. + * control: Don't say we provide python2.4-subversion, since we don't. + * swig-1.3.28.patch: add another upstream patchlet. Should fix the + intermittent FTBFS due to the ruby test suite. + * rules: fix doc/subversion/README.db4.3.gz symlink (Closes: #357856) + + -- Troy Heber Mon, 20 Mar 2006 08:13:33 -0700 + +subversion (1.3.0-3) unstable; urgency=low + + [ Peter Samuelson ] + * rules: Symlink /usr/share/doc/libsvn-ruby -> libsvn-ruby1.8 + * swig-1.3.27.patch: Rename to swig-1.3.28.patch, and update it with + more patches stolen from upstream, to support SWIG 1.3.28. + - control: Remove Build-Conflicts: swig (>= 1.3.28). Assume for now + that 1.3.29 and newer won't cause other problems. + + [ Adam Conrad ] + * Do the Provides/Replaces/Conflicts dance for python2.4-subversion as + well, since Ubuntu has shipped that for ages, and this allows for + smoother upgrades/sidegrades between the two. + + -- Troy Heber Sun, 12 Mar 2006 15:32:57 -0700 + +subversion (1.3.0-2) unstable; urgency=low + + [ Peter Samuelson ] + * Disable java bindings on m68k for now. It seems to have problems + similar to the ones on arm and mips. (See #344986.) + * Some suggestions from Ubuntu backporter Blair Zajac (Closes: #347775): + - Delete pregenerated swig headers which may or may not be compatible + with Debian's version of swig. + - Tighten Build-Depends on kaffe to >= 2:1.1.6: he reports that 1.1.5 + fails to build the Java bindings. + - Build-Depends: junit, pass --with-junit to configure, and run 'make + check-javahl'. It fails on current free JVMs, so ignore failure. + - Tighten subversion-dev dependency on libapr0-dev to >= 2.0.55-3, + to match the Build-Depends. + - Pass CLEANUP=true to 'make check' to reduce disk usage. + * subversion.README.Debian: Rewrite for clarity, and to document the two + Emacs helpers. Thanks to Gavin Baker for both the research and the + writing. + * rules: 'make swig-rb' so that 'make install-swig-rb' does not have + to do it for us. Thanks to Max Bowsher for noticing. + * Adjust swig patches: + - swig-1.3.27-hack.patch: remove, obsoleted by upstream changes. + - ruby-swig-1.3.27.patch: rename to swig-1.3.27.patch and update to + include trunk r18172, which is likely to go in a future 1.3.x. + * New package libsvn-doc with doxygen-generated API docs in HTML + format. Thanks to Max Bowsher. (Closes: #269635) + - Add Suggests: libsvn-doc for libsvn0-dev + * Rename python2.3-subversion to python-subversion, recommended by + Python policy. This will allow for a slightly smoother global python + transition in the future. + - Replaces/Conflicts/Provides: python2.3-subversion + - Use #!/usr/bin/python everywhere, not #!/usr/bin/python2.3 + * Add Provides: libsvn-dev to libsvn0-dev. The package will be renamed + in the future, when libsvn0 becomes libsvn1. + * Loosen dependencies between subversion-tools and the other packages, + as the one is "Architecture: all" and the others are not. + * Build-Conflict with swig 1.3.28 and newer, to document reality. This + has been addressed by upstream trunk but not yet backported. + * patches/neon-0.25.5.patch: new patch from upstream, to allow compiling + with neon 0.25.5. + + [ Troy Heber ] + * Changing my email address + + -- Troy Heber Wed, 22 Feb 2006 08:18:12 -0700 + +subversion (1.3.0-1ubuntu3) dapper; urgency=low + + * debian/rules: Create a POT file on package build + + -- Michael Vogt Fri, 5 May 2006 01:48:11 +0200 + +subversion (1.3.0-1ubuntu2) dapper; urgency=low + + * Reenable the build of libsvn-javahl, build using java-gcj-compat-dev. + * libsvn-javahl: Prefer gij over kaffe. + + -- Matthias Klose Thu, 23 Mar 2006 14:10:04 +0000 + +subversion (1.3.0-1ubuntu1) dapper; urgency=low + + * Merge with Debian by hand, bringing in shiny new upstream version. + * Disable the testsuite for the ruby bindings for now, as they are + failing obscurely, and "broken bindings are slightly better than + no bindings"; I will investigate the breakage later. + + -- Adam Conrad Tue, 17 Jan 2006 12:35:07 +1100 + +subversion (1.3.0-1) experimental; urgency=low + + [ Peter, Guilherme ] + * New upstream version. (Closes: #344819) + - Undeprecates svnserve -R (Closes: #341438) + - Fixes typo in locks/db-logs.lock (Closes: #339298) + - README does not mention bdb specifics when using fsfs (Closes: #295860) + - Back to a pristine upstream tar, as upstream has removed the + (non-free) Subversion Book. + - All patches rediffed / ported. + - no_extra_libs, svn_load_dirs_symlinks: renamed to no-extra-libs, + svn_load_dirs-symlinks, for consistency. + - commit-email-warning, l10n-segfault: Removed (fixed upstream). + + [ Peter Samuelson ] + * New packages libsvn-ruby1.8 and dummy libsvn-ruby. (Closes: #335987) + - patches/ruby-no-strict-aliasing.patch: new patch. + - patches/ruby-swig-1.3.27.patch: new patch from upstream, to + build with SWIG 1.3.27. Upstream says this is still unofficial. + * Disable java on kfreebsd-i386. (Closes: #345196) + * patches/bash_completion.patch: new patch to fix minor wildcard + breakage with bash completion. (Closes: #342052) + * rules: remove x bit from /etc/bash_completion.d/subversion. + Thanks, lintian. + * control: downgrade db4.3-util to Suggests. + * Move README.db4.3 and the corresponding NEWS entry to the libsvn0 + package. Leave a symlink in /usr/share/doc/subversion/. + (Closes: #342235) + * README.db4.3: add notes about preserving file permissions. + Thanks to Ross Boylan. (Closes: #345819) + * patches/svn_load_dirs_symlinks.patch: new patch to handle symlinks in + the svn_load_dirs contrib script. Thanks to Tilman Koschnick. + (Closes: #311440, #319165) + * rules: cleanups: + - Use debhelper -s instead of -a, and -i -s instead of -A. + This would have prevented the need for 1.2.3dfsg1-2. + - Move some build rules out of the 'install' target. + - Enable additional tests (make check-swig-py). + - Drop use of 'time' (and corresponding build-dep in control). + * control: move from libneon24 to libneon25, as upstream now prefers. + * patches/no-extra-libs-2.patch: new patch: more spurious-link pruning. + + -- Peter Samuelson Fri, 6 Jan 2006 03:28:16 -0600 + +subversion (1.2.3dfsg1-3ubuntu1) dapper; urgency=low + + * Merge with the final Debian release of 1.2.3dfsg1-3, bringing in + fixes to the clean target, better documentation of the libdb4.3 + upgrade and build fixes to work with swig1.3_1.3.27. + + -- Adam Conrad Mon, 5 Dec 2005 01:26:14 +1100 + +subversion (1.2.3dfsg1-3) unstable; urgency=low + + [ Peter Samuelson ] + * rules: Remove the unwritten requirement that /usr/bin/python be + specifically version 2.3: + - derive python version from debian/control, not from dpkg -l + - pass PYTHON=python2.3 explicitly into configure + * rules: clean rule: Seek and destroy _all_ *.pyc files. There were + a few we didn't catch before, buried in the testsuite. + * Remove various unneeded files from language bindings (Closes: #310777) + - libsvn-core-perl.install: don't install /usr/lib/*.{a,la,so} + - python2.3-subversion.install: likewise + - libsvn-javahl.install: don't install /usr/lib/jni/*.{a,la} + - rules: delete *.{a,la} from python2.3/site-packages/libsvn + * control: build-depends on libapr0-dev (>= 2.0.55-3). + Earlier versions of libapr0 will try to make us link to libdb4.2. + * subversion.NEWS, README.db4.3: document db4.2 -> db4.3 upgrade. + * patches/no_extra_libs.patch: new patch to prevent linking to several + unneeded libraries. (Closes: #336373, which was caused by linking to + libssl0.9.8.) + - debian/control: Remove several depends and build-depends we are no + longer using because of this + * patches/commit-email-warning.patch: new patch to eliminate a harmless + warning in a hook script. (Closes: #336781) + * patches/perl-test-clean.patch: new patch to avoid leaving several + /tmp/svn-perl-test-xxxxxx dirs. + * patches/swig-1.3.27-hack.patch: new patch to avoid FTBFS from bad + interaction of swig 1.3.27 and . A *really* ugly hack. + + [ Adam Conrad ] + * Switch to using DB4.3 instead of DB4.2, as libapr0 has + (Closes: #335455, #335438) + - Bump build-dep and libsvn0-dev dep from libdb4.2-dev to libdb4.3-dev + - Bump subversion and libapache2-svn deps from db4.2-util to db4.3-util + + [ Troy Heber ] + * Added note about the requirement for nfs-common when your repository lives + on a NFS volume. (closes: #316097) + * Changing the default behavior to not use apr_generate_random_bytes(), + Debian use the system APR which is configured to use /dev/random. In cases + where the entropy pool is drained svn commands can block waiting. Removing + the call to apr_generate_random_bytes and using the fallback apr_time_now + instead. (closes: #285708, #298822) + + -- Peter Samuelson Fri, 2 Dec 2005 16:22:44 -0600 + +subversion (1.2.3dfsg1-2ubuntu1) dapper; urgency=low + + * Roll this release from the Debian pkg-subversion SVN repo (Ubuntu #19334) + * Stop building python2.3 bindings, as python2.3 is leaving Ubuntu main. + * Disable the build of libsvn-javahl, since kaffe is in Ubuntu universe. + + -- Adam Conrad Sat, 26 Nov 2005 01:17:20 +1100 + +subversion (1.2.3dfsg1-2) unstable; urgency=low + + * Use DH_OPTIONS=-Nlibsvn-javahl in debian/rules, rather than the + Architecture fields in debian/control, to disable the java package. + Due to misuse of debhelper, the last attempt didn't work. And I think + this way is nicer anyway. Suggested by Steve Langasek. + + -- Peter Samuelson Wed, 19 Oct 2005 04:27:51 -0500 + +subversion (1.2.3dfsg1-1) unstable; urgency=low + + [ Guilherme de S. Pastore ] + * debian/control: + - changed section of libsvn-core-perl to perl + - changed section of libsvn-javahl to devel + - bump to Standards-Version 3.6.2.1 with no changes + * debian/rules: + - minor cleanups + - removed remnants of control auto-generation + + [ Peter Samuelson ] + * Re-repack orig tarball to eliminate the tar-in-tar arrangement + * debian/rules: adjust to build without the tar-in-tar + - configure and build in ./BUILD + - 'clean' removes ./BUILD and files from autogen.sh + - adjust a lot of installation source paths + - pass both DEB_SRCDIR and DEB_BUILDDIR into debian/tools/Makefile + * debian/tools/Makefile: support separate src and build dirs + * debian/rules: modernise use of debhelper + - use dh_install instead of dh_movefiles + - move pathnames out of rules, into *.install, *.dirs, *.docs, *.examples + - side effect (but correct): move libsvn_swig_* from libsvn0{,-dev} + to python2.3-subversion and libsvn-core-perl + - install Java libraries to /usr/lib/jni, not /usr/lib (Closes: #327789) + * debian/rules, debian/control: disable libsvn-javahl on arm, armeb, + mips, mipsel, on advice from Jeroen van Wolffelaar. It seems kaffe + may remain broken on these architectures for a while. (Closes: #329184) + * debian/rules: rip out "architectures to run full testsuite on" logic, + on advice from Steve Langasek. It is not safe to assume that + debian-specific changes to an upstream release will never cause test + failures. Local admins can still use DEB_BUILD_OPTIONS=notest to + speed up a local compile. + * debian/control: relax all versioned build-deps; all the versions are + satisfied in sarge (and most of them in woody). + * debian/rules, debian/subversion-tools.{postinst,postrm,install}: + - move /usr/lib/subversion to /usr/share/subversion (Closes: #330824) + - move hot-backup.py to /usr/share/doc/subversion/examples + - create compat symlink /usr/lib/subversion + * debian/control: remove pkg-subversion-maintainers from Uploaders - it's + not the right place to document the existence of a list + * debian/control, debian/rules: build with kaffe-pthreads specifically + (works around a FTBFS with kaffe 1.1.6) + + -- Peter Samuelson Tue, 18 Oct 2005 03:03:27 -0500 + +subversion (1.2.3a-1) unstable; urgency=low + + * Welcome the Debian Subversion Team (Closes: #322257) + + [ Guilherme de S. Pastore ] + * New upstream release (Closes: #320417) + - tarball repackaged without svnbook, as it's licensed under + a non-DFSG-free license (Closes: #215083, #218185, #314154) + - fixes export segmentation fault with versioned items in + "deleted" state (Closes: #314381, #316133, #316227, #320572, #324037) + * debian/compat: + - bump to debhelper compatibility version 4 + - no longer export DH_COMPAT from inside debian/rules + * debian/control: + - dropped auto-generation with m4 + - dropped build-dependency on quilt + - bump to Standards-Version 3.6.2 with no changes + - removed Conflicts/Replaces on all packages not present in + stable anymore (Closes: #310519) + * debian/patches/ltmain.sh.patch: + - removed; applied upstream + * debian/patches/kaffe-cast.patch: + - removed; broken and unnecessary + * debian/subversion.doc-base.book: + - removed; the book is no longer present + * debian/README.Debian: + - Removed; was doing the work of a package description, and + mentioned the (removed) svnbook + * debian/python2.3-subversion.README.Debian: + - Renamed from pythonX.Y-subversion.README.Debian, we longer + use that auto-generation stuff + * debian/rules: + - tiny fixes to unbreak the build process + - include simple-patchsys.mk from CDBS instead of using quilt; + it was too complex for our needs + - fixed detection of tarballs, as to not get confused by CDBS + auto-generated lists, which would cause the build to fail + - no longer do any magic to auto-generate debian/control and + python related documentation; too complex for too little gain + - set LANG to C, otherwise the build may fail because of tests + failing for not being able to recognize strings returned by + some tools + - no longer do any magic to support builds on pre-sarge + environments; the package is already complex enough without + supporting old cruft unnecessarily + * Removed packaging documentation, as it was pretty much outdated + * Removed maintenance scripts from the package; left them + on the 'tools' section of the repository on svn.debian.org + + [ David Kimdon ] + * Do not install vc-svn.el (closes: #314213, #315100, #324633) + * Autoload psvn.el by default. (closes: #223303, #235905, #305953) + * Remove hard-coded DEB_BUILDDIR from debian/rules. + * Enable javahl bindings by default (closes: #271125, #323839) + + [ Peter Samuelson ] + * debian/patches/l10n-segfault.patch: + - fixes a "svn add" crash in the es, fr, it, pl, pt_BR and zh_TW + locales (Closes: #316143, #323376, #326079) + * debian/patches/rpath.patch: + - port to subversion 1.2.x and reenable (work in progress, suppresses + most rpaths) + * debian/lintian-overrides: new file for binary package overrides + * debian/rules: + - support DEB_BUILD_OPTIONS=noopt + - invent a DEB_BUILD_OPTIONS=notest to disable the test suite more + easily + - the INSTALL file is redundant, do not install it in /usr/share/doc + - change #!/usr/bin/env python to #!/usr/bin/python2.3 in assorted + scripts + - split and install lintian-overrides to appropriate packages + - minor cruft removal + + -- Guilherme de S. Pastore Fri, 9 Sep 2005 14:57:03 -0300 + +subversion (1.2.0-1ubuntu1) breezy; urgency=low + + * Resynchronise with Debian. + + -- Michael Vogt Wed, 29 Jun 2005 13:09:32 +0200 + +subversion (1.2.0-1) unstable; urgency=low + + * New upstream release. (Closes: #310474) + * Fixes many bugs (some of these may have actually been fixed + before 1.2.0, in any case they are now fixed) : + svndumpfilter: no crash on 64-bit platforms (Closes: #309161) + symlink now works in "svn merge" (Closes: #296046) + svnserve does ipv6 (Closes: #235755) + svn no longer can export non-existent files (Closes: #279080) + svn status "R" is documented in the svn book: (Closes: #269021) + Fix auth problem (Closes: #269165) + svn diff handles ctrl-c (Closes: #266973) + * Build-conflict with libsvn0 (<<1.2). This is a work-around to + Debian bug 291641. + * The subversion book source has moved out of this package, install a + pre-built book. + + -- David Kimdon Wed, 8 Jun 2005 22:19:21 -0700 + +subversion (1.1.4-2ubuntu1) breezy; urgency=low + + * Sync with Debian. + + -- Matthias Klose Wed, 25 May 2005 00:09:22 +0000 + +subversion (1.1.4-2) unstable; urgency=high + + * Put call to dh_installdeb after call to dh_python. Fixes purge + of python2.3-subversion (closes: #308777) + * Disable full testsuite. All archs have already past it. No need to + burden the autobuilders with all the tests. + * Set DEB_BUILDDIR correctly since something is apparently setting it + incorrectly. + + -- David Kimdon Thu, 12 May 2005 21:04:56 -0700 + +subversion (1.1.4-1) unstable; urgency=low + + * New upstream release. (Closes: #303179) + * Set LC_ALL for testsuite so build runs in a known environent. + (closes: #301495) + * Omit unnecessary svn.vim (now included in the standard vim distribution) + (closes: #298901) + * Try again to get -O2 in CFLAGS. (closes: #303744) + + -- David Kimdon Sun, 27 Mar 2005 20:43:17 -0800 + +subversion (1.1.3-3) unstable; urgency=low + + * Add -O2 to CFLAGS. + * Fix trac's revision log (closes: #299817) + patche thanks to Torsten Landschoff + + -- David Kimdon Fri, 25 Feb 2005 20:25:02 -0800 + +subversion (1.1.3-2) unstable; urgency=low + + * Patches thanks to Torsten Landschoff + - Let cdbs handle updating config.{sub|guess}. + - Support swig 1.3.24. (closes: #295452) + * Remove old upgrade notes from README.Debian. + * Fix doc url (closes: #293310) + + -- David Kimdon Sun, 20 Feb 2005 11:31:34 -0800 + +subversion (1.1.3-1) unstable; urgency=low + + * New upstream release. (closes: #290610, #288344, #290381) + - remove r12102.patch as it is integrated in this upstream release. + * Make libsvn0 conflict with libsvn-core-perl (= 1.0.9) (closes: #290807) + * Allow the build to use a 1.3.22 swig version since the Debian + version is patched to include the necessary runtime libraries. + * Don't start description synopses with a capital letter, make homepage + consistent explicit in package description (as suggested by the + Developer's Reference). + * Be more explicit about what the default apache module configuration + allows. Default to a read-only repository for non-anonymous + users. (closes: #277303) + * The book isn't being built properly, stop building it and use the + version that is shipped with the tarball (closes: #282393). + + -- David Kimdon Sat, 15 Jan 2005 14:12:54 -0800 + +subversion (1.1.1-2ubuntu4) hoary; urgency=low + + * Build a python2.3-subversion package as well. + + -- Matthias Klose Tue, 17 May 2005 09:55:44 +0000 + +subversion (1.1.1-2ubuntu3) hoary; urgency=low + + * python2.4-subversion: Add conflict to python2.3-subversion. + Closes: #4957. + + -- Matthias Klose Mon, 10 Jan 2005 08:31:59 +0100 + +subversion (1.1.1-2ubuntu2) hoary; urgency=low + + * Tighten build dependency on python. + + -- Matthias Klose Fri, 17 Dec 2004 14:02:19 +0100 + +subversion (1.1.1-2ubuntu1) hoary; urgency=low + + * Build using python2.4. + * debian/control.m4: Fix generation of control file for PYVERSION != 2.3. + + -- Matthias Klose Wed, 15 Dec 2004 20:37:50 +0100 + +subversion (1.1.1-2) unstable; urgency=low + + * Fix minor incompatability between 1.0 and 1.1 libraries. + (closes: #275545) + * Remove conditionals and variables that allow debian/rules to + support building subversion 1.0. + * Re-enable debian/patches/rpath.patch. This get rpath out of + some of the binaries. + * Minor build system fixes. + * python2.3-subversion now Conflict/Replace's python2.1-subversion + (closes: #281047) + * Mention DAV in description of libapache2-svn package. + (closes: #277301) + * Uncomment section markers in default configuration files. It is easy + to uncomment the option, but not the section marker and then wonder + why the change has not taken effect. (closes: #278162) + * Fix path to subversion book. (closes: #285240) + + -- David Kimdon Sun, 5 Dec 2004 10:26:12 -0800 + +subversion (1.1.1-1) experimental; urgency=low + + * New upstream release. (closes: #272000) + * Fix hard-coded swig version in debian/rules (closes: #276838) + * Mention 'dav' in the description of libapache2-svn so the package + is easier to find. (closes: #277302) + * Create libsvn-core-perl dependency on libsvn0 via the shlibs file + so the version is taken into account. (closes: #279439) + + -- David Kimdon Sat, 30 Oct 2004 07:59:52 -0700 + +subversion (1.1.0-1) experimental; urgency=low + + * New upstream release. + * Make debian/control.in a double-colon rule. This allows us to + build with old and new versions of cdbs. We are not using + cdbs's debian/control rule. + * Increase debhelper build dependency to 4.1.25 since we use + dh_python. + * Increase version number to prevent this package from being + removed from experimental. (1.0.8-1 has been uploaded to + unstable.) + * Disable testsuite on powerpc since I just ran it. + * Build depend on swig >= 1.3.22-2 so we get a runtime library + and the build doesn't fail. + + -- David Kimdon Sat, 25 Sep 2004 10:11:12 -0700 + +subversion (1.0.6+1.1.0rc4-1) experimental; urgency=high + + * New upstream release. + * CAN-2004-0749: mod_authz_svn fails to protect metadata + + -- David Kimdon Fri, 24 Sep 2004 20:38:15 -0700 + +subversion (1.0.6+1.1.0rc2-1) experimental; urgency=low + + * New upstream release. + * Build system changes so we can easily support subversion 1.1.x. + * Minor build changes to support 1.1.x. + + -- David Kimdon Wed, 8 Sep 2004 22:36:04 -0700 + +subversion (1.0.6-2) unstable; urgency=high + + * This package is source equivalent to 1.0.6-1. + * Remove debian/patches/apr_dir_make.patch as this is now fixed + in the apache2 version we depend on. + * Build depend on apache2 >= 2.0.50-11 so we get all fixes. + * Put version number to something that katie will not interpret as + a binary NMU. + + -- David Kimdon Wed, 1 Sep 2004 22:03:43 -0700 + +subversion (1.0.6-1.2.1) unstable; urgency=high + + * Binary non-maintainer upload by temporary maintainer. + + -- Matt Kraai Thu, 26 Aug 2004 15:06:09 -0700 + +subversion (1.0.6-1.2) unstable; urgency=high + + * Non-maintainer upload with maintainer approval. + * Reverting the apache2/apr LFS transition by bumping our build-dep + to (>= 2.0.50-10), as the apache2 maintenance team has decided that + the ABI transition, while desireable, just wasn't manageable this + close to a release. + * Re-enable the testsuite on all arches to make sure all this ABI + buggery hasn't, well, buggered anything. + + -- Adam Conrad Fri, 20 Aug 2004 10:34:24 -0600 + +subversion (1.0.6-1.1) unstable; urgency=medium + + * Non-maintainer upload by temporary maintainer. + * Work around the apr_dir_make bug in Apache 2.0.50 (closes: #256909). + * Update apache build-dep to >= 2.0.50-9 (closes: #266170, #266193). + + -- Matt Kraai Tue, 17 Aug 2004 04:31:49 -0700 + +subversion (1.0.6-1) unstable; urgency=high + + * New upstream release. + - fix mod_authz_svn COPY security hole (closes: #261938) + * Depend on exim4 rather than exim. (closes: #255363) + * Link libsvn_swig_perl-1.so with all the libraries it depends on. + (closes: #262025) + * Update neon build-dep to >= 0.24.7. + * Update apache build-dep to >= 2.0.50. + * Refresh debian/patches/repos-templates.patch. + * Add build-dep on libkrb5-dev. + * Fix permissions on libsvn-core-perl shared libraries. + * Only remove modules from apache's configuration when we are + removing libapache2-svn, not on upgrades. (closes: #251245) + Additionally, move the module config manipulation from the postrm + to the prerm. This way there is no time when apache is configured + to load a module that is not present on the system. + + -- David Kimdon Sun, 20 Jun 2004 15:34:57 +0200 + +subversion (1.0.5-1) unstable; urgency=low + + * New upstream release. + - Fix CAN-2004-0413: Subversion svn:// protocol string parsing error. + (closes: #253694) + * Update build-depends to neon 0.24.6. + * Fix broken /etc/emacs/site-start.d/vc-svn.el (closes: #250058) + + -- David Kimdon Mon, 24 May 2004 14:45:09 +0200 + +subversion (1.0.3-1) unstable; urgency=high + + * New upstream release. + - fix CAN-2004-0397 : Subversion remote vulnerability + (closes: #249791) + + -- David Kimdon Wed, 19 May 2004 20:31:15 +0200 + +subversion (1.0.2-5) unstable; urgency=low + + * Fix apache modules link in a cleaner way. Previously I had some + hard-coded link lines in debian rules. The present change modfies the + subversion build system itself to hopefully do the right thing in all + cases. This change is less invasive and should allow all archs to + build. (closes: #246903) + + -- David Kimdon Sun, 2 May 2004 11:09:20 +0200 + +subversion (1.0.2-4) unstable; urgency=low + + * Remove 'sudo' line that I didn't mean to commit and got included + in 1.0.2-3. Thanks to Norbert Tretkowski for noticing. + + -- David Kimdon Sat, 1 May 2004 14:07:28 +0200 + +subversion (1.0.2-3) unstable; urgency=low + + * Fix apache modules link. (closes: #246258) + + -- David Kimdon Sat, 1 May 2004 09:26:23 +0200 + +subversion (1.0.2-2) unstable; urgency=low + + * Fix python interpreter in svnshell. (closes: #245473) + * Include manpage for svn_load_dirs. Thanks to Per Olofsson. + (closes: #245630) + * Remove rpath from shared libraries. + * Archs not marked to run the testsuite will now still run basic_tests.py + * Disable full testsuite on archs that have passed it for 1.0.2-1. + + -- David Kimdon Fri, 23 Apr 2004 20:53:43 +0200 + +subversion (1.0.2-1) unstable; urgency=low + + * New upstream release. + * fix assertion failure in vwrite_tuple() (closes: #241076) + * Remove shlibs.local (closes: #244466) + * Put back in svnshell, patch the error messages so they are not + confusing (closes: #234462). + * Point to /usr/bin/svnshell as an example to help get started using + the pythong bindings. (closes: #239924) + * subversion now suggests subversion-tools. This may make it easier + to find the tools contained in subversion-tools. (closes: #243917) + + -- David Kimdon Sun, 18 Apr 2004 16:09:55 +0200 + +subversion (1.0.1-3) unstable; urgency=low + + * Fix python2.3-subversion and subversion-tools priority so they are + the same as the priorities in the override file. + * Fix libtool problem by no longer doing the LIBTOOL_IS_A_FOOL + hack. (closes: #242460) + * Fix hard-coded link in debian/rules to link with ptoper swig. + + -- David Kimdon Sat, 3 Apr 2004 11:13:29 +0200 + +subversion (1.0.1-2) unstable; urgency=low + + * Apply changes up to the current head of the 1.0.x branch. + This line is making its way to become 1.0.2. The diff was + obtained like this: + svn diff http://svn.collab.net/repos/svn/tags/1.0.1 \ + http://svn.collab.net/repos/svn/branches/1.0.x@9275 + - Fix recursive propset (closes: #238558) + * Increase swig build dependancy to 1.3.21-2 so we get a working + dependancy. (closes: #237230) + + -- David Kimdon Fri, 2 Apr 2004 20:19:46 +0200 + +subversion (1.0.1-1) unstable; urgency=low + + * New upstream release. + * Change libsvn0-dev and subversion-tools priority to extra so that + there is no longer a disparity between the override file and the + control file. + * cvs2svn is no longer part of this package, request for package filed, + see http://bugs.debian.org/237934 . + * libswig1.3 provides an incorrect shlibs file, add proper dependancies + to debian/shlibs.local (closes: #220107) + + -- David Kimdon Thu, 11 Mar 2004 12:21:33 +0100 + +subversion (1.0.0-2) unstable; urgency=low + + * Apply changes up to the current head of the 1.0.x branch. + This line is making its way to become 1.0.1 which is expected + to be released soon. The diff was obtained like this: + svn diff http://svn.collab.net/repos/svn/tags/1.0.0 \ + http://svn.collab.net/repos/svn/branches/1.0.x@8939 + - Fix directory walk ordering on filesystems that don't return + '.' first. (closes: #231364) + - Many other fixes. + * Fix description of the subversion book (it is a version control, + not a revision control system) + * Remove local copy of patchsys-quilt.mk and add version to quilt build-dep. + * Don't strip binaries if 'nostrip' is in DEB_BUILD_OPTIONS. + * Patch from Erno Kuusela to 50vc-svn.el so subversion vc backend doesn't + supersede an existing default. + * Don't ship .pyc files in pythonX.Y-subversion. These files should instead + be generated in the postinst. (closes: #236170) + * Detect if debian/control is invalid. If invalid then recreate it and + exit failure telling the user to try again. (closes: #204253) + * Add debian/shlibs.local which needs to stay around until #231659 + is fixed (closes: #234932). + * Fix broken stamp files that were among other things making the build + execute the configure and autogen rules unnecessarily. + * Update to policy 3.6.1 (no changes). + + -- David Kimdon Mon, 23 Feb 2004 22:32:22 +0100 + +subversion (1.0.0-1) unstable; urgency=low + + * New upstream release. + - INSTALL no longer says Subversion is alpha. (closes: #232945) + - Remove cvs2svn manpage. + * Fix formatting of NEWS.Debian. (closes: #232940) + * Put version in shlibs file. In the last upload I removed all version + info from the shlibs file rather than converting = to >=. + * Enable testsuite on many archs. + * Build with srcdir == builddir. This fixes some problems in the + perl bindings and generally makes the build system cleaner. + * Remove svnadmin-static. With the build system changes it wasn't + easy to keep it and we won't need it for a while if ever. + + -- David Kimdon Sat, 21 Feb 2004 08:49:04 +0100 + +subversion (0.37.0-3) unstable; urgency=low + + * When saying you need to dump/reload your repository it is helpful + to provide the path to the manual which describes how to do so. + (closes: #231176) + * Include README and HACKING. (closes: #218052) + * Mention to abbreviation 'svn' in short package descriptions. + (closes: #231698) + * shlibs file now creates a >= dependancy rather than a strict =. + (closes: #231681) + * Don't include svnshell. It is just an example of how to use the + bindings and isn't for general consumption. (closes: #230534) + * New package libsvn-core-perl. (closes: #208935) + * Fix doc build by giving the new path to the docbook stylesheets. + (closes: #231981) + * Start using 'quilt' and part of 'cdbs' to maintain separate pataches + within the source package. + * Fix default repos templates. (closes: #210901) + * Update swig build-dep to >= 1.3.21. This isn't actually required + by Subversion but I have some current Subversion bug reports that + indicate mixing 1.3.19 builds with 1.3.21 systems may cause problems. + * Pass fulll path the swig to configure so as to ensure we use the swig + from the Debian package. + * Don't pass broken CFLAGS to swig wrapper build (closes: #232591) + + -- David Kimdon Sat, 7 Feb 2004 00:00:41 +0100 + +subversion (0.37.0-2) unstable; urgency=low + + * Remove more references to Subversion being alpha (closes: #230744) + * Fix up debian/build.sh so the source package has all necessary files. + (closes: #230948) + * It looks like all archs have built the new swig now, so try this build + again (closes: #230955) + * NEWS.Debian and README.Debian made references to subversion + 0.35.1-1 which was never uploaded. Fix those references so they point + to 0.37.0-1. + + -- David Kimdon Mon, 2 Feb 2004 19:56:12 +0100 + +subversion (0.37.0-1) unstable; urgency=low + + ** NOTE: Repository dump/reload required. See NEWS.Debian ** + + * New upstream release. + - Subversion is getting close to the 1.0 release (closes: #193062) + - svnserve ssh now accepts user@host (closes: #202885) + * Rebuild against new libapr. (closes: #230311) + * doc build has changed since the last release, update so it still builds. + * Add build-conflicts against broken libtool 1.5-6. + * Don't build book since the source distribution already provides + us with a built book. + * Build with Berkeley DB 4.2. + * Increase required apache2 version to 2.0.48-7 so we build with the + same version of Berkeley DB. + * No longer install binaries that include debug symbols. + * Autogenerated cruft is no longer part of the source package's diff. + * Update debian/copyright notice for 2004. + * The default /etc/subversion/config and /etc/subversion/servers are now + generated as part of the build. + * Link libsvn_swig_py properly. (closes: #220107) + * Remove note from debian/control saying that this is an alpha release. + + -- David Kimdon Tue, 18 Nov 2003 21:39:50 +0100 + +subversion (0.33.0-1) unstable; urgency=low + + * New upstream release. (closes: #220672) + - fix internal diff library (closes: #218406, #220474) + - cvs2svn fixed (closes: #216868) + * Change build dependancy from apache2-devb to apache2-threaded-dev. + * Remove hack to get around broken apr-config now that bug #197685 is + fixed. + * Build depend on docbook-xsl rather than docbook-xsl-stylesheets. + (closes: #220788) + * Now that neon 0.24.4 is available increase build dependancy to require + it. Subversion itself doesn't require the new version but there are + enough bug fixes in that version of neon that it is better to use it. + * Enable mod_dav_fs in libapache2-svn.postinst (closes: #219620) + * Fix propchange-email.pl and commit-access-control.pl interpreter + (closes: #220692) + * Corrent python invocation in svnperms.py. + * Update /etc/subversion/{config,servers} + * Update debian/copyright. Re-sync with current upstream license (remove + reference to expat-lite, add reference to apr-util). Fix download + URL to point only to http://subversion.tigris.org rather than trying + to show the exact URL since that can change. + + -- David Kimdon Sat, 15 Nov 2003 22:29:33 +0100 + +subversion (0.32.1-1) unstable; urgency=low + + * New upstream release. + New manpages. (closes: #206646) + * The source package shouldn't be in Debian native format. (closes: #216514) + * Update default /etc/apache2/mods-available/dav_svn.conf with some better + comments and bring it up to date with current required syntax. + * Move last dump/reload notes from NEWS.Debian into README.Debian since it + isn't news anymore. + + -- David Kimdon Sun, 19 Oct 2003 19:22:52 +0200 + +subversion (0.31.0-1) unstable; urgency=low + + * New upstream release. + * Remove Matt Kraai from Uploaders field. Thanks for all the help + Matt! + * Wrote debian/tools/svn-make-config.c which is a tool that helps to + create default config files. Maybe this can be included upstream + somehow. Update /etc/subversion/{config,servers} + * Include svnadmin-static manpage. + + -- David Kimdon Tue, 7 Oct 2003 07:03:12 +0200 + +subversion (0.30.0-2) unstable; urgency=low + + * Adjust dynamic linker search path and location of svnversion + binary so the book build doesn't generate a spurious error message. + As a bonus the version number in the built doc should be correct + now instead of saying 'Draft'. + * Set XSL_DIR when building the docs so we can find things like + docbook.xsl. It appears as though this succeeded when I built + 0.30.0-1 because make didn't need to recreate the documentation + completely. On the autobuilders this was not the case. + (closes: #213116) + + -- David Kimdon Sun, 28 Sep 2003 21:24:55 +0200 + +subversion (0.30.0-1) unstable; urgency=low + + * New upstream release. + * Update /etc/subversion/{config,servers} + + -- David Kimdon Wed, 24 Sep 2003 22:15:17 +0200 + +subversion (0.29.0-2) unstable; urgency=low + + * Force neon build dependancy and libsvn0-dev dependancy to libneon24. + In reality neon 0.23.9 or greater will work, but since we need to + hard-code the version in the libsvn0-dev dependnacy it is simpler to just + force libneon24. (closes: #206031) + * Disable testsuite on archs where it has passed. + * Remove unneeded, crufty shlibs.local. + * Make debian/control read-only to discourage edits to it rather than + debian/control.in. (closes: #211091) + * Drop debhelper build dependancy back to >=3 so it is easier to + build the package on old systems. + * Actually install NEWS.Debian rather than having it sit in the + source package where no one can see it. (closes: #210684, #210822) + * Update /etc/subversion/config and /etc/subversion/servers + * Make package descriptions more clear and detailed. (closes: #210065) + * Fix commit-email.pl (closes: #211577) + * Remove extra hyphen in subversion.preinst rm's and make a note + about why we are doing the rm. + + -- David Kimdon Sun, 14 Sep 2003 09:04:35 +0000 + +subversion (0.29.0-1) unstable; urgency=low + + * New upstream release: + - Work with neon 0.24 (closes: #206031). + - Handle tool rearrangment, thanks to Kevin M. Rosenberg (closes: + #208813). + * Require debhelper 4.1.51 or later to install NEWS.Debian. + + -- Matt Kraai Fri, 05 Sep 2003 16:14:51 -0700 + +subversion (0.27.0-1) unstable; urgency=low + + * Merge multi-line depends and build-depends fields (closes: #203413). + * Fix verb conjugations in libapache2-svn's description (closes: + #203417). + * Change Apache location from /svn/repos to /svn (closes: #203301). + * Change the default repository location to /var/lib/svn. + * Force dependencies on libsvn0 to require the same version that was + used to build (closes: #203454). + * Move svnindex.css and svnindex.xsl to /var/www/apache2-default in + libapache2-svn (closes: #203749). + * Include "svn" in the description of subversion (closes: #204179). + * Regenerate control (closes: #205311). + + -- Matt Kraai Thu, 14 Aug 2003 16:22:04 -0700 + +subversion (0.26.0-1) unstable; urgency=low + + * Add self to Uploaders. + * New upstream release: + - Handle absolute paths in svn_load_dirs.pl (closes: #187331). + - Call Cmd.__init__ in svnshell.py (closes: #198140). + - Handle paths containing quotes in cvs2svn (closes: #201290). + * Build-depend on apache2-dev (>= 2.0.47), libapr0-dev (>= 2.0.47), and + libneon23-dev (>= 0.23.9). + * Include fixes from 0.25-0.1 (closes: #198304, #199015, #199710, + #200657, #201009). + * Add perl (>= 5.8.0-7) to subversion-tools's dependencies (closes: + #191138). + * Add liburi-perl (>= 1.17-1) to subversion-tools's dependencies + (closes: #198143). + * Rename libapache2-dav-svn to libapache2-svn and include mod_authz_svn + (closes: #198182). + + -- Matt Kraai Thu, 24 Jul 2003 05:55:37 -0700 + +subversion (0.25-0.1) unstable; urgency=low + + * Non-maintainer upload. + * New upstream release. + * Add missing files to python2.2-subversion (closes: #199015). + * Make subversion-tools replace subversion (<< 0.22.1-1) + (closes: #198304). + + -- Matt Kraai Sat, 12 Jul 2003 15:29:45 +0200 + +subversion (0.24.2-1) unstable; urgency=low + + * New upstream release + * Fix quoting error in debian/rules that was breaking the swig build. + * Add shlibs.local to work around problems like bug 197989. + + -- David Kimdon Wed, 18 Jun 2003 18:06:55 -0700 + +subversion (0.24.1-1) unstable; urgency=low + + * New upstream release : + - no long includes svn-deisgn info document (closes: #196412) + * strip svnadmin-static. It is very large and not needed for + debugging since the shared version of svnadmin can be used as long + as the package is installed. + * Follow apache2 change to module build helper (apxs -> apxs2). + (closes: #196577) + * Update apache2 and apr build dependancy. + * Build fixes thanks to Michael Cardenas + * Update build dependancy libsasl-dev -> libsasl2-dev. + * svn-design.info is no longer built, remove texinfo build-dep. + * Update apache2 example configuration based on input from + solo turn (closes: #197089) + * Don't attempt to load vc-svn when package has been removed and + only conffiles remain, patch thanks to Kalle Olavi Niemitalo + (closes: #193427) + * work around problem with apr-config (see bug #197685). + + -- David Kimdon Sun, 1 Jun 2003 20:45:05 -0700 + +subversion (0.23.0-2) unstable; urgency=low + + * Abort build on testsuite failure. + * Create a proper source package. (closes: #194517) + * Fix export over ra_svn. Thanks to Branden Robinson for the fix and + offering to NMU. (closes: #193060) + * Update comment-out vc-svn autoload commands to avoid problems with + xemacs. Thanks to Kalle Olavi Niemitalo for the + problem analysis and patch. (closes: #191632) + * Disable testsuite on archs that passed 0.23.0-1. + + -- David Kimdon Thu, 22 May 2003 09:52:35 -0700 + +subversion (0.23.0-1) unstable; urgency=low + + * New upstream release. + * Add build-dep on xsltproc, docbook-xsl-stylesheets, create + html version of book during build. + * Update to standards version 3.5.10 (no changes). + + -- David Kimdon Mon, 19 May 2003 18:34:24 -0700 + +subversion (0.22.2-1) unstable; urgency=low + + * New upstream release. + * Don't strip objects. This is a deliberate policy violation. The + goal is to lower the barrier to anyone wishing to debug this + software. See the notes in Bug#193062 for more info. + * Let debhelper create conffiles. + * Include perl dependancy information in subversion-tools package + (closes: #191138, #187324). + * Disable testsuite on archs that passed 0.22.1-1. + + -- David Kimdon Tue, 13 May 2003 18:20:44 -0700 + +subversion (0.22.1-1) unstable; urgency=low + + * New upstream release. + * Tone down the warning in the package description about data loss, simply + indicate that this software is still in development. + * Apply 0.21.0 changes to debian/control.in that were erronously applied + only to debian/control. (closes: #190353) + * Include HACKING in /usr/share/doc/subversion/. (closes: #191450) + * Don't automatically load emacs lisp files. The bindings can still be + enabled by the system administrator uncommenting the lines in + /etc/emacs/site-start.d. (closes: #190804) + * Update build dependancy to require more recent apache2-dev and + libapr0-dev (closes: #192595) + * Speed up ./debian/rules by limiting the number of times we exec dpkg. + * Add versioned build-dep on debhelper. + * Move the python script /usr/bin/svnshell from the 'subversion' + package into the 'subversion-tools' package. ('subversion-tools' + already had a python dependancy) + + -- David Kimdon Thu, 8 May 2003 08:16:13 -0700 + +subversion (0.21.0-1) unstable; urgency=low + + * New upstream release. + * Include svnshell. (closes: #187446) + * Include svnindex.css and svnindex.xsl. (closes: #185465) + * Make subversion priority optional. (closes: #188141) + * Update to policy 3.5.9 (no changes). + * Fix svn-dev.vim (closes: #187937). + * Fix emacs svn-status-mode (closes: #188706). + * Remove subversion-server package (closes: #182653). As indicated + in the bug report the subversion-server package was only necessary if + one wanted to use subversion with apache. I don't see a compelling + need for the subversion-server package, all it did is depend on + subversion, subversion-tools and libapache2-dav-svn. + + -- David Kimdon Wed, 16 Apr 2003 00:37:05 -0700 + +subversion (0.20.1-2) unstable; urgency=low + + * Fix svnversion breakage, again, sigh. This time with a fix that + is easier to maintain (no longer need to patch upstream source). + (closes: #186966) + * Fix improperly generated source package (was in Debian native format). + * Update package sections for libsvn0-dev and python2.2-subversion + based on new archive sections. + * Update debian/copyright (fix spelling of 'acknowledgment' and + extend copyright to 2003). + * Remove NEWS.Debian (was news from 0.17) + * Update /etc/subversion/[config,servers] + + -- David Kimdon Mon, 31 Mar 2003 07:34:01 -0800 + +subversion (0.20.1-1) unstable; urgency=low + + * New upstream release. + + -- David Kimdon Sun, 30 Mar 2003 18:14:01 -0800 + +subversion (0.20-1) unstable; urgency=low + + * New upstream release. + + -- David Kimdon Thu, 20 Mar 2003 21:43:10 -0800 + +subversion (0.19.1-2) unstable; urgency=low + + * Fix psvn.el autoload. (closes: #185130) + * Fix autobuild failure. (closes: #185088) + * Minor update to /etc/subversion/servers. + + -- David Kimdon Mon, 17 Mar 2003 07:00:17 -0800 + +subversion (0.19.1-1) unstable; urgency=low + + * New upstream release. + * Install psvn.el and vc-svn.el so they are autoloaded by emacs, + thanks to Martin Pool for a patch. (closes: #184032) + * Retiring svn-[buildpackage|inject] until I update them. + + -- David Kimdon Sun, 9 Mar 2003 18:45:57 -0800 + +subversion (0.18.1-1) unstable; urgency=low + + * New upstream minor release. + * add python fixups from woody backport + * disable testsuite for archs that have passed it + * fixup db tool path in hotbackup.py, again (closes: #182777) + + -- David Kimdon Sun, 23 Feb 2003 13:22:45 -0800 + +subversion (0.18.0-1) unstable; urgency=low + + * New upstream release. (closes: #180910) + - Use new --with-editor configure switch to set default editor to + /usr/bin/editor (closes: #162632, #164371) + - New cvs2svn manpage thanks to Robert Bihlmeyer + (closes: #176576) + * Fixups for woody backport + - libtool patch is back. It is only applied for the versions of libtool + that need it (such as the libtool in woody). + - make the testsuite run on woody. + * Add build-dep on libsasl-dev. + * Make subversion-tools depend on an explicit version of subversion and + python2.2-subversion (closes: #180621) + + -- David Kimdon Sun, 9 Feb 2003 22:16:27 -0800 + +subversion (0.17.1-2) unstable; urgency=low + + * The Berkeley DB update as of 0.17.1-1 requires you to run + 'svnadmin recover /path/to/repos', see README.Debian for + more information. + + * Include prominent note in changelog, README.Debian and + NEWS.Debian indicating steps required for Berkeley DB upgrade. + (closes: #178819) + * Don't include CHANGES twice. (closes: #178694) + * libapache2-dav-svn depends on a specific version of apache2 + (closes: #178833) + * Build-Dep on apache2 packages tightened to >> 2.0.44-6 since -5 + didn't have a non-interative install, this made subversion fail on + some autobuliders. + * Disable testsuite on the archetectures that passed 0.17.1-1. + * Remove version information for libapache2-dav-svn dependancy on + apache2 since apache2 is a virtual package. + + -- David Kimdon Mon, 27 Jan 2003 17:02:31 -0800 + +subversion (0.17.1-1) unstable; urgency=low + + * New upstream release. + * Build against berkeley db 4.1.24. + * Apply some changes from revs 4521:4523 so cvs2svn works. + * Include CHANGES in /usr/share/doc/subversion/. This is the upstream + summary of changes for each release. + * Compile against current libapr (closes: #177836). + * Fix path in svn_load_dirs (closes: #176610). + * Increase verbosity on testsuite so autobuilders don't kill the testsuite + due to inactivity. + * Don't create arch independant packages in the binary-arch target + (closes: #174381) + * Make testsuite run on sparc and alpha. It wasn't previously being run + due to a bug in the shell snippet that determines whether or not we want + it to run. + * Change libapache2-dav-svn dependancy from apache2-common to apache2, + we need one of the mpm's to have a working server (closes: #175902) + * Work-around for duplicate conffile entries created by debhelper. + + -- David Kimdon Sun, 15 Dec 2002 11:08:02 -0800 + +subversion (0.16.0-1) unstable; urgency=low + + * New upstream release. + * update /etc/subversion/config to include webdav compression option + * add back subversion.conffiles, it is needed for older versions of + debhelper. + * /etc/subversion/proxies renamed to /etc/subversion/servers (actually this + happenned with 0.15.0 or so but I forgot to note it here) + * upgrade to policy 3.5.8 + * include the contents of tools/hook-scripts/ in subversion-tools package + (closes: #171997) + * patches from Brandon Ehle to fix swig + build + * cat tests.log on testsuite failure. + * fix the pathnames on some scripts from tools/ on install. + * compile with -Wall + * subversion-tools now depends on exim | mail-transport-agent + * sed cvs2svn at install so we find rcsparse.py (closes: #172284) + + -- David Kimdon Thu, 5 Dec 2002 07:52:24 -0800 + +subversion (0.15.0-2) unstable; urgency=low + + * Fix broken conffile (closes: #171323) + * Don't run testsuite on archs that succeeded with 0.15.0-1. + * remove subversion.conffiles until Bug#126520 is closed. + + -- David Kimdon Sun, 1 Dec 2002 08:28:35 -0800 + +subversion (0.15.0-1) unstable; urgency=low + + * New upstream release. + * Add dependancy on libdb4.0-util for subversion and libapache2-dav-svn + packages. In case a repository gets wedged we want db4.0_recover + available. Fix paths in hot-backup.py (closes: #169797, #169796) + * Doc install cleanup thanks to Jon Middleton + * aprutl version checking hack, thanks to Jon Middleton + * Include a statically linked svnadmin that we can copy to svnadmin-$(VERSION) + on upgrade if the repository format changes. This facilitates a + repository dump/reload. + + -- David Kimdon Fri, 29 Nov 2002 10:19:14 -0800 + +subversion (0.14.5-1) unstable; urgency=low + + * add hot-backup.py (closes: #164870) + * Make swig1.3 build-dep a versioned build-dep (closes: #166301) + * The suggested location of the passwd file for libapache2-dav-svn has + moved from /etc/svn to /etc/subversion since the command line tools + store configuration info in that directory. + * add subversion-tools package. + * Add subversion-server package. This package depends on other packages + that you probably want to have if you are setting up a Subversion server. + * Don't ship svn-design.info anymore. All the info we need can be + found in the Subversion book. + * Subversion handbook is now a xml book, "Subversion : The Definitive Guide" + include the html version of this book. + * Build fixes and updates thanks to Jon Middleton + * Warn users upgrading from versions prior to 0.14.3 that they need to + do a dump/reload (closes: #163092). At some point I'd like to find a + good way of better automating the conversion. + * a few lintian fixes. + + -- David Kimdon Wed, 23 Oct 2002 08:01:54 -0700 + +subversion (0.14.3-3) unstable; urgency=low + + * Put autogen back as a prerequisite for the clean target. I + erroneously removed the autogen.sh run in the last upload, this left + us with a broken libtool. (closes: #164781) + + -- David Kimdon Sat, 19 Oct 2002 09:10:03 -0700 + +subversion (0.14.3-2) unstable; urgency=low + + * Disable testsuite on archs that have already built 0.14.3-1 + * new package python2.2-subversion (based on package created by + the subversion-snapshot source). These python bindings are used + by various scripts that we want to include eventually. + * libtool bug 98342 is fixed. We don't need to patch ltmain.sh anymore + (closes: #163858) + * build against new libapr0 which has a versioned shlibs file + (closes: #162814) + + -- David Kimdon Wed, 25 Sep 2002 22:57:41 -0700 + +subversion (0.14.3-1) unstable; urgency=low + + * New upstream release (closes: #158677) + - build against new libneon (closes: #160270) + - updated manpage (closes: #158834) + * make symlinks in /etc/apache2/ relative rather than absolute + (closes: #161268) + * Change priotiry (optional->extra). + * Update to standards version 3.5.7. + - honor 'nostrip' in DEB_BUILD_OPTIONS + - build with debug info by default + * include default dav_svn.conf in the proper location so + we can disable mod_dav_svn when libapache2-dav-svn is removed + (closes: #158549). + * Use /etc/subversion/config to give us proper editor behavior rather + than patching the C source as I had when I closed Bug#157129. + * Patch libsvn_subr so it respects /etc/subversion/config. + + -- David Kimdon Sat, 24 Aug 2002 11:36:11 -0700 + +subversion (0.14.1-3) unstable; urgency=low + + * rename apache module libapache-dav-svn -> libapache2-dav-svn + to indicate it is an apache2 module (closes: #158133) + * remove libapache-dav-svn dependancy on apache2, we only need to depend + on apache2-common (closes: #158132) + * cleanup handling of config.{sub|guess} + + -- David Kimdon Mon, 26 Aug 2002 21:15:35 -0700 + +subversion (0.14.1-2) unstable; urgency=low + + * Autotools fixes prompted by a failed autobuild and based on recomendations + in /usr/share/doc/autotools-dev/README.Debian.gz + - call configure with --host and --build flags based on the output of + dpkg-architecture + - symlink config.{sub|guess} during build so they are always up to date. + Add build-dep on autotools-dev. + - Call autogen.sh when cleaning the tree. Add versioned build-dep + on autoconf. + * Remove commented python package rule and python2.2-dev build-dep. + (I do plan on making the python package like in subversion-snapshot + in the future but still need to figure some things out.) + + -- David Kimdon Sat, 24 Aug 2002 07:42:49 -0700 + +subversion (0.14.1-1) unstable; urgency=low + + * New upstream version. + * some build fixes thanks to Jon Middleton + * libsvn0-dev priority changed from optional to extra since + libsvn0-dev depends on extra libdb4.0-dev and policy forbids + binary dependancies on packages with lower priorities. + * libneon build dep changed (libneon-dev -> libneon21-dev) + * Conform to policy section 12.4 (Editors and Pagers) which states + that if the EDITOR variable is not set the program should use + /usr/bin/editor when necessary. (closes: #157129) + + -- David Kimdon Fri, 9 Aug 2002 19:29:12 -0700 + +subversion (0.14.0-2) unstable; urgency=low + + * Fix up descriptions to indicate this is no longer pre-alpha, + this is an alpha realease. + * remove version dependancy's from build-deps and libapache-dav-svn deps, + the versions cause more trouble than they are worth and the proper + dependancy will be realized (for the most part) by way of libapr. + * rebuild with new apache2. + + -- David Kimdon Tue, 6 Aug 2002 20:51:36 -0700 + +subversion (0.14.0-1) unstable; urgency=low + + * New upstream. Alpha release. + - fix svn merge segfault (closes: #152461) + - requires new libneon (closes: #152622) + * Updates to svn-[inject|buildpackage]. + * Install /etc/bash_completion.d/subversion. (This allows for + programmable completion for the svn command under bash.) + * Include svn-handbook and svn-design, register properly with info + directory (closes: #153262) + * libsvn -> libsvn0 and other fixes base on recommendations in + Junichi Uekawa's Debian Library Packaging guide. + * Simplify libapache-dav-svn.postrm. + * Add url to package descriptions. + * add build-dep on python-dev (closes: #153199) + * remove build-dep on texi2html and texinfo since build documents are + available in the distribution. + * enable mod_dav in libapache_dav_svn, thanks to minus + for catching the bug. + + -- David Kimdon Sun, 30 Jun 2002 19:44:50 -0700 + +subversion (0.13.0-1) unstable; urgency=low + + * New upstream. + * Actually uploading for real (closes: #97234) + * Build debug version if DEB_BUILD_OPTIONS says to. + * Include hack to fix broken apxs2, we include our own version of apxs2 + and use that during the build. This will go away when apache2-dev + is fixed, that will likely be the release after 2.0.37-2. + * include selection from INSTALL in README.Debian + * Make warnings in debian/control about this being in-development, + pre-alpha software more conspicuous. + * Create /etc/apache2/mods-enabled/dav_svn.{load|conf} symlinks in + libapache-dav-svn.postinst if appropriate files exist in + /etc/apache2/mods-available. Delete these links in + libapache-dav-svn.postrm. + * include identical README.Debian in subversion and libapache-dav-svn + the info is pertinant to both packages. + * write svnadmin manpage + + -- David Kimdon Sat, 8 Jun 2002 08:19:04 -0700 + +subversion (0.12.0-1) unstable; urgency=low + + * New upstream. + * decided to delete apr/, apr-util/ and neon/ subdirs from original tarball. + We aren't using them, they just take up space. + * include experimental svn-inject and svn-buildpackage + * run testsuite during build + * add build-dep on python so we can run the testsuite + * update package descriptions + * bring back libsvn package + + -- David Kimdon Sat, 4 May 2002 09:41:54 -0700 + +subversion (0.11.1-1) unstable; urgency=low + + * New upstream. + * Now we aren't deleting the apr/ and neon/ subdirs, even though + we don't use them. + * add zlib1g-dev, bison, and patch to build depends. + * files previously in libsvn package are now in subversion package, + there aren't any other projects that use those libraries. + * build in build-svn to keep source tree cleaner. + * subversion-server package renamed to libapache-dav-svn + + -- David Kimdon Fri, 12 Apr 2002 20:16:22 -0700 + +subversion (0.10.2-1) unstable; urgency=low + + * New upstream. + * build against new apache2, neon, Berkeley DB + * stop using DBS, it was getting in my way. + * work around libtool bug #98342 with patch from the BTS. + * use Debian's libexpat rather than the included one. + * no longer using autoconf as part of the build. + + -- David Kimdon Wed, 20 Feb 2002 22:52:29 -0800 + +subversion (0.8.0-1) unstable; urgency=low + + * New upstream. + * track releases now rather than snapshots. + * build-depend on libtool, autoconf + * use dbs build scripts from package rather than on filesystem + * /etc/apache2/modules->/etc/apache2/mods-available + * rename packages svn-[server|client]-svn + -> subversion-[server|client]-svn + * change LIBTOOL_IS_A_FOOL hack since libsvn_ra wasn't building + properly + * create /etc/svn/ in subversion-server + + -- David Kimdon Fri, 23 Nov 2001 20:37:16 -0800 + +subversion-svn (473-1) unstable; urgency=low + + * New upstream. + * build against pre-release apache-2.0.28 package + * install manpages and info pages. + * don't strip libmod_dav_svn, otherwise apache can't load it + * get the module name right in dav_svn.load + * create repository in /var/svn in postinst if directory + doesn't exist and set up symlinks for apache2 + * remove dav_svn.conf on purge + * remove rpath + * subversion Debian package is now self-hosting + + -- David Kimdon Fri, 16 Nov 2001 22:01:32 -0800 + +subversion-svn (282-2) unstable; urgency=low + + * libexpat -> libsvn_expat to avoid conflict. + * don't use maintainer-mode b/c apache2 doesn't + * override mod_dav_svn install rule so we can put it in the right + place. + + -- David Kimdon Tue, 23 Oct 2001 08:32:55 -0700 + +subversion-svn (282-1) unstable; urgency=low + + * New upstream version. + + -- David Kimdon Mon, 22 Oct 2001 15:35:25 -0700 + +subversion-svn (256-1) unstable; urgency=low + + * New upstream, various packaging fixes. + + -- David Kimdon Wed, 17 Oct 2001 14:02:58 -0700 + +subversion-svn (252-1) unstable; urgency=low + + * Initial release. + + -- David Kimdon Fri, 28 Sep 2001 20:31:48 -0700 --- subversion-1.5.1dfsg1.orig/debian/lintian-overrides +++ subversion-1.5.1dfsg1/debian/lintian-overrides @@ -0,0 +1,20 @@ +# lintian overrides for binary packages +# Please use one comment line before each override line; +# debian/rules will split the file that way. + +# the ruby script isn't really needed, it's more of an example file +subversion-tools: ruby-script-but-no-ruby-dep ./usr/share/subversion/hook-scripts/commit-email.rb +# Python dependency is implied by python-subversion dependency +subversion-tools: python-script-but-no-python-dep + +# this is config documentation, not "how to build the package" +libapache2-svn: package-contains-upstream-install-documentation usr/share/doc/libapache2-svn/INSTALL.authz.gz + +# nobody but us will ever link to this, so we don't ship a shlibs file +libsvn-perl: no-shlibs-control-file usr/lib/libsvn_swig_perl-1.so.1.0.0 + +# nobody but us will ever link to this, so we don't ship a shlibs file +python-subversion: no-shlibs-control-file usr/lib/libsvn_swig_py-1.so.1.0.0 + +# nobody but us will ever link to this, so we don't ship a shlibs file +libsvn-ruby1.8: no-shlibs-control-file usr/lib/libsvn_swig_ruby-1.so.1.0.0 --- subversion-1.5.1dfsg1.orig/debian/libsvn1.install +++ subversion-1.5.1dfsg1/debian/libsvn1.install @@ -0,0 +1,8 @@ +debian/tmp/usr/lib/libsvn_ra*.so.1* usr/lib +debian/tmp/usr/lib/libsvn_fs*.so.1* usr/lib +debian/tmp/usr/lib/libsvn_wc-1.so.1* usr/lib +debian/tmp/usr/lib/libsvn_delta-1.so.1* usr/lib +debian/tmp/usr/lib/libsvn_subr-1.so.1* usr/lib +debian/tmp/usr/lib/libsvn_client-1.so.1* usr/lib +debian/tmp/usr/lib/libsvn_repos-1.so.1* usr/lib +debian/tmp/usr/lib/libsvn_diff-1.so.1* usr/lib --- subversion-1.5.1dfsg1.orig/debian/subversion-tools.manpages +++ subversion-1.5.1dfsg1/debian/subversion-tools.manpages @@ -0,0 +1,6 @@ +debian/man/svnwrap.1 +debian/man/svn-hot-backup.1 +debian/man/svn-fast-backup.1 +debian/man/svn-backup-dumps.1 +contrib/client-side/svn2cl/svn2cl.1 +BUILD/contrib/client-side/svn-clean.1 --- subversion-1.5.1dfsg1.orig/debian/test.sh +++ subversion-1.5.1dfsg1/debian/test.sh @@ -0,0 +1,16 @@ +#!/bin/sh +# This is the meager start to a script that will test the package. + +SVN=/usr/bin/svn +SVNADMIN=/usr/bin/svnadmin + +# create test repository +rm -rf /var/lib/svn/* + +$SVNADMIN create --fs-type fsfs /var/lib/svn +$SVN mkdir -m '' file:///var/lib/svn/repos + +# uncomment repos stuff + +/etc/init.d/apache2 restart + --- subversion-1.5.1dfsg1.orig/debian/subversion.NEWS +++ subversion-1.5.1dfsg1/debian/subversion.NEWS @@ -0,0 +1,38 @@ +subversion (1.5.0dfsg1-1) experimental; urgency=low + + * As did Subversion 1.4.0, Subversion 1.5.0 will SILENTLY UPGRADE the + format of any working copy it touches. Thereafter, you won't be able + to use earlier Subversion releases with the same working copy. + * In order to use certain features of 1.5.0, you will need to upgrade + your repositories. Unlike with working copies, this is not done + automatically; use the 'svnadmin upgrade' command. + * A lot has changed in 1.5.0; you are encouraged to read + /usr/share/doc/subversion/svn_1.5_releasenotes.html . + + -- Peter Samuelson Thu, 24 Jul 2008 00:03:29 -0500 + +subversion (1.4.6dfsg1-2) unstable; urgency=low + + If you are using BDB repositories, you will get "DB_VERSION_MISMATCH" + errors when you try to use them with recent Subversion, due to the move + to db4.6. To fix this, just run 'svnadmin recover /path/to/repo' for + each affected repository. We apologise for the inconvenience. + + -- Peter Samuelson Tue, 12 Feb 2008 06:49:14 -0600 + +subversion (1.4.0~rc4-1) experimental; urgency=low + + Subversion 1.4.0 will SILENTLY UPGRADE the format of any working copy + it touches. Thereafter, you won't be able to use earlier Subversion + releases with the same working copy. The good news is that this new + format is much more efficient than the old; you should notice a + respectable speed increase for operations such as 'svn status', + especially with large checkouts. + + 1.4.0 also brings an incompatible enhancement (known as 'svndiff1') to + the repository storage format, reducing disk usage by something like + 30%. However, this ONLY affects new repositories, created with svnadmin + 1.4. Existing repositories will continue to use the old format. If you + want to take advantage of svndiff1, dump and reload your repositories. + + -- Peter Samuelson Sun, 23 Jul 2006 15:49:56 -0500 --- subversion-1.5.1dfsg1.orig/debian/copyright +++ subversion-1.5.1dfsg1/debian/copyright @@ -0,0 +1,225 @@ +This package was put together by David Kimdon . +Current maintainers are Peter Samuelson , Troy Heber + and Guilherme de S. Pastore . + +Source was downloaded from: +http://subversion.tigris.org/downloads/subversion-1.4.2.tar.gz + +Several files from the "contrib" directory were removed as the +copyright/license situation is not quite clear. + +Subversion is covered by the following license: + +This license applies to all portions of Subversion which are not +externally-maintained libraries (e.g. apr/, apr-util/, and neon/). +Such libraries have their own licenses; we recommend you read them, as +their terms may differ from the terms below. + + * Debian note: This Debian package does not include those + "externally-maintained libraries". + +This is version 1 of this license. It is also available online at +http://subversion.tigris.org/license-1.html. If newer versions of +this license are posted there (the same URL, but with the version +number incremented: .../license-2.html, .../license-3.html, and so +on), you may use a newer version instead, at your option. + +==================================================================== +Copyright (c) 2000-2004 CollabNet. All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are +met: + +1. Redistributions of source code must retain the above copyright +notice, this list of conditions and the following disclaimer. + +2. Redistributions in binary form must reproduce the above copyright +notice, this list of conditions and the following disclaimer in the +documentation and/or other materials provided with the distribution. + +3. The end-user documentation included with the redistribution, if +any, must include the following acknowledgment: "This product includes +software developed by CollabNet (http://www.Collab.Net/)." +Alternately, this acknowledgment may appear in the software itself, if +and wherever such third-party acknowledgments normally appear. + +4. The hosted project names must not be used to endorse or promote +products derived from this software without prior written +permission. For written permission, please contact info@collab.net. + +5. Products derived from this software may not use the "Tigris" name +nor may "Tigris" appear in their names without prior written +permission of CollabNet. + +THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED +WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. +IN NO EVENT SHALL COLLABNET OR ITS CONTRIBUTORS BE LIABLE FOR ANY +DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE +GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS +INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER +IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +==================================================================== + +This software consists of voluntary contributions made by many +individuals on behalf of CollabNet. + +Subversion also ships several scripts in the "contrib" directory which +are under other licenses: + +Many files are licensed under the same terms as above: +server-side/svnmirror-test.sh, server-side/svnmirror.sh, +client-side/mucc.c, client-side/mucc-test.sh, client-side/wcgrep: + + Copyright 2005 Philip Martin + Copyright 2004 Ben Reser + +Several files are licensed under the terms of the GNU GPL: +client-side/asvn, client-side/psvn/psvn.el, client-side/svn-clean, +client-side/svn_apply_autoprops.py, +client-side/svn_export_empty_files.py, client-side/svncopy.pl.in, +client-side/svnmerge.py, client-side/svnmerge_test.py, +client-side/testsvncopy.pl.in, client-side/vc-svn.el: + + Copyright (C) 2003-2004 Ross Mark + Copyright (C) 2002-2006 by Stefan Reichoer + Copyright (C) 2004, 2005, 2006 Simon Perreault + Copyright (C) 2005,2006 Blair Zajac + Copyright (c) 2005 Sony Pictures Imageworks Inc. + Copyright (c) 2005, Giovanni Bajo + Copyright (c) 2004-2005, Awarix, Inc. + Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc. + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2, or (at your option) + any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with GNU Emacs; see the file COPYING. If not, write to + the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + Boston, MA 02110-1301 USA. + + THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED + WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF + MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS + OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED + AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY + WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + POSSIBILITY OF SUCH DAMAGE. + + On Debian systems the GNU GPL can be found in + /usr/share/common-licenses/GPL-2. + +contrib/client-side/svn-viewdiff, contrib/client-side/svn-resolve, +contrib/hook-scripts/enforcer: + Copyright (c) 2002,2005 Wilfredo Sanchez Vega . + All rights reserved. + + Permission to use, copy, modify, and distribute this software for any + purpose with or without fee is hereby granted, provided that the above + copyright notice and this permission notice appear in all copies. + + THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHORS DISCLAIM ALL + WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED + WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE + AUTHORS BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL + DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR + PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER + TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR + PERFORMANCE OF THIS SOFTWARE. + +contrib/client-side/svnmerge.sh: + Copyright (c) 2004-2005, Awarix, Inc. + All rights reserved. + + Subject to the following obligations and disclaimer of warranty, + use and redistribution of this software, in source or object code + forms, with or without modifications are expressly permitted by + Awarix; provided, however, that: + + (i) Any and all reproductions of the source or object code + must include the copyright notice above and the following + disclaimer of warranties; and + (ii) No rights are granted, in any manner or form, to use + Awarix trademarks, including the mark "AWARIX" + on advertising, endorsements, or otherwise except as such + appears in the above copyright notice or in the software. + + THIS SOFTWARE IS BEING PROVIDED BY AWARIX "AS IS", AND + TO THE MAXIMUM EXTENT PERMITTED BY LAW, AWARIX MAKES NO + REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, REGARDING + THIS SOFTWARE, INCLUDING WITHOUT LIMITATION, ANY AND ALL IMPLIED + WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, + OR NON-INFRINGEMENT. AWARIX DOES NOT WARRANT, GUARANTEE, + OR MAKE ANY REPRESENTATIONS REGARDING THE USE OF, OR THE RESULTS + OF THE USE OF THIS SOFTWARE IN TERMS OF ITS CORRECTNESS, ACCURACY, + RELIABILITY OR OTHERWISE. IN NO EVENT SHALL AWARIX BE + LIABLE FOR ANY DAMAGES RESULTING FROM OR ARISING OUT OF ANY USE + OF THIS SOFTWARE, INCLUDING WITHOUT LIMITATION, ANY DIRECT, + INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, PUNITIVE, OR CONSEQUENTIAL + DAMAGES, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES, LOSS OF + USE, DATA OR PROFITS, HOWEVER CAUSED AND UNDER ANY THEORY OF + LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF + THE USE OF THIS SOFTWARE, EVEN IF AWARIX IS ADVISED OF + THE POSSIBILITY OF SUCH DAMAGE. + +client-side/svn2cl: + Copyright (C) 2004, 2005, 2006 Arthur de Jong. + + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions + are met: + 1. Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + 2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in + the documentation and/or other materials provided with the + distribution. + 3. The name of the author may not be used to endorse or promote + products derived from this software without specific prior + written permission. + + THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY + DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE + GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER + IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR + OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN + IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +server-side/authz_svn_group.py: + Copyright 2005 Branko Cibej + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + + On Debian systems the Apache License can be found in + /usr/share/common-licenses/Apache-2.0. --- subversion-1.5.1dfsg1.orig/debian/libapache2-svn.README.Debian +++ subversion-1.5.1dfsg1/debian/libapache2-svn.README.Debian @@ -0,0 +1,4 @@ +This apache module is configured in /etc/apache2/mods-available/dav_svn.conf + + + -- Guilherme de S. Pastore , Sat Aug 20 19:56:07 2005 --- subversion-1.5.1dfsg1.orig/debian/libsvn1.links +++ subversion-1.5.1dfsg1/debian/libsvn1.links @@ -0,0 +1 @@ +usr/lib/libsvn_ra_neon-1.so.1 usr/lib/libsvn_ra_dav-1.so.1 --- subversion-1.5.1dfsg1.orig/debian/python-subversion.install +++ subversion-1.5.1dfsg1/debian/python-subversion.install @@ -0,0 +1,2 @@ +debian/tmp/usr/lib/libsvn_swig_py*.so.* usr/lib +debian/tmp/usr/lib/python* usr/lib --- subversion-1.5.1dfsg1.orig/debian/subversion-tools.install +++ subversion-1.5.1dfsg1/debian/subversion-tools.install @@ -0,0 +1,11 @@ +tools/hook-scripts/* usr/share/subversion/hook-scripts +BUILD/tools/hook-scripts/* usr/share/subversion/hook-scripts + +tools/server-side/svn-backup-dumps.py usr/bin +contrib/server-side/svn-fast-backup usr/bin +contrib/client-side/svn-clean usr/bin +contrib/client-side/svn_apply_autoprops.py usr/bin +contrib/client-side/svnmerge/svnmerge.py usr/bin +contrib/client-side/svn2cl/svn2cl.sh usr/bin +contrib/client-side/svn2cl/*.{xml,xsl,css} etc/svn2cl +debian/svnwrap.sh usr/bin --- subversion-1.5.1dfsg1.orig/debian/python-subversion.dirs +++ subversion-1.5.1dfsg1/debian/python-subversion.dirs @@ -0,0 +1 @@ +usr/bin --- subversion-1.5.1dfsg1.orig/debian/README.source +++ subversion-1.5.1dfsg1/debian/README.source @@ -0,0 +1,4 @@ +This Debian package uses quilt(1) for patch management. +Please see /usr/share/doc/quilt/README.source for more information. + + -- Peter Samuelson Wed, 18 Jun 2008 21:45:55 -0500 --- subversion-1.5.1dfsg1.orig/debian/subversion-tools.postinst +++ subversion-1.5.1dfsg1/debian/subversion-tools.postinst @@ -0,0 +1,54 @@ +#!/bin/sh -e + +#DEBHELPER# + +# Old subversion packages had a /usr/lib/subversion which is now in /usr/share. +# Create symlink for same, but this will fail if any files existed in +# /usr/lib/subversion which did not come from subversion-tools. That includes +# local admin files and files from other packages - but no such files exist +# in the Debian archive so these will be non-Debian packages. +# +# Yes, this whole situation is ugly. See bug #330824. + +pkg=subversion-tools +olddir=/usr/lib/subversion +newdir=/usr/share/subversion +linktgt=../share/subversion +tmphack=$(getent passwd root | cut -f6 -d:)/${pkg}_upgrade_hack + +if [ -L $olddir ]; then exit 0; fi + +warn () { echo >&2 "$pkg: $*"; } +explain () { + warn "" + warn "As of Debian subversion 1.2.3dfsg1-1, $olddir" + warn "will be a link to $newdir." + warn "Please move all files out of $olddir and retry" + warn " dpkg --configure $pkg" + warn "If this is not possible, you may instead run" + warn " touch '$tmphack'" + warn " dpkg --configure $pkg" + warn "and the symlink will not be created." + exit 1 +} + +if [ -e "$tmphack" ]; then + warn "WARNING: $tmphack found" + warn "NOT creating link: $olddir -> $linktgt" + rm -f "$tmphack" || true + exit 0 +fi + +if [ -d $olddir ] && + ! find $olddir -depth -type d -print0 | xargs -0r rmdir; then + warn "Files exist in $olddir:" + cd $olddir; find . -type f | sed "s,^./,$pkg: ," + warn "These files were either created locally or included" + warn "in a non-Debian package." + explain +fi +if [ -e $olddir ]; then + warn "$olddir exists but is not a directory." + explain +fi +ln -s $linktgt $olddir --- subversion-1.5.1dfsg1.orig/debian/dav_svn.conf +++ subversion-1.5.1dfsg1/debian/dav_svn.conf @@ -0,0 +1,54 @@ +# dav_svn.conf - Example Subversion/Apache configuration +# +# For details and further options see the Apache user manual and +# the Subversion book. +# +# NOTE: for a setup with multiple vhosts, you will want to do this +# configuration in /etc/apache2/sites-available/*, not here. + +# ... +# URL controls how the repository appears to the outside world. +# In this example clients access the repository as http://hostname/svn/ +# Note, a literal /svn should NOT exist in your document root. +# + + # Uncomment this to enable the repository + #DAV svn + + # Set this to the path to your repository + #SVNPath /var/lib/svn + # Alternatively, use SVNParentPath if you have multiple repositories under + # under a single directory (/var/lib/svn/repo1, /var/lib/svn/repo2, ...). + # You need either SVNPath and SVNParentPath, but not both. + #SVNParentPath /var/lib/svn + + # Access control is done at 3 levels: (1) Apache authentication, via + # any of several methods. A "Basic Auth" section is commented out + # below. (2) Apache and , also commented out + # below. (3) mod_authz_svn is a svn-specific authorization module + # which offers fine-grained read/write access control for paths + # within a repository. (The first two layers are coarse-grained; you + # can only enable/disable access to an entire repository.) Note that + # mod_authz_svn is noticeably slower than the other two layers, so if + # you don't need the fine-grained control, don't configure it. + + # Basic Authentication is repository-wide. It is not secure unless + # you are using https. See the 'htpasswd' command to create and + # manage the password file - and the documentation for the + # 'auth_basic' and 'authn_file' modules, which you will need for this + # (enable them with 'a2enmod'). + #AuthType Basic + #AuthName "Subversion Repository" + #AuthUserFile /etc/apache2/dav_svn.passwd + + # To enable authorization via mod_authz_svn + #AuthzSVNAccessFile /etc/apache2/dav_svn.authz + + # The following three lines allow anonymous read, but make + # committers authenticate themselves. It requires the 'authz_user' + # module (enable it with 'a2enmod'). + # + #Require valid-user + # + +# --- subversion-1.5.1dfsg1.orig/debian/compat +++ subversion-1.5.1dfsg1/debian/compat @@ -0,0 +1 @@ +4 --- subversion-1.5.1dfsg1.orig/debian/subversion.examples +++ subversion-1.5.1dfsg1/debian/subversion.examples @@ -0,0 +1 @@ +tools/dev/gnuify-changelog.pl --- subversion-1.5.1dfsg1.orig/debian/libsvn-ruby1.8.install +++ subversion-1.5.1dfsg1/debian/libsvn-ruby1.8.install @@ -0,0 +1,2 @@ +debian/tmp/usr/lib/libsvn_swig_ruby*.so.* usr/lib +debian/tmp/usr/lib/ruby usr/lib --- subversion-1.5.1dfsg1.orig/debian/libapache2-svn.dirs +++ subversion-1.5.1dfsg1/debian/libapache2-svn.dirs @@ -0,0 +1 @@ +usr/share/doc/libapache2-svn --- subversion-1.5.1dfsg1.orig/debian/libsvn-doc.examples +++ subversion-1.5.1dfsg1/debian/libsvn-doc.examples @@ -0,0 +1 @@ +tools/examples/*.c --- subversion-1.5.1dfsg1.orig/debian/libsvn-dev.install +++ subversion-1.5.1dfsg1/debian/libsvn-dev.install @@ -0,0 +1,11 @@ +debian/tmp/usr/include/subversion-1 usr/include +debian/tmp/usr/lib/libsvn_ra*.{a,so} usr/lib +debian/tmp/usr/lib/libsvn_fs*.{a,so} usr/lib +debian/tmp/usr/lib/libsvn_ra-1.la usr/lib +debian/tmp/usr/lib/libsvn_fs-1.la usr/lib +debian/tmp/usr/lib/libsvn_wc-1.{a,la,so} usr/lib +debian/tmp/usr/lib/libsvn_delta-1.{a,la,so} usr/lib +debian/tmp/usr/lib/libsvn_subr-1.{a,la,so} usr/lib +debian/tmp/usr/lib/libsvn_client-1.{a,la,so} usr/lib +debian/tmp/usr/lib/libsvn_repos-1.{a,la,so} usr/lib +debian/tmp/usr/lib/libsvn_diff-1.{a,la,so} usr/lib --- subversion-1.5.1dfsg1.orig/debian/python-subversion.README.Debian +++ subversion-1.5.1dfsg1/debian/python-subversion.README.Debian @@ -0,0 +1 @@ +See /usr/bin/svnshell for an example that uses the python bindings. --- subversion-1.5.1dfsg1.orig/debian/subversion.install +++ subversion-1.5.1dfsg1/debian/subversion.install @@ -0,0 +1,10 @@ +debian/tmp/usr/bin/svn* usr/bin +debian/tmp/usr/share/locale usr/share +debian/tmp/usr/share/man/man1 usr/share/man +debian/tmp/usr/share/man/man5 usr/share/man +debian/tmp/usr/share/man/man8 usr/share/man + +debian/tools/svn-defaults/config etc/subversion +debian/tools/svn-defaults/servers etc/subversion +contrib/client-side/emacs/psvn.el usr/share/emacs/site-lisp +debian/etc/50psvn.el etc/emacs/site-start.d --- subversion-1.5.1dfsg1.orig/debian/subversion.dirs +++ subversion-1.5.1dfsg1/debian/subversion.dirs @@ -0,0 +1 @@ +etc/bash_completion.d --- subversion-1.5.1dfsg1.orig/debian/control +++ subversion-1.5.1dfsg1/debian/control @@ -0,0 +1,184 @@ +Source: subversion +Section: devel +Priority: optional +Maintainer: Ubuntu Core developers +XSBC-Original-Maintainer: Peter Samuelson +Uploaders: Troy Heber , + Guilherme de S. Pastore +Build-Depends: debhelper, libneon27-gnutls-dev, zlib1g-dev, + libapr1-dev, libaprutil1-dev, libdb4.6-dev, + libsasl2-dev, apache2-threaded-dev, quilt, doxygen, + autotools-dev, autoconf, libtool, swig, + python-all-dev, python-all-dbg, python-support, + perl, libperl-dev, ruby1.8, ruby1.8-dev, + default-jdk [!alpha !arm !hppa !m68k !mips !mipsel !hurd-i386], + junit [!alpha !arm !hppa !m68k !mips !mipsel !hurd-i386] +Build-Conflicts: libsvn-dev (<< 1.5) +XS-Python-Version: 2.3, 2.4, 2.5 +Homepage: http://subversion.tigris.org/ +Vcs-Svn: svn://svn.debian.org/pkg-subversion/trunk +Vcs-Browser: http://svn.debian.org/wsvn/pkg-subversion/trunk/ +Standards-Version: 3.8.0 + +Package: subversion +Section: devel +Architecture: any +Depends: libsvn1 (= ${binary:Version}), ${shlibs:Depends} +Suggests: subversion-tools, db4.6-util, patch +Description: Advanced version control system + Subversion, also known as svn, 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. + . + This package includes the Subversion client (svn), tools to create a + Subversion repository (svnadmin) and to make a repository available + over a network (svnserve). + +Package: libsvn1 +Section: libs +Architecture: any +Depends: ${shlibs:Depends} +Description: Shared libraries used by Subversion + This package includes shared libraries to manipulate Subversion (svn) + repositories and working copies. See the 'subversion' package for + more information. + +Package: libsvn-dev +Section: libdevel +Priority: extra +Architecture: any +Depends: libsvn1 (= ${binary:Version}), libapr1-dev, libaprutil1-dev +Suggests: libsvn-doc, zlib1g-dev, libneon27-gnutls-dev +Conflicts: libsvn0-dev +Replaces: libsvn0-dev +Description: Development files for Subversion libraries + This package contains the symlinks, headers, and object files needed + to compile and link programs which use libsvn1, the Subversion + libraries. This package is needed only in order to compile software + that uses libsvn1. + +Package: libsvn-doc +Suggests: libsvn-dev +Section: doc +Priority: extra +Architecture: all +Description: Developer documentation for libsvn + This package contains development (API) documentation for libsvn1, the + Subversion libraries. See the 'libsvn1' package for more information. + +Package: libapache2-svn +Section: net +Architecture: any +Depends: apache2.2-common, ${shlibs:Depends} +Suggests: db4.6-util +Description: Subversion server modules for Apache + This package provides the mod_dav_svn and mod_authz_svn modules for + the Apache 2.2 web server. These modules provide Subversion's WebDAV + server backend, to serve repositories over the http and https + protocols. See the 'subversion' package for more information. + +Package: python-subversion +Section: python +Architecture: any +Depends: subversion, ${shlibs:Depends}, ${python:Depends} +Conflicts: libsvn0 (<< 1.2.3dfsg1-1), + python2.3-subversion, python2.4-subversion +Replaces: libsvn0 (<< 1.2.3dfsg1-1), + python2.3-subversion, python2.4-subversion +Provides: ${python:Provides} +Suggests: python-subversion-dbg +Description: Python bindings for Subversion + This is a set of Python interfaces to libsvn, the Subversion + libraries. It is useful if you want to, for example, write a Python + script that manipulates a Subversion repository or working copy. See + the 'subversion' package for more information. + +Package: python-subversion-dbg +Priority: extra +Section: python +Architecture: any +Depends: python-subversion (= ${Source-Version}), python-dbg, ${shlibs:Depends} +Description: Python bindings for Subversion (debug extension) + This is a set of Python interfaces to libsvn, the Subversion + libraries. It is useful if you want to, for example, write a Python + script that manipulates a Subversion repository or working copy. See + the 'subversion' package for more information. + . + This package contains the extension built for the python debug interpreter. + +Package: subversion-tools +Section: admin +Priority: extra +Architecture: all +Depends: subversion (>= 1.5) +Recommends: python-subversion (>= 1.5), libsvn-perl (>= 1.5), + libconfig-inifiles-perl, liburi-perl, + exim4 | mail-transport-agent, xsltproc, rsync +Suggests: libsvn-ruby1.8 +Conflicts: kdesdk-scripts (<= 4:3.5.5-1) +Description: Assorted tools related to Subversion + This package includes miscellaneous tools for use with Subversion + clients and servers: + * svn-backup-dumps: incremental dumpfile-based backup script + * svn-clean: Remove unversioned files from a working copy + * svn-fast-backup: rsync-based backup script for FSFS repositories + * svn-hot-backup: backup script, primarily for BDB repositories + * svn_apply_autoprops: Apply property settings from + .subversion/config file to an existing repository + * svn2cl: Generate GNU-style changelog from repository history + * svnmerge: Maintain merge history between two related branches + (mostly obsolete as of Subversion 1.5) + * svnwrap: Set umask to 002 before calling svn or svnserve + * several example hook scripts: commit-access-control, commit-email, + log-police, mailer, svnperms, verify-po + . + NOTE that some of these scripts are unsupported by upstream, and may + change radically or disappear in future releases. The Recommended + packages are each required by at least one of these scripts. + +Package: libsvn-java +Replaces: libsvn-javahl +Conflicts: libsvn-javahl +Provides: libsvn-javahl +Section: devel +Architecture: any +Depends: default-jre-headless | java5-runtime-headless, libsvn1 (= ${binary:Version}) +Description: Java bindings for Subversion + This is a set of Java classes which provide the functionality of + libsvn, the Subversion libraries. It is useful if you want to, for + example, write a Java class that manipulates a Subversion repository + or working copy. See the 'subversion' package for more information. + +Package: libsvn-perl +Section: perl +Architecture: any +Depends: ${perl:Depends}, ${shlibs:Depends} +Conflicts: libsvn-core-perl, libsvn0 (<< 1.2.3dfsg1-1) +Replaces: libsvn-core-perl, libsvn0 (<< 1.2.3dfsg1-1) +Provides: libsvn-core-perl +Description: Perl bindings for Subversion + This is a set of Perl interfaces to libsvn, the Subversion libraries. + It is useful if you want to, for example, write a Perl script that + manipulates a Subversion repository or working copy. See the + 'subversion' package for more information. + +Package: libsvn-ruby1.8 +Section: devel +Architecture: any +Depends: ruby1.8, ${shlibs:Depends} +Description: Ruby bindings for Subversion + This is a set of Ruby interfaces to libsvn, the Subversion libraries. + It is useful if you want to, for example, write a Ruby script that + manipulates a Subversion repository or working copy. See the + 'subversion' package for more information. + +Package: libsvn-ruby +Section: devel +Architecture: all +Depends: libsvn-ruby1.8 +Description: Ruby bindings for Subversion (dummy package) + This is a dummy package to install the Subversion library bindings for + the default version of Ruby. --- subversion-1.5.1dfsg1.orig/debian/subversion-tools.postrm +++ subversion-1.5.1dfsg1/debian/subversion-tools.postrm @@ -0,0 +1,7 @@ +#!/bin/sh -e + +#DEBHELPER# + +if [ -L /usr/lib/subversion ]; then + rm /usr/lib/subversion +fi --- subversion-1.5.1dfsg1.orig/debian/libsvn-java.install +++ subversion-1.5.1dfsg1/debian/libsvn-java.install @@ -0,0 +1,2 @@ +debian/tmp/usr/lib/libsvnjavahl*.so* usr/lib/jni +debian/tmp/usr/share/java usr/share --- subversion-1.5.1dfsg1.orig/debian/svn_1.5_releasenotes.html +++ subversion-1.5.1dfsg1/debian/svn_1.5_releasenotes.html @@ -0,0 +1,1511 @@ + + + + + + +Subversion 1.5 Release Notes + + + +
+ +

Subversion 1.5 Release Notes

+ +
+

What's New in Subversion 1.5

+ + + +

Subversion 1.5 is a superset of all previous Subversion releases, +and is considered the current "best" release. Any feature or bugfix +in 1.0.x through 1.4.x is also in 1.5, but 1.5 contains features and +bugfixes not present in any earlier release. The new features will +eventually be documented in a 1.5 version of the free Subversion book, +see svnbook.red-bean.com.

+ +
+ +
+

Compatibility Concerns

+ +

Older clients and servers interoperate transparently with 1.5 +servers and clients. However, some of the new 1.5 features (e.g., merge tracking) may not be available +unless both client and server are the latest version . There are also +cases (e.g., sparse checkouts) where a +new feature will work but will run less efficiently if the client is +new and the server old.

+ +

There is no need to dump and reload your +repositories. Subversion 1.5 can read repositories created by earlier +versions. To upgrade an existing installation, just install the +newest libraries and binaries on top of the older ones.

+ +

Subversion 1.5 maintains API/ABI compatibility with earlier +releases, by only adding new functions, never removing old ones. A +program written to the 1.0, 1.1, 1.2, 1.3, or 1.4 API can both compile +and run using 1.5 libraries. However, a program written for 1.5 +cannot necessarily compile or run against older libraries.

+ +
+

New Feature Compatibility Table

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
New FeatureMinimum ClientMinimum ServerMinimum RepositoryNotes
Merge tracking1.51.51.5
Sparse checkouts1.5anyany
Interactive conflict resolution1.5anyany
Changelist support1.5anyany
Relative URLs, peg revisions in svn:externals1.5anyany
Cyrus SASL support for ra_svn and svnserveany*, 1.5any*, 1.5any*Limited, see SASL and svn:// compatibility
Improved support for large deployments on FSFS, via shardingany*, 1.51.51.5*1.5 required for file:// compatibility
Improved FSFS optimizability, via immutable file isolationany*, 1.51.51.5*1.5 required for file:// compatibility
WebDAV transparent write-through proxyany1.5*any*Apache 2.2 server also required
Improvements to copy and move1.5any*, 1.5any*Limited, see Copy/move-related improvements
Speed improvements, cancellation response improvements1.5anyany
Easier to try experimental ra_serf DAV access module1.5anyany
+ +
+ +
+

Working Copy and Repository Format Changes

+ +

The working copy format has been upgraded. This means that 1.4 and +older Subversion clients will not be able to work with +working copies produced by Subversion 1.5. Working copies are upgraded automatically.

+ +

Similarly, the repository format has changed, meaning that 1.4 and +older versions of Subversion tools that normally access a repository +directly (e.g. svnserve, mod_dav_svn, +svnadmin) won't be able to read a repository created by +Subversion 1.5. But, repositories are not upgraded automatically.

+ +
+

Working Copy Upgrades

+ +

WARNING: if a Subversion 1.5 client encounters a +pre-1.5 working copy, it will automatically upgrade the +working copy format as soon as it touches it, making it unreadable by +older Subversion clients. If you are using several versions of +Subversion on your machine, be careful about which version you use in +which working copy, to avoid accidentally upgrading a working copy. +(But note that this "auto upgrade" behavior does not occur +with the repositories, only working +copies.)

+ +

If you accidentally upgrade a 1.4 working copy to 1.5, and wish to +downgrade back to 1.4, use the change-svn-wc-format.py script. See this FAQ entry for details, and run the script with the +--help option for usage instructions.

+ +
+ +
+

Repository Upgrades

+ +

The Subversion 1.5 server works with 1.4 and older repositories, +and it will not upgrade such repositories to 1.5 unless +specifically requested to via the +svnadmin upgrade command. This means +that some of the new 1.5 features will not become available simply by +upgrading your server: you will also have to upgrade your +repositories. (We decided not to auto-upgrade repositories because we +didn't want 1.5 to silently make repositories unusable by +1.4 — that step should be a conscious decision on the +part of the repository admin.)

+ +

After running svnadmin upgrade, +you may wish to also run the svn-populate-node-origins-index program on the repository. +Subversion 1.5 maintains a node-origins index for each repository, and +builds the index lazily as the information is needed. But for old +repositories with lots of revisions, it's better to create the index +in one step, using the aforementioned tool, than to have live queries +be slower until the index has built itself. See issue +#3024 for details.

+ +
+ +
+ +
+

Command Line Output Changes

+ +

Although we try hard to keep output from the command line programs +compatible between releases, new information sometimes has to be +added. This can break scripts that rely on the exact format of the +output. Unfortunately, we are not able to enumerate all of the output +changes in 1.5, but one of them is that conflict markers in files now +match the file's defined eol-style.

+ +
+ +
+

SASL and svn:// compatibility

+ +

All 1.x clients, with or without Cyrus SASL support, will be able to +authenticate against all 1.x servers that do not have Cyrus SASL enabled. +Note that the CRAM-MD5 and ANONYMOUS mechanisms are +built into Subversion, so you'll be able to use them even if the +corresponding Cyrus SASL plugins are missing.

+ +

1.x clients without Cyrus SASL support will be able to authenticate +against 1.5+ servers with SASL enabled, provided the server allows the +CRAM-MD5 and/or ANONYMOUS mechanisms.

+ +

1.5+ clients with Cyrus SASL support will be able to authenticate against +1.5+ servers with SASL enabled, provided at least one of the mechanisms +supported by the server is also supported by the client.

+ +

See this section for more information on +using Cyrus SASL with Subversion.

+ +
+ +
+

Custom revprops may now need to be examined by pre-commit + hooks

+ +

Each revision in Subversion has a set of revision properties +associated with it; in addition to the standard log message, author, +and date, arbitrary user-defined properties can be set. These +properties are not themselves versioned, so there is no way to revert +changes to them. Because of this, you cannot modify revprops on a +committed revision without setting up a pre-revprop-change +hook on the server. Before Subversion 1.5, only the three standard +revprops could be set at commit time; administrators using hooks to +control the contents of the three standard revprops needed to check +during pre-commit and pre-revprop-change, but for +custom revprops, only pre-revprop-change appeared +relevant.

+ +

Subversion 1.5 adds +a --with-revprop option to svn +commit which allows users to specify revprops for revisions +as they commit them. Thus, in Subversion 1.5, it is possible for +revproperties to be set on revisions without +any pre-revprop-change. The pre-commit hook can +examine the transaction's revision properties before it is committed +(just like many servers already use pre-commit to check for +properly formatted log messages, e.g.).

+ +

This means that if you previously relied +on pre-revprop-change to control the ability to write to +revprops (as opposed to just keeping track of their history), you may +want to add similar controls to pre-commit.

+ +
+ + +
+ +
+

New Features

+ +
+

Merge tracking (foundational) (client and server)

+ +

Merge tracking means Subversion keeps track of what +changes have been merged where. This reduces the overhead involved in +maintaining branches, and gives users a way to inquire what changes +are merged — or are available to be +merged — on different lines of development.

+ +

The merge tracking support in Subversion 1.5 is "foundational": its +basic functionality is implemented, but there are still parts of our +original +spec that remain to be done, and merging is sometimes too slow. +There will be merge tracking improvements in Subversion 1.5.1 and +afterwards. In the meantime:

+ + + +
+

Overview

+ +

Subversion's merge tracking is designed to:

+ +
    +
  • Reduce the bookkeeping overhead for branch maintenance
    • +
  • Avoid common cases of the "repeated merge" problem
    • +
  • Allow for cherry-picking of changes
    • +
+ +

Each changeset is identified by its revision number, and merged +changesets are recorded in the new +svn:mergeinfo property (known colloquially +as "mergeinfo") set on the destination of the merge. Subversion keeps +mergeinfo up-to-date automatically, but there is also a way to record/unrecord merges manually, since +there will always be cases where a human knows something that +Subversion doesn't.

+ +
+ +
+

User interface

+ +

Merging changes from (say) trunk to a branch no longer requires +that you specify the revision range. Instead, each time you want to +sync up with trunk, you can just do:

+ +
   $ cd BRANCH_WORKING_COPY
+   $ svn merge URL_TO_TRUNK
+ +

Subversion will figure out what changes from URL_TO_TRUNK have not +yet been merged and pull in just those changes. When it's time to +merge the branch back to trunk, do this:

+ +
   $ cd TRUNK_WORKING_COPY
+   $ svn merge --reintegrate URL_TO_BRANCH
+ +

Below is a more formal description of all the +merge-tracking-related interface changes.

+ +

The svn merge command takes two new +options: --record-only and +--reintegrate.

+ +
+

The --record-only option works with -r and does exactly what you +think it does: it marks a revision as merged (or unmerged, if using +the "-" revision number negation syntax), without actually changing +anything besides the mergeinfo. For example, this would be useful +when someone has hand-edited a file in such a way as to effectively +incorporate a change that was already made somewhere else. Rather +than have the original change be ported over in the next +synchronization merge, thus risking textual conflicts wherever the two +versions trivially differ, you can just record the change as already +merged. (See the merge-tracking requirements, and Blocking Changes in the Subversion book, for more details.)

+
+ +
+

The --reintegrate option is used when merging a branch back to +trunk; it checks for some common safeguard conditions and then does +the merge in a fast and efficient way. See Keeping a branch in sync in the Subversion book for more.

+
+ +

The new svn mergeinfo command can +show which changesets a directory has absorbed and which changesets +it's still eligible to receive. See Mergeinfo and Previews in the Subversion book for more information.

+ +

The svn log and +svn blame commands take a new +-g +(--use-merge-history) option, which tells +them to take mergeinfo into account. Without this option, they won't.

+ +

The reason for the -g option is that it is sometimes useful to +ignore merge history. In blame output you sometimes want to see the +person B who merged a change, though other times you want to see the +person A who originally wrote the change that B later merged; use -g +to get the latter information. In log output, you sometimes want to +see exactly the revisions that were committed on a given line of +development, though other times you want to see, as part of the same +output, the original changes that were later ported as merge +revisions; again, -g includes the latter information (tagged with +lines that say "Merged via: " followed by the revision number +in which the merge took place). See Merge-Sensitive Logs and Annotations in the Subversion book for +more details.

+ +
+ +
+

Merge tracking and compatibility

+ +

As described earlier, merge-tracking is not supported unless you upgrade the repository as well as the +server.

+ +

If you were using the svnmerge wrapper program to do merging, and now want to switch to +using Subversion 1.5's native merge-tracking, then you should use the +svnmerge-migrate-history.py script to convert svnmerge's custom +properties to the svn:mergeinfo properties that Subversion +itself now uses.

+ +
+ +
+

Known Issues

+ +

There are still known issues with merge tracking in 1.5.0. We're +working on the most important ones first, which are:

+ +
    +
  • issue #3128: merge --reintegrate should handle + renames better
    • +
  • issue #2897: proper support for reflective merges
    • +
  • issue #3126: better change-availability reporting + (svn mergeinfo shows too few or too many eligible + revisions)
    • +
  • issue #2837: allow merge tracking to be useful when performing + cyclic merging
    • +
  • issue #3056: avoid repeat merge in an intelligent way
    • +
  • issue #2898: handle mergeinfo when deleting/adding children + you don't have access to
    • +
  • issue #3067: subtrees that don't exist at the start or end of + a merge range shouldn't break the merge
    • +
  • issue #3157: merging a change from a path's natural history + creates self-referential mergeinfo
    • +
  • issue #3174: merge algorithm chokes on subtrees needing + special attention that have been renamed
    • +
+ +

(See also the list of merge-tracking-related open issues and the list of all merge-related open issues, though note that not all +of merge-related issues are about merge-tracking and many predate it.)

+ +

Issue #3157 is particularly easy to run into, so here's a more +detailed explanation of what the issue is and how to work around +it:

+ +

Merge tracking information currently can include the "natural +history" of a path. One situation where this happens is when creating +a branch from trunk at a certain revision X +and later merging all changes from branch back to +trunk, without explicitly limiting the merge range and +without using the --reintegrate option. Afterwards, the merge +tracking information on trunk will list revisions before +X. This does no harm to future merge operations, but +thereafter svn log -g on trunk will report these +revisions from the "natural history", which is typically not expected. +This is because svn log -g uses the merge tracking +information from previous revisions (not only from HEAD).

+ +

Note that this should not be a problem with release branches (also +called "maintenance branches"), because one typically does not merge +them back to trunk. Instead, recommended practice is for new changes +to enter on trunk and be ported outward to the branches that need the +changes. However, you could run into this problem with a feature +branch, which would be merged back to trunk once, at the end of the +branch's lifetime.

+ +

One workaround is to correct the merge tracking information before +committing the merged revision, by reverse merging the "natural +history" information: svn merge --record-only -rX:1. +Another solution is to avoid this situation entirely, by explicitly +specifying merge ranges in the first place, e.g.: -rX:HEAD. +See this mail for more information.

+ +

When merging a feature branch, the best solution is to use the --reintegrate option; +then this problem won't happen in the first place.

+ +
+ +
+

Further reading

+ +

For more on merge-tracking in Subversion 1.5, see:

+ + + +
+ +
+ +
+

Sparse checkouts (client and server)

+ +

Many users have very large trees of which they only want to +checkout certain parts. In previous versions of Subversion, +checkout -N was not really up to this task. Subversion +1.5 introduces the --depth option to the +checkout, +switch, and +update subcommands. This option +replaces -N, and allows users to construct working +copies containing just what's needed, leaving out everything else.

+ +
+

Depth overview

+

Each directory now understands the notion of depth, which has +four possible values: empty, files, immediates, +infinity. The values are defined as follows:

+ + + + + + + + + + + + + + + + + + +
emptyUpdates will not pull in any files or subdirectories not already + present.
filesUpdates will pull in any files not already present, but not + subdirectories.
immediatesUpdates will pull in any files or subdirectories not already present; + the new subdirectories will have depth-empty.
infinityUpdates will pull in any files or subdirectories not already present; + the new subdirectories will have depth-infinity. Equivalent to today's + default update behavior.
+ +

The --depth option sets depth values as it updates the working +copy, tweaking new subdirectories' depth values as described above.

+ +
+ +
+

User Interface

+

Affected commands:

+
    +
  • checkout
    • +
  • switch
    • +
  • update
    • +
  • status
    • +
  • info
    • +
+ +

The -N option becomes a synonym for --depth=files +for these commands. This changes the existing -N behavior for +these commands, but in a trivial way (see below).

+ +

checkout without --depth or +-N behaves the same as it does today. +switch and update without +--depth or -N behave the same way as today +if and only if the working copy is fully depth-infinity. +switch and update without +--depth or -N will not change depth +values (exception: a missing directory specified on the command line +will be pulled in).

+ +

Thus, checkout is identical to checkout +--depth=infinity, but switch and update are +not the same as switch --depth=infinity and update +--depth=infinity. The former update entries according to existing depth +values, while the latter pull in everything.

+ +

To get started, run checkout with +--depth=empty or --depth=files. If +additional files or directories are desired, pull them in with +update commands using appropriate --depth +options. The svn status command should list the ambient +depths of directories, in addition to whatever other statuses are +listed. The svn info command also lists ambient depth, +when invoked on a directory whose depth is not the default +(depth-infinity)

+ +

Note: There is currently no deselection +interface for sparse checkouts — that is, there is no +command to unselect or "fold up" a subdirectory after you've brought +it into a sparse working copy (although there are some fairly easy +workarounds to achieve the same effect). See issue +#2843 for details.

+ +
+ +
+

Compatibility with older servers

+ +

The new --depth feature naturally requires the client to +be 1.5+, and will work most efficiently if the server is also 1.5+. +However, the client will still behave correctly if the server is 1.4.x +or lower; things will just be less efficient.

+ +

This is because older servers do not +understand — and therefore +ignore — what the client tells them about "depth". So +when a client requests a depth shallower than depth-infinity, older +servers will send back more data than the client wants. However, a +1.5+ client will know it's talking to an older server and filter out +this extra data. Thus, operations may take a while, because the +server sends a lot of data over the network that the client then +ignores, but the final result on the client side will be the same. +(Note that older servers understand a recurse flag in the +network protocols, and 1.5+ clients send that flag based on the depth; +this alleviates some of the extra network traffic penalty.)

+ +
+ +
+

Further reading

+ + + +
+ +
+ +
+

Interactive Conflict Resolution (client)

+ +

Conflict resolution is now done interactively by the command-line +client for the +update/switch/merge +subcommands, and the client library offers a callback function so +other clients can do similarly.

+ +

Here's an example using the command-line client:

+ +
+   $ svn up
+   U    contrib/client-side/svnmerge/svnmerge_test.py
+   Conflict discovered in 'contrib/client-side/svnmerge/svnmerge.py'.
+   Select: (p) postpone, (df) diff-full, (e) edit,
+           (s) show all options: s
+     (p)  postpone    - mark the conflict to be resolved later
+     (df) diff-full   - show all changes made to merged file
+     (e)  edit        - change merged file in an editor
+     (r)  resolved    - accept merged version of file
+     (mf) mine-full   - accept my version of entire file (ignore their changes)
+     (tf) theirs-full - accept their version of entire file (lose my changes)
+     (l)  launch      - launch external tool to resolve conflict
+     (s)  show all    - show this list
+
+   Select: (p) postpone, (df) diff-full, (e) edit,
+           (s) show all options: tf
+   G    contrib/client-side/svnmerge/svnmerge.py
+   Updated to revision 25685.
+   $ 
+
+ +

This feature can be selectively disabled by using the --non-interactive +option, or disabled permanently by setting '[miscellany] interactive-conflicts + = no' in your run-time config file.

+ +

The API for interactive conflict resolution is exposed via a +callback function and the following new data types:

+ +
    +
  • svn_wc_conflict_resolver_func_t, the callback API + itself
    • +
  • svn_wc_conflict_description_t, a description of the + conflict passed to the callback
    • +
  • svn_wc_conflict_action_t, the part of the conflict + description indicating what the merge was trying to do
    • +
  • svn_wc_conflict_reason_t, the part of the conflict + description indicating the type of conflict
    • +
  • svn_wc_conflict_result_t, returned by the callback + as the result of any conflict resolution attempt
    • +
  • svn_wc_conflict_choice_t, an enum indicating what + course of action the user chose
    • +
+ +

Clients provide their callback function to Subversion's libraries +by setting it on the (new) conflict_func field of their +svn_client_ctx_t, and may provide additional state to the +callback via the corresponding conflict_baton field.

+ +
+ +

Changelist +support (client)

The Subversion client now contains +the notion of a changelist: a group of files which are +associated with a chosen name. This becomes especially useful when +working on several different set of files within the same working +copy. Instead of having to remember each file in each set, Subversion +1.5 will allow you to associate a changelist with each set of files. +Most commands which take a set of files as targets will now also +accept the --changelist option, which +filters those targets based upon the members of the changelist. +Changelist membership can be edited using the new +changelist subcommand.

+ +

Changelists are handled entirely by the client. They are never sent +to the server, and aren't visible to other users of the same repository. +Also, the --changelist option is never additive; if a file +wouldn't have been included in the list of targets without +--changelist, it will not be added to it, regardless of membership +in the changelist. Currently, a file may only be in one changelist at a +time, and directories can not be members of a changelist.

+ +

The --changelist option is supported by the following +subcommands:

+
    +
  • changelist
    • +
  • commit
    • +
  • diff (only wc-wc and wc-repos cases)
    • +
  • info
    • +
  • propget
    • +
  • proplist
    • +
  • propset
    • +
  • propdel
    • +
  • revert
    • +
  • status
    • +
  • update
    • +
+ +
+

Further reading

+ + + +
+ +
+ +
+

Relative URLs, peg revisions in svn:externals + (client)

+ +

Two additions to the svn:externals feature

+ +
+

Peg revision syntax for URLs

+ +

Compatibility and the new syntax: For compatibility +reasons, the pre-1.5 svn:externals syntax continues to not understand +peg revisions. A new format has been introduced to allow peg +revisions in URLs.

+ +

The old format of

+
+   foo             http://example.com/repos/zig
+   foo/bar -r 1234 http://example.com/repos/zag
+
+ +

does not support peg revisions, and the following externals will +not work (unless there are directories named zig@HEAD and +zag@HEAD):

+ +
+   foo             http://example.com/repos/zig@HEAD
+   foo/bar -r 1234 http://example.com/repos/zag@HEAD
+
+ +

The new format moves the URL first followed by the directory the +external is checked out or exported into; if there is an operative +(-r) revision, it precedes the URL. Here are four externals lines:

+ +
+   http://example.com/repos/zig foo1
+   -r 1234 http://example.com/repos/zag foo/bar1
+   http://example.com/repos/zig@HEAD foo2
+   -r 1234 http://example.com/repos/zag@HEAD foo/bar2
+
+ +

In other words, both operative ("-r") and peg ("@") revisions are +allowed, but neither is required.

+ +
+ +
+

Support for relative URLs

+ +

Prior to Subversion 1.5, the URLs in an svn:externals +specification must be absolute. Now they can be relative. Four +different relative externals specifications are supported. (In the +following examples, assume we have two repositories: one at +http://example.com/svn/repos-1 and another at +http://example.com/svn/repos-2. We have a checkout of +http://example.com/svn/repos-1/project1/trunk and the +svn:externals property is set on trunk.)

+ +
../
+

Relative to the directory with the svn:externals +property. These URLs always begin with the string ../, for +example:

+
+   ../../project2/trunk common/project2/trunk
+
+ +

This will extract +http://example.com/svn/repos-1/project2/trunk into +common/project2/trunk. The external's URL is relative to the +URL of the directory with the svn:externals property, not the +directory where the external is written to disk.

+ +
^/
+ +

Relative to the repository root.

+ +
+   ^/project2/trunk common/project2/trunk
+
+ +

This will extract +http://example.com/svn/repos-1/project2/trunk into +common/project2/trunk.

+ +

You can also refer to other repositories easily using repository +root relative URLs:

+ +
+   ^/../repos-2/foo/trunk common/foo/trunk
+
+ +

This will extract http://example.com/svn/repos-2/foo/trunk +into common/foo/trunk.

+
+ +
//
+ +

Relative to the scheme. This copies the scheme of the checkout +or export URL into the URL in svn:externals. It is useful +when the same hostname must the accessed with different schemes +depending upon network location; i.e. clients in the intranet use +http:// while external clients use svn+ssh://.

+ +
+   //example.com/svn/repos-1/project2/trunk common/project2/trunk
+
+ +

This will extract +http://example.com/svn/repos-1/project2/trunk into +common/project2/trunk. If the working copy was checked out +from svn+ssh://example.com/svn/repos-1/project1/trunk then +this URL would be +svn+ssh://example.com/svn/repos-1/project1/trunk.

+
+ +
/
+ +

Server root relative URLs. This copies the scheme and hostname +from the checkout or export URL into the svn:externals +URL.

+ +
+   /svn/repos-1/project2/trunk common/project2/trunk
+
+ +

This will extract +http://example.com/svn/repos-1/project2/trunk into +common/project2/trunk. If the working copy was checked out +from svn+ssh://example.com/svn/repos-1/project1/trunk then +this URL would be +svn+ssh://example.com/svn/repos-1/project1/trunk.

+
+ +
+ +

Relative URLs are still supported in the old svn:externals +format (that does not support peg revisions).

+ +

When Subversion sees an svn:externals without an absolute +URL, it takes the first argument as a relative URL and the second as +the target directory.

+ +
+ +
+

Further reading

+ +

See The svn:externals section of the Subversion Book.

+ +
+ +
+ +
+

Cyrus SASL support for ra_svn and svnserve (client +and server)

+ +

From +Wikipedia: "SASL is a framework for authentication and data security in +Internet protocols. It decouples authentication mechanisms from application +protocols, in theory allowing any authentication mechanism supported by SASL to +be used in any application protocol that uses SASL."

+ +

In practice, the server sends a list of authentication mechanisms that it +supports. The client then selects one of these mechanisms based on what the +client supports, and informs the server of its decision. After that, a +number of messages are exchanged until either authentication succeeds or an +error occurs. In the latter case, the client is allowed to restart +authentication.

+ +

The svn:// protocol has always supported this type of negotiation. +However, only the CRAM-MD5 and ANONYMOUS mechanisms were +implemented. Cyrus SASL supports +all these, and, in addition, provides a host of other mechanisms such as +DIGEST-MD5, OTP (One-Time Passwords), GSSAPI (used for Kerberos +authentication), NTLM (NT LAN Manager), SRP (Secure Remote Password), and +others. The exact list of available mechanisms depends on how SASL was +compiled, as many of them either have external dependencies, or are not +built by default. Also, because each mechanism is actually a shared library +that is dynamically loaded at runtime, many distributions package these +mechanisms separately from the core library.

+ +

Please see the compatibility +section for information regarding using a 1.5 SASL-enabled server +with pre-1.5 clients. More information about Subversion's SASL +support can be found in sasl.txt.

+ +
+ +
+

Improved support for large deployments on FSFS, via sharding + (server)

+ +

The FSFS filesystem backend stores each revision in its own file, and prior +to Subversion 1.5, all of these files were stored in a common directory in +the repository. Now, newly created FSFS repositories will use a +two-level directory tree with up to (by default) 1000 files per directory. +These repositories will only be compatible with other Subversion 1.5 clients, +but of course, Subversion 1.5 will be able to continue using repositories +employing the older scheme without any problem.

+ +

The primary reason for the change is to allow the revision count to +grow beyond the filesystem's (efficient) directory entry limit. While +modern filesystems can support millions of entries per directory, they +become slower and common administrative tools (e.g. directory +listings, backups) become unwieldy or fail completely.

+ +

For more information about the technical underpinnings of FSFS sharding, +see this blog +entry. + +

+ +

The shard size can by adjusted by editing the +"layout sharded" line in "db/format" after +svnadmin create but before populating the +repository.

+ +
+ +
+

Improved FSFS optimizability, via immutable file isolation + (server)

+ +

The FSFS repositories never change a revision after it is written +to the disk. Although this should allow the operating system to cache +these files forever, certain filesystems (e.g. NFS) prohibit such +caching by default. Now the FSFS repository layout has been changed +such that the immutable files are confined to the subdirectories +"db/revs" and "db/txn-protorevs". This allows these directories to be +on a mount point where caching is enabled (on Linux look at the +"nocto" option to nfs(5)).

+ +

Since commit transactions are now built up in "db/txn-protorevs" +instead of "db/transactions", the latter directory no longer needs to +be on the same mount point. If the repository is stored on a slower +filesystem (e.g. NFS), then commit performance can be improved by +moving the transactions directory to local disk (using a symbolic +link). If you are using multiple svn servers behind a network load +scaler, you must configure the load scaler to direct to the same +server for the duration of the transaction. This is typically called +"client affinity".

+ +
+ +
+

WebDAV transparent write-through proxy (server)

+ +

Subversion 1.4 +introduced svnsync — a tool which +provided the ability to replicate repository history from one +repository to another. Though useful, svnsync could only +pull revision history from a repository, not push additional commits +back to the master. Subversion 1.5 adds WebDAV proxy support to +mod_dav_svn, effectively allowing bidirectional revision +history replication between master servers and slave servers using +mod_dav_svn.

+ +

All clients interact with a slave server, but the slave transparently +passes all of the write-oriented activites to the master (rewriting the +content as necessary). The slaves are essentially read-only, but they +do have a complete copy of the repository locally. This serves to +alleviate read traffic from the master server which may be desirable +in certain circumstances.

+ +

This model has several advantages to using a straight HTTP DAV-aware +caching proxy, in that each slave can respond to all read-only requests +without ever having to relay them to the master backend.

+ +
+

Requirements

+
    +
  • Subversion 1.5 or newer.
    • +
  • Apache HTTP Server 2.2.0 or higher with mod_proxy enabled. + (Several fixes to mod_proxy were committed for this patch that were not + backported to the 2.0 branch of httpd.)
    • +
+ +
+ +
+

Example configuration

+ +

Participants:

+
    +
  • Slave → slave.example.com (there can be many!)
    • +
  • Master → master.example.com (there can only be one!)
    • +
  • A WebDAV client (ra_neon, ra_serf, other WebDAV + clients)
    • +
+ +

Each client does:

+

+    % svn co http://slave.example.com/repos/slave/
+    ...
+    % svn ci
+    % ...etc...
+
+

(The client can perform all operations as normal.)

+ +

Each slave has:

+

+    <Location /repos/slave>
+      DAV svn
+      SVNPath /my/local/copy/of/repos
+      SVNMasterURI http://master.example.com/repos/master/
+    </Location>
+
+ +

The master MUST have a post-commit hook that updates all of the slaves. An +example that does this using svnadmin dump/svnadmin +load and ssh is provided below. svnsync can probably do the +same thing.

+ +

Additionally, if locks are permitted on the master repository, lock +databases need to kept in sync via post-lock and post-unlock hooks on +the master pushing the lock state to the slaves. (Username +preservation is left as an exercise to the reader. Translation: patches to these notes are most +welcome.) If the lock database is not propogated, users will not +be able to accurately determine whether a lock is +held — but locking will still work.

+ +

A sample synchronization script may look like this:

+

+   #!/bin/sh
+   REPOS="$1"
+   REV="$2"
+   SLAVE_HOST=slave.example.com
+   SLAVE_PATH=/my/local/copy/of/repos
+
+   # Ensure svnadmin is in $PATH on both this machine and the remote server!
+   svnadmin dump --incremental -r$2 $1 > /tmp/$2.dump
+   scp /tmp/$2.dump $SLAVE_HOST:$SLAVE_PATH
+   ssh $SLAVE_HOST "svnadmin load $SLAVE_PATH < $SLAVE_PATH/$2.dump"
+   ssh $SLAVE_HOST "rm $SLAVE_PATH/$2.dump"
+   rm /tmp/$2.dump
+
+ +
+ +
+

Further reading

+ +

Additional information about WebDAV proxy support is available in the +repository.

+ +
+ +
+ +
+ + +
+

Enhancements and Bugfixes

+ +
+

Copy/move-related improvements (client and server)

+ +

The abilities and behavior of copy and +move operations are significantly improved in 1.5+.

+ +
+

Improved copy-handling during updates (client and server)

+ +

A common problem in older versions of Subversion was the way in +which svn update handled incoming copies and moves.

+ +

Consider this scenario: Harry runs svn move foo bar; svn +commit, and meanwhile Sally makes local changes to 'foo', and +then runs svn update. In earlier versions of Subversion, +the server would send down a completely new file 'bar', and unversion +the file 'foo' (if it had no uncommitted changes, Subversion would +remove it entirely.) From Sally's point of view, her changes seem to +be lost; the newly added 'bar' file has the older content, and the +file 'foo' has been taken out of version control.

+ +

In Subversion 1.5, the client and server both attempt to be smarter +about this. The server doesn't send a whole new file during the +update, but rather instructions to copy something that likely already +exists in the working copy. So Sally's 'foo' file is copied to 'bar' +(with local edits intact!).

+ +

In theory, this is the best-case scenario. There are a few +caveats: this "proper copying" of existing working-copy resources only +works on files, not (yet) on directories. Also, if an incoming +move-operation deletes 'foo' before it attempts to copy it to 'bar', +then the copy will fail, and the client reverts to the old behavior of +fetching a pristine copy of the file from the repository. We hope to +address this in svn 1.6.

+ +

See issue +#503 for more.

+ +
+ +
+

Peg revisions (client)

+ +

Copy and move operations now accept sources with peg ("@") +revisions.

+ +

See issue +#2546 for more.

+ +
+ +
+

Multiple working copy copy/move operations (client)

+ +

Clients may now perform chained copy/move operations locally on a +single object in a working copy:

+ +
+   svn mv path1 path2
+   svn mv path2 path3
+
+ +

See issue +#756 for more.

+ +
+ +
+

Improved handling multiple copy/move sources (client)

+ +

Clients now accept multiple sources for copy and move operations, with +the ability to copy/move each of the sources to the specified directory. +This mirrors the behavior of standard command-line copy and move tools, +such as cp and mv. For example:

+ +
+   svn mkdir new_subdir
+   svn mv foo.txt bar.txt baz.txt new_subdir
+
+ +

In practice, this means users can take advantage of shell globbing +when doing a local copy or move:

+ +
+   svn cp *.c dir
+
+ +

Multiple source copy/move also works for all previously defined +copy/move working copy and repository combinations.

+ +

See issue +#747 for more.

+ +
+ +
+

Copy takes -rBASE (client)

+ +

Copy now understands the special revision "BASE" in a working copy +(as in: "-rBASE").

+ +

See issue +#1643 for more.

+ +
+ +
+

Creation of intermediate directories with copy/move + (client and server)

+ +

See the section on the new --parents option for more about this.

+ +
+ +
+ +
+

Cancellation improvements (client)

+ +

Clients operations are now significantly more responsive to +cancellation (e.g. via control-c). In pre-1.5 releases, +after directing an operation to stop, one sometimes had to wait for +some time (e.g. while I/O occurred) before the operation would +actually stop.

+ +
+ +
+

Command-line client improvements (client)

+ +

There are far too many enhancements and new options to the +command-line client to list them all here. Aside from all the ones +mentioned already in these release notes, below are a few more that we +consider important, but please see the 1.5.0 section in the CHANGES file +for a complete list.

+ +
+

New "resolve" subcommand replaces "resolved"

+ +

A new resolve subcommand replaces the +"resolved" subcommand (the latter is deprecated, but still +present for compatibility). The new subcommand takes a +--accept=orig|mine|repo option to select +which version of a file to retain (which means Subversion now supports +batch-style conflict resolution).

+ +

See issue +#2784 for more.

+ +
+ +
+

Create intermediate directories if asked

+ +

Add, mkdir, copy, and move take a new +--parents option, which makes intermediate +directories as necessary to create the destination path.

+ +

See issue +#1776 for more

+ +
+ +
+

New --keep-local option retains path after delete.

+ +

Delete (remove) now takes a +--keep-local option to retain its +targets locally, so paths will not be removed even if unmodified.

+ +
+ +
+

Commit now takes a --with-revprop option.

+ +Commit now takes a --with-revprop option +allowing one to set revision properties + +

See issue +#1976 for more.

+ +
+ +
+ +
+

Easier to try out experimental ra_serf DAV access module +(client)

+ +

Subversion 1.4 introduced the experimental ra_serf +repository access module for accessing HTTP[S] DAV Subversion servers. +This uses the serf +library instead of the Neon library which the original DAV support +uses. serf supports pipelined requests which may lead to better +performance. However, Subversion 1.4 required you to choose which +module to use for accessing DAV servers at build time, which made it +difficult to find out which module performs better for your usage +patterns.

+ +

Subversion 1.5 allows you to build both modules at the same time; +you can choose which library to use on a global or host-by-host basis +by setting the http-library variable in your run-time server +configuration file (~/.subversion/servers). In recognition +of the fact that both libraries are DAV clients, we have +renamed ra_dav to ra_neon.

+ +
+ +
+

API changes, improvements and language bindings + (client and server)

+ +

There are too many new and revised APIs in Subversion 1.5.0 to even +begin to list them all here. See the Subversion API +Documentation page for general API information. If you develop a +3rd-party client application that uses Subversion APIs, you should +probably look at the header files for the interfaces you use and see +what's changed.

+ +

One general change is that most APIs that formerly took a +recurse parameter have been upgraded to accept a +depth parameter instead, to enable the new sparse checkouts feature.

+ +

Language bindings have mostly been updated for the new APIs, though +some may lag more than others.

+ +
+ +
+

Bug fixes (client and server)

+ +

A great many bugs have been fixed. See the 1.5.0 section in the CHANGES file +for details.

+ +
+ +
+ +
+

Subversion 1.3.x series no longer supported

+ +

The Subversion 1.3.x line is no longer supported. This doesn't +mean that your 1.3 installation is doomed; if it works well and is all +you need, that's fine. "No longer supported" just means we've stopped +accepting bug reports against 1.3.x versions, and will not make any +more 1.3.x bugfix releases, except perhaps for absolutely critical +security or data-loss bugs.

+ +
+ +
+

Subversion Dependencies Distribution: Binary Compatibility Issues

+ +
+

Background

+ +

APR 0.9.x and 1.x are binary-incompatible. This means if you are +already using Subversion with APR 0.9.x, and then upgrade your libapr +to 1.X without rebuilding Subversion, things will break. +Things will also break if your Subversion server libraries are linked +to one version of APR but your Apache HTTPD server is linked to a +different version.

+ +

For a long time, Subversion's main source distribution included APR +0.9.x, which was the latest available at the time, along with a few +other things (e.g., Neon, zlib) that weren't yet widespread on +installation systems.

+ +
+ +
+

Subversion 1.5.0 Dependencies Distribution

+ +

Today, these dependencies are no longer exotic, so our source +distribution contains just Subversion itself. Those building +Subversion are expected to have the necessary libraries already +installed, or to be able to fetch them easily. But for convenience, +we still offer a "deps" distribution: it doesn't contain Subversion, +it just has source code for those third-party libraries.

+ +

Until Subversion 1.5.0, the deps distribution contained APR 0.9.x, +but as of 1.5.0, we're finally upgrading it to APR 1.x. This is +because by now there are very few systems that will have binary +compatibility issues, and of those, few are likely to build using the +"deps" dist.

+ +

If you already have a Subversion installation using APR 0.9.x, it's +still possible to move to APR 1.x safely (although you are not +required to, unless you use the deps dist). Just be sure to recompile +Subversion, and Apache httpd if necessary, after upgrading APR.

+ +

Note that it's perfectly safe to use APR 1.x from the beginning. +In fact, we recommend it. If you're building Subversion for the first +time, there's no compatibility issue to worry about, so just grab the +latest version of APR (or use our deps dist).

+ +
+ +
+ +
+ + --- subversion-1.5.1dfsg1.orig/debian/libapache2-svn.postinst +++ subversion-1.5.1dfsg1/debian/libapache2-svn.postinst @@ -0,0 +1,8 @@ +#!/bin/sh -e + +# enable on new installs only, not upgrades +if [ "$1" = "configure" ]; then + /usr/sbin/a2enmod dav_svn +fi + +#DEBHELPER# --- subversion-1.5.1dfsg1.orig/debian/tools/svn-make-config.c +++ subversion-1.5.1dfsg1/debian/tools/svn-make-config.c @@ -0,0 +1,60 @@ +/* + * Subversion will populate the user's ~/.subversion/ directory with + * default configuration files if the directory does not exist. Some + * of these same files are useful to system administrators who want to + * put files in /etc/subversion/ to control site-wide configuration. + * This program creates a default set of subversion config files in + * the current directory. + */ + +#include +#include +#include +#include +#include +#include +#include + +#define ROOT_DIR "svn-defaults" + +int +main(int argc, char *argv[]) +{ + char *root; + apr_pool_t *pool; + apr_file_t *fptr; + apr_finfo_t finfo; + + apr_initialize(); + apr_pool_create(&pool, NULL); + + apr_file_open_stderr(&fptr, pool); + + if (argc != 1) + { + apr_file_printf(fptr, "Usage: %s\n", argv[0]); + apr_file_printf(fptr, "Create a set of default config files" + "in $PWD/" ROOT_DIR "\n"); + exit(0); + } + + root = apr_psprintf(pool, "%s/%s", getenv("PWD"), ROOT_DIR); + + if (!root) + { + apr_file_printf(fptr, "apr_psprintf failed\n"); + exit(1); + } + + if (APR_SUCCESS == apr_stat(&finfo, root, 0, pool)) + { + apr_file_printf(fptr, "%s exists\n", root); + exit(1); + } + + svn_config_ensure(root, pool); + + apr_terminate(); + + return 0; +} --- subversion-1.5.1dfsg1.orig/debian/tools/README +++ subversion-1.5.1dfsg1/debian/tools/README @@ -0,0 +1,5 @@ +The files in this directory are used to create the default +/etc/subversion/config and /etc/subversion/servers on Debian systems. The +default configuration files are created by the subversion libraries. This +ensures that new configuration options and changes to existing options are +reflected in the default /etc/subversion/ files in a timely manner. --- subversion-1.5.1dfsg1.orig/debian/tools/Makefile +++ subversion-1.5.1dfsg1/debian/tools/Makefile @@ -0,0 +1,20 @@ +APR_CFLAGS = `apr-config --cppflags --includes --cflags` +SVN_INC = -I$(DEB_SRCDIR)/subversion/include +CFLAGS += -Wall \ + $(SVN_INC) \ + $(APR_CFLAGS) + +all: default-config + +default-config: clean svn-make-config + ./svn-make-config + +svn-make-config: svn-make-config.o + libtool --mode=link gcc svn-make-config.o $(DEB_BUILDDIR)/subversion/libsvn_client/libsvn_client-1.la -o svn-make-config + +clean: + $(RM) svn-make-config svn-make-config.o + rm -rf svn-defaults + rm -rf .libs + +.PHONY: clean --- subversion-1.5.1dfsg1.orig/debian/patches/apr-abi +++ subversion-1.5.1dfsg1/debian/patches/apr-abi @@ -0,0 +1,62 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## apr-abi.dpatch by +## +## DP: Use libtool -version-info to express library SONAMEs, and make it +## DP: sensitive to libapr ABI w/r/t 64-bit file offsets. +## DP: +## DP: Patch has been submitted upstream. + +@DPATCH@ +--- a/Makefile.in ++++ b/Makefile.in +@@ -98,6 +98,7 @@ + LTFLAGS = --tag=CC --silent + LTCXXFLAGS = --tag=CXX --silent + LT_LDFLAGS = @LT_LDFLAGS@ ++LT_SOVERSION = @SVN_LT_SOVERSION@ + LT_NO_UNDEFINED = @LT_NO_UNDEFINED@ + LT_CXX_LIBADD = @LT_CXX_LIBADD@ + +@@ -168,7 +169,7 @@ + COMPILE_JAVAHL_JAVAH = $(JAVAH) + + LINK = $(LIBTOOL) $(LTFLAGS) --mode=link $(CC) $(LT_LDFLAGS) $(CFLAGS) $(LDFLAGS) +-LINK_LIB = $(LINK) -rpath $(libdir) ++LINK_LIB = $(LINK) -rpath $(libdir) $(LT_SOVERSION) + + # special link rule for mod_dav_svn + LINK_APACHE_MOD = $(LIBTOOL) $(LTFLAGS) --mode=link $(CC) $(LT_LDFLAGS) $(CFLAGS) $(LDFLAGS) -rpath $(APACHE_LIBEXECDIR) -avoid-version -module $(APACHE_LDFLAGS) +--- a/build/ac-macros/apr.m4 ++++ b/build/ac-macros/apr.m4 +@@ -85,11 +85,31 @@ + AC_MSG_ERROR([apr-config --shlib-path-var failed]) + fi + ++ dnl Determine whether or not we will be using the 64-bit apr_off_t ABI. ++ dnl This necessarily changes the SONAME of libsvn_*. ++if test `expr $apr_version : 0` -ne 0; then ++ SVN_LT_SOVERSION="-version-info 0" ++else ++ SVN_LT_SOVERSION="-version-info 1" ++fi ++ dnl oldcppflags=$CPPFLAGS ++ dnl CPPFLAGS="$CPPFLAGS $SVN_APR_INCLUDES" ++ dnl AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ ++ dnl #include ++ dnl #if APR_HAS_LARGE_FILES ++ dnl # error Large file ABI required ++ dnl #endif ++ dnl ]])], [apr_lfs_abi=0], [apr_lfs_abi=1]) ++ dnl CPPFLAGS=$oldcppflags ++ dnl ++ dnl SVN_LT_SOVERSION="-version-info $apr_lfs_abi" ++ + AC_SUBST(SVN_APR_PREFIX) + AC_SUBST(SVN_APR_INCLUDES) + AC_SUBST(SVN_APR_LIBS) + AC_SUBST(SVN_APR_EXPORT_LIBS) + AC_SUBST(SVN_APR_SHLIB_PATH_VAR) ++ AC_SUBST(SVN_LT_SOVERSION) + ]) + + dnl SVN_DOWNLOAD_APR() --- subversion-1.5.1dfsg1.orig/debian/patches/series +++ subversion-1.5.1dfsg1/debian/patches/series @@ -0,0 +1,23 @@ +entropy +#java-build +last-changed-date-charset +no-extra-libs +no-extra-libs-2 +out-of-tree-build-fixes +repos-templates +rpath +ruby-no-strict-aliasing +ruby-test-svnserve-race +ruby-typemap-digest +ssh-no-sigkill +ssh-no-controlmaster +svnshell +apr-abi +fix-bdb-version-detection +svn2cl-upstream +svn2cl-debian +python-builds +examples-compile-instructions +svn-clean-ignore +commit-email +perl-test-syntax-error --- subversion-1.5.1dfsg1.orig/debian/patches/ruby-test-svnserve-race +++ subversion-1.5.1dfsg1/debian/patches/ruby-test-svnserve-race @@ -0,0 +1,61 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## +## ruby-test-svnserve-race by +## +## DP: Hack to try to avoid the race in the ruby testsuite harness between +## DP: starting up a svnserve process and trying to connect to it. If the +## DP: client tries to connect too soon, before svnserve has initialised +## DP: itself, the test in progress gets a 'connection refused' and fails. +## DP: +## DP: This race causes random test failures on slow platforms - observed on +## DP: an arm with 32 MB of RAM, and m68k buildds of unknown specs. + +@DPATCH@ +--- a/subversion/bindings/swig/ruby/test/util.rb ++++ b/subversion/bindings/swig/ruby/test/util.rb +@@ -1,5 +1,6 @@ + require "fileutils" + require "pathname" ++require "socket" + + require "my-assertions" + +@@ -220,11 +221,7 @@ + "-d", "--foreground") + } + pid, status = Process.waitpid2(@svnserve_pid, Process::WNOHANG) +- if status and status.exited? +- if $DEBUG +- STDERR.puts "port #{port} couldn't be used for svnserve" +- end +- else ++ if wait_until_svnserve_gets_available_at(port) + # svnserve started successfully. Note port number and cease + # startup attempts. + @svnserve_port = port +@@ -287,4 +284,25 @@ + include Svnserve + extend SetupEnvironment + end ++ ++ # Waits until svnserve gets available at port +port+, avoiding the race ++ # condition between starting up a svnserve process and trying to connect ++ # to it (Bug#378837 in Debian's BTS). ++ def wait_until_svnserve_gets_available_at(port) ++ 1000.times do |n| ++ begin ++ pid, status = Process.waitpid2(@svnserve_pid, Process::WNOHANG) ++ if status and status.exited? ++ STDERR.puts "port #{port} couldn't be used for svnserve" ++ return false ++ end ++ TCPSocket.new(@svnserve_host, port).close ++ rescue Errno::ECONNREFUSED ++ sleep(n < 10 ? 0.2 : 0.5) ++ else ++ return true ++ end ++ end ++ raise "svnserve couldn't get available at port #{port}" ++ end + end --- subversion-1.5.1dfsg1.orig/debian/patches/no-extra-libs +++ subversion-1.5.1dfsg1/debian/patches/no-extra-libs @@ -0,0 +1,63 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## +## no-extra-libs by +## +## DP: Work around "libtool disease" in '{apr,aprutil,neon}-config --libs', +## DP: where they think our runtime linker is too stupid to handle recursive +## DP: library dependencies. +## DP: +## DP: See Debian bug #338302. + +@DPATCH@ +--- a/build/ac-macros/apr.m4 ++++ b/build/ac-macros/apr.m4 +@@ -74,16 +74,10 @@ + AC_MSG_ERROR([apr-config --prefix failed]) + fi + +- dnl When APR stores the dependent libs in the .la file, we don't need +- dnl --libs. +- SVN_APR_LIBS="`$apr_config --link-libtool --libs`" ++ SVN_APR_LIBS="`pkg-config --libs apr-1`" ++ SVN_APR_EXPORT_LIBS="`pkg-config --libs apr-1`" + if test $? -ne 0; then +- AC_MSG_ERROR([apr-config --link-libtool --libs failed]) +- fi +- +- SVN_APR_EXPORT_LIBS="`$apr_config --link-ld --libs`" +- if test $? -ne 0; then +- AC_MSG_ERROR([apr-config --link-ld --libs failed]) ++ AC_MSG_ERROR([pkg-config --libs apr-1 failed]) + fi + + SVN_APR_SHLIB_PATH_VAR="`$apr_config --shlib-path-var`" +--- a/build/ac-macros/aprutil.m4 ++++ b/build/ac-macros/aprutil.m4 +@@ -72,14 +72,8 @@ + AC_MSG_ERROR([apu-config --includes failed]) + fi + +- dnl When APR stores the dependent libs in the .la file, we don't need +- dnl --libs. +- SVN_APRUTIL_LIBS="`$apu_config --link-libtool --libs`" +- if test $? -ne 0; then +- AC_MSG_ERROR([apu-config --link-libtool --libs failed]) +- fi +- +- SVN_APRUTIL_EXPORT_LIBS="`$apu_config --link-ld --libs`" ++ SVN_APRUTIL_LIBS="`pkg-config --libs apr-util-1`" ++ SVN_APRUTIL_EXPORT_LIBS="`pkg-config --libs apr-util-1`" + if test $? -ne 0; then + AC_MSG_ERROR([apu-config --link-ld --libs failed]) + fi +--- a/build/ac-macros/neon.m4 ++++ b/build/ac-macros/neon.m4 +@@ -153,7 +153,7 @@ + test "$svn_allowed_neon" = "any"; then + svn_allowed_neon_on_system="yes" + SVN_NEON_INCLUDES=[`$neon_config --cflags | sed -e 's/-D[^ ]*//g'`] +- NEON_LIBS=`$neon_config --la-file` ++ NEON_LIBS=`pkg-config --libs neon` + CFLAGS=["$CFLAGS `$neon_config --cflags | sed -e 's/-I[^ ]*//g'`"] + svn_lib_neon="yes" + break --- subversion-1.5.1dfsg1.orig/debian/patches/fix-bdb-version-detection +++ subversion-1.5.1dfsg1/debian/patches/fix-bdb-version-detection @@ -0,0 +1,21 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## fix-bdb-version-detection.dpatch by +## +## DP: Do not rely on apu-config to print "-ldb4.3" or whatever - see #378105. +## DP: Instead, include -laprutil-1 in the compile line. +## DP: +## DP: I don't think this can be sent upstream, as it won't work when +## DP: compiling aprutil in-tree. But I'm not certain. + +@DPATCH@ +--- a/build/ac-macros/berkeley-db.m4 ++++ b/build/ac-macros/berkeley-db.m4 +@@ -174,7 +174,7 @@ + svn_apu_bdb_lib=["`$apu_config --libs | sed -e 's/.*\(-ldb[^ ]*\).*/\1/'`"] + + CPPFLAGS="$SVN_APRUTIL_INCLUDES $CPPFLAGS" +- LIBS="`$apu_config --ldflags` $svn_apu_bdb_lib $LIBS" ++ LIBS="`$apu_config --ldflags --link-ld` $svn_apu_bdb_lib $LIBS" + + AC_RUN_IFELSE([AC_LANG_SOURCE([[ + #include --- subversion-1.5.1dfsg1.orig/debian/patches/svn-clean-ignore +++ subversion-1.5.1dfsg1/debian/patches/svn-clean-ignore @@ -0,0 +1,85 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## svn-clean-ignore by +## +## DP: Support a new 'svn-clean:ignore' directory property in +## DP: svn-clean, conceptually a lot like the svn:ignore property. +## DP: svn-clean will not remove files that match svn-clean:ignore. +## DP: Suggested by Jonathan Hall . +## DP: Submitted upstream: http://svn.haxx.se/dev/archive-2008-05/0236.shtml + +@DPATCH@ +--- a/contrib/client-side/svn-clean ++++ b/contrib/client-side/svn-clean +@@ -52,11 +52,20 @@ + # Precompile regexes. + $_ = qr/$_/ foreach @exclude; + ++my %svn_clean_ignore; + if ($use_svn_module) { + + # Create SVN client object. No need for connection to remote server. + my $ctx = new SVN::Client; + ++ my $ign = $ctx->propget('svn-clean:ignore', $path, undef, 1); ++ for my $dir (keys %$ign) { ++ for (split /\n/, $ign->{$dir}) { ++ for (glob "$dir/$_") { ++ $svn_clean_ignore{$_} = 1 if -e $_; ++ } ++ } ++ } + # Call handler function with status info for each file. + $ctx->status( $path, undef, \&clean, !$nonrecursive, 1, 0, 1 ); + } +@@ -64,8 +73,22 @@ + warn "Warning: Not using SVN Perl modules, this might be slow.\n" + unless $quiet; + +- # Build svn client command +- my @command = qw(svn status --no-ignore -v); ++ my @command = qw(svn propget svn-clean:ignore); ++ push @command, '-R' unless $nonrecursive; ++ open PG, '-|', @command, @ARGV; ++ my $dir; ++ while () { ++ if (s/(.*?) - //) { ++ $dir = $1; ++ } ++ chomp; ++ for (glob "$dir/$_") { ++ $svn_clean_ignore{$_} = 1 if -e $_; ++ } ++ } ++ close PG; ++ ++ @command = qw(svn status --no-ignore -v); + if ($nonrecursive) { + push @command, '-N'; + } +@@ -84,6 +107,7 @@ + LINE: while () { + if (/^([\?ID])/) { + my $file = (split)[-1]; ++ next if $svn_clean_ignore{$file}; + foreach my $ex (@exclude) { + if ( $file =~ $ex ) { + print "excluded $file\n" unless $quiet or $print; +@@ -109,6 +133,7 @@ + # Main file-wiping function. + sub clean { + my ( $path, $status ) = @_; ++ return if $svn_clean_ignore{$path}; + + # Use relative path for pretty-printing. + if ( $path =~ s/^\Q$CWD\E\/?//o ) { +@@ -165,7 +190,9 @@ + B will scan the given files and directories recursively and find + unversioned files and directories (files and directories that are not present in + the Subversion repository). After the scan is done, these files and directories +-will be deleted. ++will be deleted. Files which match patterns in the I dir ++property will be spared, much as the I property works for B. + + If no file or directory is given, B defaults to the current directory + ("."). --- subversion-1.5.1dfsg1.orig/debian/patches/out-of-tree-build-fixes +++ subversion-1.5.1dfsg1/debian/patches/out-of-tree-build-fixes @@ -0,0 +1,74 @@ +Fixes for out-of-tree builds. In upstream trunk r31907, r31908. + +--- a/Makefile.in ++++ b/Makefile.in +@@ -680,7 +680,10 @@ + mkdir $(SWIG_PY_DIR)/libsvn + + copy-swig-py: autogen-swig-py $(SWIG_PY_DIR)/libsvn +- @cp -pf $(SWIG_PY_SRC_DIR)/*.py $(SWIG_PY_DIR)/libsvn ++ @for f in $(SWIG_PY_SRC_DIR)/*.py $(SWIG_PY_DIR)/*.py; do \ ++ ! [ -f "$$f" ] || cp -pf $$f $(SWIG_PY_DIR)/libsvn; \ ++ done ++ @touch $(SWIG_PY_DIR)/libsvn/__init__.py + + swig-py: autogen-swig-py copy-swig-py + +--- a/subversion/bindings/swig/ruby/test/run-test.rb ++++ b/subversion/bindings/swig/ruby/test/run-test.rb +@@ -4,7 +4,8 @@ + require "fileutils" + + test_dir = File.expand_path(File.join(File.dirname(__FILE__))) +-base_dir = File.expand_path(File.join(File.dirname(__FILE__), "..")) ++base_src_dir = File.expand_path(File.join(File.dirname(__FILE__), "..")) ++base_dir = Dir.pwd + top_dir = File.expand_path(File.join(base_dir, "..", "..", "..", "..")) + + ext_dir = File.join(base_dir, ".ext") +@@ -20,6 +21,7 @@ + SvnTestUtil.setup_test_environment(top_dir, base_dir, ext_svn_ext_dir) + + $LOAD_PATH.unshift(ext_dir) ++$LOAD_PATH.unshift(base_src_dir) + $LOAD_PATH.unshift(base_dir) + $LOAD_PATH.unshift(test_dir) + +--- a/subversion/bindings/swig/ruby/test/util.rb ++++ b/subversion/bindings/swig/ruby/test/util.rb +@@ -15,20 +15,19 @@ + def setup_default_variables + test_dir = Pathname.new(File.dirname(__FILE__)) + pwd = Pathname.new(Dir.pwd) +- @base_dir = test_dir.relative_path_from(pwd).to_s + @author = ENV["USER"] || "sample-user" + @password = "sample-password" + @realm = "sample realm" +- @repos_path = File.join(@base_dir, "repos") ++ @repos_path = "repos" + @full_repos_path = File.expand_path(@repos_path) + @repos_uri = "file://#{@full_repos_path.sub(/^\/?/, '/')}" + @svnserve_host = "127.0.0.1" + @svnserve_ports = (64152..64282).collect{|x| x.to_s} +- @wc_base_dir = File.join(@base_dir, "wc-tmp") ++ @wc_base_dir = "wc-tmp" + @wc_path = File.join(@wc_base_dir, "wc") + @full_wc_path = File.expand_path(@wc_path) +- @tmp_path = File.join(@base_dir, "tmp") +- @config_path = File.join(@base_dir, "config") ++ @tmp_path = "tmp" ++ @config_path = "config" + @greek = Greek.new(@tmp_path, @wc_path, @repos_uri) + end + +--- a/subversion/bindings/swig/ruby/test/windows_util.rb ++++ b/subversion/bindings/swig/ruby/test/windows_util.rb +@@ -53,7 +53,7 @@ + service_control('stop') unless service_stopped? + service_control('delete') if service_exists? + +- svnserve_dir = File.expand_path(File.join(@base_dir, "svnserve")) ++ svnserve_dir = File.expand_path("svnserve") + FileUtils.mkdir_p(svnserve_dir) + at_exit do + service_control('stop') unless service_stopped? --- subversion-1.5.1dfsg1.orig/debian/patches/last-changed-date-charset +++ subversion-1.5.1dfsg1/debian/patches/last-changed-date-charset @@ -0,0 +1,25 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## +## last-changed-date-charset by +## +## DP: Convert $LastChangedDate$ keyword to the local character set. +## DP: See #290774. + +@DPATCH@ +--- a/subversion/libsvn_subr/subst.c ++++ b/subversion/libsvn_subr/subst.c +@@ -246,8 +246,12 @@ + break; + case 'D': /* long format of date of this revision */ + if (date) +- svn_stringbuf_appendcstr(value, +- svn_time_to_human_cstring(date, pool)); ++ { ++ char *date_keyword; ++ char *date_utf8 = svn_time_to_human_cstring (date, pool); ++ svn_utf_cstring_from_utf8(&date_keyword, date_utf8, pool); ++ svn_stringbuf_appendcstr(value, date_keyword); ++ } + break; + case 'r': /* number of this revision */ + if (rev) --- subversion-1.5.1dfsg1.orig/debian/patches/ruby-no-strict-aliasing +++ subversion-1.5.1dfsg1/debian/patches/ruby-no-strict-aliasing @@ -0,0 +1,22 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## +## ruby-no-strict-aliasing by +## +## DP: Compile ruby bindings with -fno-strict-aliasing. +## DP: It seems swig is generating _really_ bad code here, or something. +## DP: +## DP: Whatever it is, this line suppresses 1323 warnings, any of which might +## DP: be real bugs with real consequences. + +@DPATCH@ +--- a/Makefile.in ++++ b/Makefile.in +@@ -118,7 +118,7 @@ + SWIG_PY_LIBS = @SWIG_PY_LIBS@ + SWIG_PL_INCLUDES = @SWIG_PL_INCLUDES@ + SWIG_RB_INCLUDES = @SWIG_RB_INCLUDES@ -I$(SWIG_SRC_DIR)/ruby/libsvn_swig_ruby +-SWIG_RB_COMPILE = @SWIG_RB_COMPILE@ ++SWIG_RB_COMPILE = @SWIG_RB_COMPILE@ -fno-strict-aliasing + SWIG_RB_LINK = @SWIG_RB_LINK@ + SWIG_RB_LIBS = @SWIG_RB_LIBS@ + SWIG_RB_SITE_LIB_DIR = @SWIG_RB_SITE_LIB_DIR@ --- subversion-1.5.1dfsg1.orig/debian/patches/repos-templates +++ subversion-1.5.1dfsg1/debian/patches/repos-templates @@ -0,0 +1,60 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## +## repos-templates by + +@DPATCH@ +--- a/subversion/libsvn_repos/repos.c ++++ b/subversion/libsvn_repos/repos.c +@@ -427,8 +427,8 @@ + "" NL + "# Check that the author of this commit has the rights to perform" NL + "# the commit on the files and directories being modified." NL +-"commit-access-control.pl \"$REPOS\" \"$TXN\" commit-access-control.cfg || exit 1" +- NL ++"/usr/share/subversion/hook-scripts/commit-access-control.pl \\" NL ++" \"$REPOS\" \"$TXN\" \"$REPOS\"/commit-access-control.cfg || exit 1" NL + "" NL + "# All checks passed, so allow the commit." NL + "exit 0" NL; +@@ -726,8 +726,8 @@ + "REPOS=\"$1\"" NL + "REV=\"$2\"" NL + NL +-"commit-email.pl \"$REPOS\" \"$REV\" commit-watchers@example.org" NL +-"log-commit.py --repository \"$REPOS\" --revision \"$REV\"" NL; ++"/usr/share/subversion/hook-scripts/commit-email.pl \\" NL ++" \"$REPOS\" \"$REV\" commit-watchers@example.org" NL; + + #undef SCRIPT_NAME + +@@ -788,7 +788,8 @@ + "USER=\"$2\"" NL + "" NL + "# Send email to interested parties, let them know a lock was created:" NL +-"mailer.py lock \"$REPOS\" \"$USER\" /path/to/mailer.conf" NL; ++"/usr/share/subversion/hook-scripts/mailer/mailer.py lock \\" NL ++" \"$REPOS\" \"$USER\" \"$REPOS\"/hooks/mailer.conf" NL; + + #undef SCRIPT_NAME + +@@ -847,7 +848,8 @@ + "USER=\"$2\"" NL + "" NL + "# Send email to interested parties, let them know a lock was removed:" NL +-"mailer.py unlock \"$REPOS\" \"$USER\" /path/to/mailer.conf" NL; ++"/usr/share/subversion/hook-scripts/mailer.py unlock \\" NL ++" \"$REPOS\" \"$USER\" \"$REPOS\"/mailer.conf" NL; + + #undef SCRIPT_NAME + +@@ -912,8 +914,8 @@ + "PROPNAME=\"$4\"" NL + "ACTION=\"$5\"" NL + "" NL +-"commit-email.pl --revprop-change \"$REPOS\" \"$REV\" \"$USER\" \"$PROPNAME\" " +-"watchers@example.org" NL; ++"/usr/share/subversion/hook-scripts/commit-email.pl --revprop-change \\" NL ++" \"$REPOS\" \"$REV\" \"$USER\" \"$PROPNAME\" watchers@example.org" NL; + + #undef SCRIPT_NAME + --- subversion-1.5.1dfsg1.orig/debian/patches/svn2cl-debian +++ subversion-1.5.1dfsg1/debian/patches/svn2cl-debian @@ -0,0 +1,21 @@ +svn2cl-debian: hard-code svn2cl's data directory to /etc/svn2cl/. + +--- a/contrib/client-side/svn2cl/svn2cl.sh ++++ b/contrib/client-side/svn2cl/svn2cl.sh +@@ -245,15 +251,7 @@ + esac + done + +-# find the directory that this script resides in +-prog="$0" +-while [ -h "$prog" ] +-do +- dir=`dirname "$prog"` +- prog=`ls -ld "$prog" | sed "s/^.*-> \(.*\)/\1/;/^[^/]/s,^,$dir/,"` +-done +-dir=`dirname "$prog"` +-dir=`cd "$dir" && pwd` ++dir=/etc/svn2cl + XSL="$dir/svn2${OUTSTYLE}.xsl" + + # check if the authors file is formatted as a legacy --- subversion-1.5.1dfsg1.orig/debian/patches/no-extra-libs-2 +++ subversion-1.5.1dfsg1/debian/patches/no-extra-libs-2 @@ -0,0 +1,106 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## +## no-extra-libs-2 by +## +## DP: Eliminate several unneeded inter-library linkages. +## DP: This saves us one package dependency (subversion -> libneon). + +@DPATCH@ +--- a/build.conf ++++ b/build.conf +@@ -147,7 +147,7 @@ + type = exe + path = subversion/svn + libs = libsvn_client libsvn_wc libsvn_ra libsvn_delta libsvn_diff libsvn_subr +- apriconv apr neon ++ apriconv apr + manpages = subversion/svn/svn.1 + install = bin + +@@ -192,7 +192,7 @@ + description = Subversion repository replicator + type = exe + path = subversion/svnsync +-libs = libsvn_ra libsvn_delta libsvn_subr apr neon ++libs = libsvn_ra libsvn_delta libsvn_subr apr + install = bin + manpages = subversion/svnsync/svnsync.1 + +@@ -523,7 +523,7 @@ + type = lib + path = subversion/bindings/javahl/native + libs = libsvn_repos libsvn_client libsvn_wc libsvn_ra libsvn_delta libsvn_diff +- libsvn_subr libsvn_fs aprutil apriconv apr neon ++ libsvn_subr libsvn_fs apriconv apr + sources = *.cpp *.c + add-deps = $(javahl_javah_DEPS) $(javahl_java_DEPS) + install = javahl-lib +@@ -824,7 +824,7 @@ + + [apriconv] + type = lib +-external-lib = $(SVN_APRUTIL_LIBS) ++external-lib = $(SVN_APR_LIBS) + + [bdb] + type = lib +@@ -933,14 +933,14 @@ + path = contrib/client-side/svn-push + sources = svn-push.c + install = contrib +-libs = libsvn_ra libsvn_delta libsvn_subr apriconv apr neon ++libs = libsvn_ra libsvn_delta libsvn_subr apriconv apr + + [svnmucc] + type = exe + path = contrib/client-side/svnmucc + sources = svnmucc.c + install = tools +-libs = libsvn_client libsvn_ra libsvn_subr libsvn_delta apriconv apr neon ++libs = libsvn_client libsvn_ra libsvn_subr libsvn_delta apriconv apr + + [diff] + type = exe +--- a/subversion/bindings/swig/perl/native/Makefile.PL.in ++++ b/subversion/bindings/swig/perl/native/Makefile.PL.in +@@ -25,7 +25,12 @@ + fs_base + fs_util + fs_fs/)); +-my @ldmodules = map {"-lsvn_$_-1"} (@modules, qw/diff subr/); ++sub libs_line { ++ return join(' ', $apr_ldflags, ++ (map {$_ = abs_path($_); "-L$_"} @ldpaths), ++ (map {"-lsvn_$_-1"} @_), ++ '-lsvn_swig_perl-1', `$swig -perl -ldflags`); ++} + + my $apr_shlib_path_var = '@SVN_APR_SHLIB_PATH_VAR@'; + my $cppflags = '@CPPFLAGS@'; +@@ -48,10 +53,6 @@ + " -I$svnlib_builddir", + " -I$swig_srcdir -g"), + OBJECT => q/$(O_FILES)/, +- LIBS => [join(' ', $apr_ldflags, +- (map {$_ = abs_path($_); "-L$_"} @ldpaths), +- @ldmodules, '-lsvn_swig_perl-1', +- `$swig -perl -ldflags`)], + test => { TESTS => "$swig_srcdir/perl/native/t/*.t" } + ); + +@@ -61,6 +62,7 @@ + $_; + } + ++$config{LIBS} = [libs_line('diff', 'subr')]; + WriteMakefile(%config, NAME => 'SVN::_Core', C => ['core.c'], + PM => {map { ("$swig_srcdir/perl/native/$_.pm" => + "\$(INST_LIBDIR)/$_.pm") } +@@ -75,6 +77,7 @@ + ); + + for (@modules) { ++ $config{LIBS} = [libs_line($_, 'subr')]; + WriteMakefile(%config, + MAKEFILE=> "Makefile.$_", + NAME => "SVN::_".perlish($_), --- subversion-1.5.1dfsg1.orig/debian/patches/rpath +++ subversion-1.5.1dfsg1/debian/patches/rpath @@ -0,0 +1,80 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## +## rpath by + +@DPATCH@ +--- a/Makefile.in ++++ b/Makefile.in +@@ -167,7 +167,8 @@ + COMPILE_JAVAHL_JAVAC = $(JAVAC) $(JAVAC_FLAGS) + COMPILE_JAVAHL_JAVAH = $(JAVAH) + +-LINK = $(LIBTOOL) $(LTFLAGS) --mode=link $(CC) $(LT_LDFLAGS) $(CFLAGS) $(LDFLAGS) -rpath $(libdir) ++LINK = $(LIBTOOL) $(LTFLAGS) --mode=link $(CC) $(LT_LDFLAGS) $(CFLAGS) $(LDFLAGS) ++LINK_LIB = $(LINK) -rpath $(libdir) + + # special link rule for mod_dav_svn + LINK_APACHE_MOD = $(LIBTOOL) $(LTFLAGS) --mode=link $(CC) $(LT_LDFLAGS) $(CFLAGS) $(LDFLAGS) -rpath $(APACHE_LIBEXECDIR) -avoid-version -module $(APACHE_LDFLAGS) +@@ -638,7 +639,9 @@ + ./config.status subversion/bindings/swig/perl/native/Makefile.PL + + $(SWIG_PL_DIR)/native/Makefile: $(SWIG_PL_DIR)/native/Makefile.PL +- cd $(SWIG_PL_DIR)/native; $(PERL) Makefile.PL ++ cd $(SWIG_PL_DIR)/native; \ ++ $(PERL) Makefile.PL INSTALLDIRS=vendor; \ ++ sed -i -e '/^LD_RUN_PATH/s/^/#/' Makefile Makefile.[a-z]* + + swig-pl_DEPS = autogen-swig-pl libsvn_swig_perl \ + $(SWIG_PL_DIR)/native/Makefile +--- a/build.conf ++++ b/build.conf +@@ -452,7 +452,7 @@ + lang = python + path = subversion/bindings/swig/python/libsvn_swig_py + libs = libsvn_client libsvn_wc libsvn_ra libsvn_delta libsvn_subr apriconv apr +-link-cmd = $(LINK) $(SWIG_PY_LIBS) ++link-cmd = $(LINK_LIB) $(SWIG_PY_LIBS) + install = swig-py-lib + # need special build rule to include -DSWIGPYTHON + compile-cmd = $(COMPILE_SWIG_PY) +@@ -475,7 +475,7 @@ + lang = ruby + path = subversion/bindings/swig/ruby/libsvn_swig_ruby + libs = libsvn_client libsvn_wc libsvn_delta libsvn_subr apriconv apr +-link-cmd = $(LINK) $(SWIG_RB_LIBS) ++link-cmd = $(LINK_LIB) $(SWIG_RB_LIBS) + install = swig-rb-lib + # need special build rule to include + compile-cmd = $(COMPILE_SWIG_RB) +--- a/build/generator/gen_base.py ++++ b/build/generator/gen_base.py +@@ -356,7 +356,7 @@ + self.install = options.get('install') + self.compile_cmd = options.get('compile-cmd') + self.sources = options.get('sources', '*.c') +- self.link_cmd = options.get('link-cmd', '$(LINK)') ++ self.link_cmd = options.get('link-cmd', '$(LINK_LIB)') + + self.external_lib = options.get('external-lib') + self.external_project = options.get('external-project') +@@ -407,6 +407,7 @@ + extmap = self.gen_obj._extension_map + self.objext = extmap['exe', 'object'] + self.filename = build_path_join(self.path, name + extmap['exe', 'target']) ++ self.link_cmd = '$(LINK)' + + self.manpages = options.get('manpages', '') + self.testing = options.get('testing') +--- a/build/generator/gen_make.py ++++ b/build/generator/gen_make.py +@@ -390,8 +390,8 @@ + name = string.replace(base, 'mod_', '') + self.ofile.write('\tcd %s ; ' + '$(MKDIR) "$(APACHE_LIBEXECDIR)" ; ' +- '$(INSTALL_MOD_SHARED) -n %s %s\n' +- % (dirname, name, fname)) ++ '$(INSTALL_LIB) %s $(APACHE_LIBEXECDIR)\n' ++ % (dirname, fname)) + if ext == '.la': + la_tweaked[file + '-a'] = None + --- subversion-1.5.1dfsg1.orig/debian/patches/ssh-no-sigkill +++ subversion-1.5.1dfsg1/debian/patches/ssh-no-sigkill @@ -0,0 +1,34 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## +## ssh-no-sigkill by +## +## DP: Kill child ssh process with SIGTERM, rather than SIGKILL. +## DP: +## DP: The "unsightly stderr output from ssh" was fixed in Debian's +## DP: openssh-client 1:4.2p1-6. + +@DPATCH@ +--- a/subversion/libsvn_ra_svn/client.c ++++ b/subversion/libsvn_ra_svn/client.c +@@ -465,18 +465,10 @@ + if (status != APR_SUCCESS) + return svn_error_wrap_apr(status, _("Can't create tunnel")); + +- /* Arrange for the tunnel agent to get a SIGKILL on pool +- * cleanup. This is a little extreme, but the alternatives +- * weren't working out: +- * - Closing the pipes and waiting for the process to die +- * was prone to mysterious hangs which are difficult to +- * diagnose (e.g. svnserve dumps core due to unrelated bug; +- * sshd goes into zombie state; ssh connection is never +- * closed; ssh never terminates). +- * - Killing the tunnel agent with SIGTERM leads to unsightly +- * stderr output from ssh. ++ /* Arrange for the tunnel agent to get a SIGTERM on pool ++ * cleanup. + */ +- apr_pool_note_subprocess(pool, proc, APR_KILL_ALWAYS); ++ apr_pool_note_subprocess(pool, proc, APR_KILL_AFTER_TIMEOUT); + + /* APR pipe objects inherit by default. But we don't want the + * tunnel agent's pipes held open by future child processes --- subversion-1.5.1dfsg1.orig/debian/patches/java-build +++ subversion-1.5.1dfsg1/debian/patches/java-build @@ -0,0 +1,27 @@ +A hack to get around differences between Sun javah and gcj javah - in +Sun javah, nested class .h filenames have _ as a separator instead of +$, and the symbols inside use _ as a separator instead of _00024. + +--- a/build/generator/gen_make.py ++++ b/build/generator/gen_make.py +@@ -293,7 +293,10 @@ + '%s_CLASS_FILENAMES = %s\n' + '%s_CLASSES = %s\n' + '$(%s_HEADERS): $(%s_CLASS_FILENAMES)\n' +- '\t%s -d %s -classpath %s:$(%s_CLASSPATH) $(%s_CLASSES)\n' ++ '\t%s -d %s -classpath %s:$(%s_CLASSPATH) -all %s\n' ++ '\tfor f in %s/*\\$$*; do \\\n' ++ '\t sed s/00024// < "$$f" > "$$(echo "$$f" | tr \\$$ _)"; \\\n' ++ '\tdone\n' + % (targ_varname, string.join(header_class_filenames), + + targ_varname, string.join(header_classes), +@@ -301,7 +304,7 @@ + targ_varname, targ_varname, + + target_ob.link_cmd, target_ob.output_dir, target_ob.classes, +- targ_varname, targ_varname)) ++ targ_varname, target_ob.classes, target_ob.output_dir)) + + # Build the objects from the object_srcs with one 'javac' call + if object_srcs: --- subversion-1.5.1dfsg1.orig/debian/patches/svn2cl-upstream +++ subversion-1.5.1dfsg1/debian/patches/svn2cl-upstream @@ -0,0 +1,426 @@ +svn2cl-upstream - update to svn2cl 0.10 (from subversion trunk, April 2008) + +--- a/contrib/client-side/svn2cl/NEWS ++++ b/contrib/client-side/svn2cl/NEWS +@@ -1,3 +1,12 @@ ++changes from 0.9 to 0.10 ++------------------------ ++ ++* add an --include-actions option that adds action labels about file ++ additions and removals ++* small fix for other XSLT processors ++* manual page improvement ++ ++ + changes from 0.8 to 0.9 + ----------------------- + +--- a/contrib/client-side/svn2cl/README ++++ b/contrib/client-side/svn2cl/README +@@ -1,6 +1,6 @@ + svn2cl - create a ChangeLog from a subversion log + +- Copyright (C) 2004, 2005, 2006, 2007 Arthur de Jong ++ Copyright (C) 2004, 2005, 2006, 2007, 2008 Arthur de Jong + + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions +@@ -37,14 +37,14 @@ + different places. + + I made it because it was the only thing that I missed from cvs after I +-converted a repository to subversion. I used cvs2cl before. ++converted a repository to subversion. I used cvs2cl before. + + INSTALLING SVN2CL + ================= + +-Just unpack the tarball in some directory (e.g. /opt/svn2cl-0.9) ++Just unpack the tarball in some directory (e.g. /opt/svn2cl-0.10) + and symlink the svn2cl.sh script in your path somewhere (e.g. +-ln -s /opt/svn2cl-0.9/svn2cl.sh /usr/local/bin/svn2cl). ++ln -s /opt/svn2cl-0.10/svn2cl.sh /usr/local/bin/svn2cl). + + Note: Be sure to keep the svn2cl.xsl file in the same directory as the + svn2cl.sh script as the script looks for it there (symlinking is ok). +@@ -87,9 +87,9 @@ + NOTES + ===== + +-The log is performed on the current directory `.' unless you specify URL ++The log is performed on the current directory '.' unless you specify URL + and/or PATH parameters. Before generating the ChangeLog you may want to make +-your working copy up to date with `svn update' (non-recursive update will do) ++your working copy up to date with 'svn update' (non-recursive update will do) + or pass --revision HEAD:1 as a parameter to svn2cl.sh. + + There will not be very frequent new releases but if there are they can be +--- a/contrib/client-side/svn2cl/TODO ++++ b/contrib/client-side/svn2cl/TODO +@@ -1,4 +1,3 @@ +-* flag deleted files () + * support more xslt processors + * group changes per autor per day + * svn2rss? +@@ -7,3 +6,5 @@ + * fix awk magic to not break with spaces in repository names + * find better names for options + * create backup of previous changelog file ++* support specifying multiple --ignore-message-starting options ++* svn2cl --strip-prefix=/ doesn't work as expected +--- a/contrib/client-side/svn2cl/svn2cl.1 ++++ b/contrib/client-side/svn2cl/svn2cl.1 +@@ -1,4 +1,4 @@ +-.\" Copyright (C) 2005, 2006, 2007 Arthur de Jong ++.\" Copyright (C) 2005, 2006, 2007, 2008 Arthur de Jong + .\" + .\" Redistribution and use in source and binary forms, with or without + .\" modification, are permitted provided that the following conditions +@@ -12,7 +12,7 @@ + .\" 3. The name of the author may not be used to endorse or promote + .\" products derived from this software without specific prior + .\" written permission. +-.\" ++.\" + .\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + .\" IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + .\" WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +@@ -24,7 +24,7 @@ + .\" IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR + .\" OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN + .\" IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +-.TH "svn2cl" "1" "Apr 2007" "Version 0.9" "User Commands" ++.TH "svn2cl" "1" "Apr 2008" "Version 0.10" "User Commands" + .nh + .SH "NAME" + svn2cl - Create a ChangeLog from a subversion log. +@@ -35,10 +35,10 @@ + + .SH "DESCRIPTION" + \fBsvn2cl\fP generates a classic GNU-style ChangeLog from the log messages in a subversion repository. +-It acts as a wrapper around the `\fBsvn log\fP' command, parsing the XML output with an XSLT stylesheet. ++It acts as a wrapper around the '\fBsvn log\fP' command, parsing the XML output with an XSLT stylesheet. + Alternatively it can generate HTML output intended for use with the \fBsvn2html.css\fP style sheet that comes with \fBsvn2cl\fP. + +-In addition to its own options, it accepts and passes along most svn log options; see `\fBsvn help log\fP' for a list of those and their documentation. ++In addition to its own options, it accepts and passes along most svn log options; see '\fBsvn help log\fP' for a list of those and their documentation. + If PATH is not given, \fBsvn2cl\fP will run svn log on the current directory, so it should do the right thing when run from the top of a subversion checkout of the project. + + .TP +@@ -69,6 +69,11 @@ + If the \-\-html option is specified this is implied, edit \fBsvn2html.css\fP to turn it off. + + .TP ++\fB\-a\fR, \fB\-\-include\-actions\fR ++Add action labels [ADD], [DEL] and [CPY] tags to files to show the operation ++that is performned on the files. ++ ++.TP + \fB\-\-break\-before\-msg\fR[=\fINUM\fR] + Add a line break (or multiple line breadks) between the paths and the log message. + If the \-\-html option is specified this option is ignored, edit \fBsvn2html.css\fP to set spacing. +@@ -86,8 +91,8 @@ + .TP + \fB\-\-revision\-link\fR=\fINAME\fR + This option is used to generate links from the revision numbers in the generated HTML file. +-If \fINAME\fR contains two hashes `\fB##\fP' that part will be replaced by the revision number, otherwise the revision number will be appended to \fINAME\fR. +-Only the first occurrence of `\fB##\fP' will be replaced. ++If \fINAME\fR contains two hashes '\fB##\fP' that part will be replaced by the revision number, otherwise the revision number will be appended to \fINAME\fR. ++Only the first occurrence of '\fB##\fP' will be replaced. + .br + This option is ignored for normal text output. + +@@ -126,10 +131,10 @@ + Show version of program. + + .PP +-Optional PATH arguments and the following options are passed directly to the `\fBsvn \-\-xml log\fP' command: ++Optional PATH arguments and the following options are passed directly to the '\fBsvn \-\-xml log\fP' command: + \fB\-r\fR, \fB\-\-revision\fR, \fB\-\-targets\fR, \fB\-\-stop\-on\-copy\fR, \fB\-\-username\fR, \fB\-\-password\fR, \fB\-\-no\-auth\-cache\fR, \fB\-\-non\-interactive\fR, \fB\-\-config\-dir\fR and \fB\-\-limit\fR. + .br +-See `\fBsvn help log\fP' for more information on these options. ++See '\fBsvn help log\fP' for more information on these options. + + .SH "AUTHORS FILES" + +@@ -164,6 +169,13 @@ + arthur:Arthur de Jong + .ft R + ++.SH "NOTES" ++ ++Note that the default revison range for \fBsvn log\fP is BASE:1. ++This means that \fBsvn2cl\fP will not always include the most recent revisons ++of the repository. Either run '\fBsvn update\fP' before running \fBsvn2cl\fP ++or pass '\fB\-r HEAD:1\fP'. ++ + .SH "EXAMPLES" + + Run svn log recursively on the current directory and generate a text ChangeLog file in the current directory for the entire log history: +@@ -182,14 +194,15 @@ + Group all commits per day into one ChangeLog entry and only include changes from 2005: + .ft B + svn2cl \-\-html \-\-strip\-prefix=project/trunk \-\-group\-by\-day \e +- \-r '{2006\-01\-01}:{2005\-01\-01}' svn://svn.example.com/project/trunk ++ \-r '{2006\-01\-01}:{2005\-01\-01}' \e ++ svn://svn.example.com/project/trunk + .ft R + + .SH "SEE ALSO" +-.BR `\fBsvn\ help\ log\fP' ++.BR '\fBsvn\ help\ log\fP' + + .SH "COPYRIGHT" +-Copyright \(co 2005, 2006, 2007 Arthur de Jong . ++Copyright \(co 2005, 2006, 2007, 2008 Arthur de Jong . + .br + This is free software; see the license for copying conditions. There is NO + warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. +--- a/contrib/client-side/svn2cl/svn2cl.sh ++++ b/contrib/client-side/svn2cl/svn2cl.sh +@@ -2,9 +2,9 @@ + + # svn2cl.sh - front end shell script for svn2cl.xsl, calls xsltproc + # with the correct parameters +-# +-# Copyright (C) 2005, 2006, 2007 Arthur de Jong. +-# ++# ++# Copyright (C) 2005, 2006, 2007, 2008 Arthur de Jong. ++# + # Redistribution and use in source and binary forms, with or without + # modification, are permitted provided that the following conditions + # are met: +@@ -17,7 +17,7 @@ + # 3. The name of the author may not be used to endorse or promote + # products derived from this software without specific prior + # written permission. +-# ++# + # THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + # IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + # WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +@@ -36,7 +36,7 @@ + set -u + + # svn2cl version +-VERSION="0.9" ++VERSION="0.10" + + # set default parameters + PWD=`pwd` +@@ -47,6 +47,7 @@ + BREAKBEFOREMSG="no" + REPARAGRAPH="no" + SEPARATEDAYLOGS="no" ++ACTIONS="no" + CHANGELOG="" + OUTSTYLE="cl" + SVNLOGCMD="svn --verbose --xml log" +@@ -90,8 +91,12 @@ + INCLUDEREV="yes"; + shift + ;; ++ -a|--include-actions) ++ ACTIONS="yes" ++ shift ++ ;; + --break-before-msg|--breaks-before-msg) +- # FIXME: if next argument is numeric use that as a parameter ++ # FIXME: if next argument is numeric use that as a parameter + BREAKBEFOREMSG="yes" + shift + ;; +@@ -210,6 +215,7 @@ + echo " --group-by-day group changelog entries by day" + echo " --separate-daylogs put a blank line between grouped by day entries" + echo " -i, --include-rev include revision numbers" ++ echo " -a, --include-actions add [ADD], [DEL] and [CPY] tags to files" + echo " --break-before-msg[=NUM] add a line break (or multiple breaks)" + echo " between the paths and the log message" + echo " --reparagraph rewrap lines inside a paragraph" +@@ -228,12 +234,12 @@ + echo "PATH arguments and the following options are passed to the svn log" + echo "command: -r, --revision, --targets --stop-on-copy, --username," + echo "--password, --no-auth-cache, --non-interactive, --config-dir and" +- echo "--limit (see \`svn help log' for more information)." ++ echo "--limit (see 'svn help log' for more information)." + exit 0 + ;; + -*) + echo "$prog: invalid option -- $1" +- echo "Try \`$prog --help' for more information." ++ echo "Try '$prog --help' for more information." + exit 1 + ;; + *) +@@ -305,6 +303,7 @@ + --stringparam groupbyday "$GROUPBYDAY" \ + --stringparam separate-daylogs "$SEPARATEDAYLOGS" \ + --stringparam include-rev "$INCLUDEREV" \ ++ --stringparam include-actions "$ACTIONS" \ + --stringparam breakbeforemsg "$BREAKBEFOREMSG" \ + --stringparam reparagraph "$REPARAGRAPH" \ + --stringparam authorsfile "$AUTHORSFILE" \ +--- a/contrib/client-side/svn2cl/svn2cl.xsl ++++ b/contrib/client-side/svn2cl/svn2cl.xsl +@@ -5,7 +5,7 @@ + svn2cl.xsl - xslt stylesheet for converting svn log to a normal + changelog + +- version 0.9 ++ version 0.10 + + Usage (replace ++ with two minus signs which aren't allowed + inside xml comments): +@@ -15,6 +15,7 @@ + ++stringparam groupbyday yes \ + ++stringparam separate-daylogs yes \ + ++stringparam include-rev yes \ ++ ++stringparam include-actions yes \ + ++stringparam breakbeforemsg yes/2 \ + ++stringparam reparagraph yes \ + ++stringparam authorsfile FILE \ +@@ -56,7 +57,7 @@ + + +- ++ + + ]> + +@@ -79,7 +80,7 @@ + + + +- ++ + + + +@@ -89,6 +90,9 @@ + + + ++ ++ ++ + + + +@@ -177,7 +181,6 @@ + + + +- :&space; + + + +@@ -208,9 +211,17 @@ + &newl; + + &tab;*&space; ++ ++ ++ ++ ++ ++ ++ ++ + + +- ++ + + + +@@ -301,6 +312,10 @@ + + + ++ ++ ++ ++ + + + +@@ -313,11 +328,29 @@ + + + ++ ++ ++ ++ + + + + + ++ ++ ++ ++ [DEL] ++ ++ ++ [CPY] ++ ++ ++ [ADD] ++ ++ ++ ++ + + + +--- a/contrib/client-side/svn2cl/svn2html.xsl ++++ b/contrib/client-side/svn2cl/svn2html.xsl +@@ -5,7 +5,7 @@ + svn2html.xsl - xslt stylesheet for converting svn log to a normal + changelog fromatted in html + +- version 0.9 ++ version 0.10 + + Usage (replace ++ with two minus signs): + svn ++verbose ++xml log | \ +@@ -13,7 +13,7 @@ + ++stringparam groupbyday yes \ + ++stringparam authorsfile FILE \ + ++stringparam title NAME \ +- ++stringparam revision-link NAME \ ++ ++stringparam revision-link NAME \ + svn2html.xsl - > ChangeLog.html + + This file is partially based on (and includes) svn2cl.xsl. +@@ -48,7 +48,7 @@ + --> + + ++ + + ]> + +@@ -100,7 +100,7 @@ + + +

+- Generated by svn2cl 0.9 ++ Generated by svn2cl 0.10 +

+ + +@@ -159,7 +159,7 @@ + + + +- ++ + + + --- subversion-1.5.1dfsg1.orig/debian/patches/svnshell +++ subversion-1.5.1dfsg1/debian/patches/svnshell @@ -0,0 +1,25 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## +## svnshell by +## +## DP: Contains r20992 from upstream trunk, which may be in 1.4.1. + +@DPATCH@ +--- a/tools/examples/svnshell.py ++++ b/tools/examples/svnshell.py +@@ -50,14 +50,8 @@ + def postcmd(self, stop, line): + self._setup_prompt() + +- _errors = ["Huh?", +- "Whatchoo talkin' 'bout, Willis?", +- "Say what?", +- "Nope. Not gonna do it.", +- "Ehh...I don't think so, chief."] +- + def default(self, line): +- print self._errors[randint(0, len(self._errors) - 1)] ++ print "Unknown command." + + def do_cat(self, arg): + """dump the contents of a file""" --- subversion-1.5.1dfsg1.orig/debian/patches/perl-test-syntax-error +++ subversion-1.5.1dfsg1/debian/patches/perl-test-syntax-error @@ -0,0 +1,14 @@ +Fix perl 5.10 syntax error in test, from upstream r31546. + +--- a/subversion/bindings/swig/perl/native/t/6ra.t ++++ b/subversion/bindings/swig/perl/native/t/6ra.t +@@ -221,8 +221,7 @@ + + sub apply_textdelta { + my ($self, $baton, $base_checksum, $pool) = @_; +- my $data = $baton->{data} = \''; +- open my $out_fh, '>', $data ++ open my $out_fh, '>', \$baton->{data} + or die "error opening in-memory file to store Subversion update: $!"; + open my $in_fh, '<', \'' + or die "error opening in-memory file for delta source: $!"; --- subversion-1.5.1dfsg1.orig/debian/patches/entropy +++ subversion-1.5.1dfsg1/debian/patches/entropy @@ -0,0 +1,25 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## +## entropy by +## +## DP: Changing the default behavior to not use apr_generate_random_bytes(), Debian use +## DP: the system APR which is configured to use /dev/random. In cases where the +## DP: entropy pool is drained svn commands can block waiting. Moving to the fallback +## DP: of using time. (Closes: #285708, #298822) + +@DPATCH@ +--- a/subversion/libsvn_ra_svn/cram.c ++++ b/subversion/libsvn_ra_svn/cram.c +@@ -118,12 +118,8 @@ + * should prevent replay attacks in practice. */ + static apr_status_t make_nonce(apr_uint64_t *nonce) + { +-#if APR_HAS_RANDOM +- return apr_generate_random_bytes((unsigned char *) nonce, sizeof(*nonce)); +-#else + *nonce = apr_time_now(); + return APR_SUCCESS; +-#endif + } + + svn_error_t *svn_ra_svn_cram_server(svn_ra_svn_conn_t *conn, apr_pool_t *pool, --- subversion-1.5.1dfsg1.orig/debian/patches/ssh-no-controlmaster +++ subversion-1.5.1dfsg1/debian/patches/ssh-no-controlmaster @@ -0,0 +1,104 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## ssh-no-controlmaster by +## +## DP: Fix / work around the bug where 'ssh -o ControlMaster=auto' +## DP: interacts badly with the svn+ssh tunnel scheme. As I note in +## DP: the bug log for #413102, I don't really think the problem is +## DP: either svn's or openssh's fault, but the obvious way to avoid +## DP: it is to avoid accidentally becoming a ControlMaster. In this +## DP: mode we will still use ssh connection sharing, but only if a +## DP: ControlMaster is already present. + +@DPATCH@ +--- a/subversion/bindings/swig/ruby/test/test_core.rb ++++ b/subversion/bindings/swig/ruby/test/test_core.rb +@@ -184,6 +184,7 @@ + def test_config_each + config = Svn::Core::Config.read(@config_file) + section = Svn::Core::CONFIG_SECTION_HELPERS ++ section2 = Svn::Core::CONFIG_SECTION_TUNNELS + options = { + Svn::Core::CONFIG_OPTION_DIFF_CMD => "diff", + Svn::Core::CONFIG_OPTION_DIFF3_CMD => "diff3", +@@ -201,7 +202,7 @@ + section_names << name + true + end +- assert_equal([], section_names) ++ assert_equal([section2], section_names) + + options.each do |option, value| + config.set(section, option, value) +@@ -213,13 +214,15 @@ + end + assert_equal(options, infos) + ++ section_names = [] + config.each_section do |name| + section_names << name + true + end +- assert_equal([section], section_names) ++ assert_equal([section, section2], section_names) + + infos = options.collect {|key, value| [section, key, value]} ++ infos << [section2, "ssh", "$SVN_SSH ssh -o ControlMaster=no"] + config_infos = [] + config.each do |section, name, value| + config_infos << [section, name, value] +@@ -302,6 +305,8 @@ + Svn::Core::CONFIG_OPTION_DIFF_CMD => "diff", + Svn::Core::CONFIG_OPTION_DIFF3_CMD => "diff3", + } ++ section2 = Svn::Core::CONFIG_SECTION_TUNNELS ++ options2 = { "ssh", "$SVN_SSH ssh -o ControlMaster=no" } + + options.each do |option, value| + config[section, option] = value +@@ -313,7 +318,8 @@ + temp_config.close + + parsed_config = Svn::Core::Config.read(temp_config.path) +- assert_equal({section => options}, parsed_config.to_hash) ++ assert_equal({section2 => options2, section => options}, ++ parsed_config.to_hash) + end + + def test_config_to_hash +@@ -323,14 +329,16 @@ + Svn::Core::CONFIG_OPTION_DIFF_CMD => "diff", + Svn::Core::CONFIG_OPTION_DIFF3_CMD => "diff3", + } ++ section2 = Svn::Core::CONFIG_SECTION_TUNNELS ++ options2 = { "ssh" => "$SVN_SSH ssh -o ControlMaster=no" } + +- assert_equal({}, config.to_hash) ++ assert_equal({section2 => options2}, config.to_hash) + + options.each do |option, value| + config[section, option] = value + end + +- assert_equal({section => options}, config.to_hash) ++ assert_equal({section2 => options2, section => options}, config.to_hash) + end + + def test_diff_version +--- a/subversion/libsvn_subr/config_file.c ++++ b/subversion/libsvn_subr/config_file.c +@@ -947,10 +947,11 @@ + "### spaces. The command will be invoked as:" NL + "### svnserve -t" NL + "### (If the URL includes a username, then the hostname will be" NL +- "### passed to the tunnel agent as @.) If the" NL +- "### built-in ssh scheme were not predefined, it could be defined" NL +- "### as:" NL +- "# ssh = $SVN_SSH ssh" NL ++ "### passed to the tunnel agent as @.) Here we" NL ++ "### redefine the built-in 'ssh' scheme to avoid an unfortunate" NL ++ "### interaction with the \"ControlMaster auto\" feature (for" NL ++ "### details, see Debian Bug #413102):" NL ++ "ssh = $SVN_SSH ssh -o ControlMaster=no" NL + "### If you wanted to define a new 'rsh' scheme, to be used with" NL + "### 'svn+rsh:' URLs, you could do so as follows:" NL + "# rsh = rsh" NL --- subversion-1.5.1dfsg1.orig/debian/patches/examples-compile-instructions +++ subversion-1.5.1dfsg1/debian/patches/examples-compile-instructions @@ -0,0 +1,98 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## examples_compile_instructions by +## +## DP: Fix build instructions for /usr/share/doc/libsvn-doc/examples/*.c. + +@DPATCH@ +--- a/tools/examples/getlocks_test.c ++++ b/tools/examples/getlocks_test.c +@@ -15,13 +15,11 @@ + * history and logs, available at http://subversion.tigris.org/. + * ==================================================================== + * +- * To compile on unix against Subversion and APR libraries, try +- * something like: ++ * To compile on Debian: + * + * cc getlocks_test.c -o getlocks_test \ +- * -I/usr/local/include/subversion-1 -I/usr/local/apache2/include \ +- * -L/usr/local/apache2/lib -L/usr/local/lib \ +- * -lsvn_client-1 -lsvn_ra-1 -lsvn_subr-1 -lapr-0 -laprutil-0 ++ * -I/usr/include/subversion-1 $(pkg-config --cflags apr-1) \ ++ * -lsvn_client-1 -lsvn_ra-1 -lsvn_subr-1 + * + */ + +--- a/tools/examples/headrev.c ++++ b/tools/examples/headrev.c +@@ -15,13 +15,11 @@ + * history and logs, available at http://subversion.tigris.org/. + * ==================================================================== + * +- * To compile on unix against Subversion and APR libraries, try +- * something like: ++ * To compile on Debian: + * + * cc headrev.c -o headrev \ +- * -I/usr/local/include/subversion-1 -I/usr/local/apache2/include \ +- * -L/usr/local/apache2/lib -L/usr/local/lib \ +- * -lsvn_client-1 -lsvn_ra-1 -lsvn_subr-1 -lapr-0 -laprutil-0 ++ * -I/usr/include/subversion-1 $(pkg-config --cflags apr-1) \ ++ * -lsvn_client-1 -lsvn_ra-1 -lsvn_subr-1 + * + */ + +--- a/tools/examples/minimal_client.c ++++ b/tools/examples/minimal_client.c +@@ -25,12 +25,10 @@ + * For a much more complex example, the svn cmdline client might be + * considered the 'reference implementation'. + * +- * From a Linux system, a typical commandline compile might look like: ++ * To compile on Debian: + * + * cc minimal_client.c -o minimal_client \ +- * -I/usr/local/include/subversion-1 -I/usr/local/apache2/include \ +- * -L/usr/local/apache2/lib -L/usr/local/lib \ +- * -lsvn_client-1 -lapr-0 -laprutil-0 ++ * -I/usr/include/subversion-1 $(pkg-config --cflags apr-1) -lsvn_client-1 + * + */ + +--- a/tools/examples/svnput.c ++++ b/tools/examples/svnput.c +@@ -28,13 +28,10 @@ + * history and logs, available at http://subversion.tigris.org/. + * ==================================================================== + * +- * To compile on unix against Subversion and APR libraries, try +- * something like: ++ * To compile on Debian: + * + * cc svnput.c -o svnput \ +- * -I/usr/local/include/subversion-1 -I/usr/local/apache2/include \ +- * -L/usr/local/apache2/lib -L/usr/local/lib \ +- * -lsvn_client-1 -lapr-0 -laprutil-0 ++ * -I/usr/include/subversion-1 $(pkg-config --cflags apr-1) -lsvn_client-1 + * + */ + +--- a/tools/examples/testwrite.c ++++ b/tools/examples/testwrite.c +@@ -15,13 +15,11 @@ + * history and logs, available at http://subversion.tigris.org/. + * ==================================================================== + * +- * To compile on unix against Subversion and APR libraries, try +- * something like: ++ * To compile on Debian: + * + * cc testwrite.c -o testwrite \ +- * -I/usr/local/include/subversion-1 -I/usr/local/apache2/include \ +- * -L/usr/local/apache2/lib -L/usr/local/lib \ +- * -lsvn_client-1 -lsvn_ra-1 -lsvn_subr-1 -lsvn-fs-1 -lapr-0 -laprutil-0 ++ * -I/usr/include/subversion-1 $(pkg-config --cflags apr-1) \ ++ * -lsvn_client-1 -lsvn_ra-1 -lsvn_subr-1 -lsvn_fs-1 + * + */ + --- subversion-1.5.1dfsg1.orig/debian/patches/commit-email +++ subversion-1.5.1dfsg1/debian/patches/commit-email @@ -0,0 +1,20 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## commit-email.dpatch by +## +## DP: Select the 'sendmail' interface for commit-email.pl by default, +## DP: which works better than the 'smtp_server' feature. + +@DPATCH@ +--- a/tools/hook-scripts/commit-email.pl.in ++++ b/tools/hook-scripts/commit-email.pl.in +@@ -49,8 +49,8 @@ + # leaving the other commented out, to select which method of sending + # email should be used. + # Using --stdout on the command line overrides both. +-#$sendmail = "/usr/sbin/sendmail"; +-$smtp_server = "127.0.0.1"; ++$sendmail = "/usr/sbin/sendmail"; ++#$smtp_server = "127.0.0.1"; + + # Svnlook path. + my $svnlook = "@SVN_BINDIR@/svnlook"; --- subversion-1.5.1dfsg1.orig/debian/patches/ruby-typemap-digest +++ subversion-1.5.1dfsg1/debian/patches/ruby-typemap-digest @@ -0,0 +1,21 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## ruby-typemap-digest by +## +## DP: Change the ruby 'digest' typemaps to tolerate NULL pointers. +## DP: This may be the bug which has sporadically plagued us for +## DP: several months, most recently on m68k. Patch by Roman Zippel. +## DP: +## DP: Sent upstream: http://svn.haxx.se/dev/archive-2006-09/0536.shtml + +@DPATCH@ +--- a/subversion/bindings/swig/include/svn_types.swg ++++ b/subversion/bindings/swig/include/svn_types.swg +@@ -1053,7 +1053,7 @@ + #ifdef SWIGRUBY + %typemap(argout) unsigned char digest[ANY] { + char *digest_string = (char *)svn_md5_digest_to_cstring($1, _global_pool); +- %append_output(rb_str_new2(digest_string)); ++ %append_output(rb_str_new2(digest_string ? digest_string : "")); + } + #endif + --- subversion-1.5.1dfsg1.orig/debian/patches/python-builds +++ subversion-1.5.1dfsg1/debian/patches/python-builds @@ -0,0 +1,123 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## +## python-builds by +## +## DP: Prepare upstream build system for building multiple python versions. +## DP: Mostly, rename libsvn_swig_py to libsvn_swig_py2.x. +## DP: Submitted upstream: http://svn.haxx.se/dev/archive-2008-05/0361.shtml + +@DPATCH@ +--- a/Makefile.in ++++ b/Makefile.in +@@ -113,8 +113,9 @@ + APACHE_LDFLAGS = @APACHE_LDFLAGS@ + + SWIG = @SWIG@ ++PYTHON_INCLUDES = @PYTHON_INCLUDES@ + SWIG_PY_INCLUDES = @SWIG_PY_INCLUDES@ -I$(SWIG_SRC_DIR)/python/libsvn_swig_py +-SWIG_PY_COMPILE = @SWIG_PY_COMPILE@ ++SWIG_PY_COMPILE = @SWIG_PY_COMPILE@ $(EXTRA_SWIG_PY_CFLAGS) + SWIG_PY_LINK = @SWIG_PY_LINK@ + SWIG_PY_LIBS = @SWIG_PY_LIBS@ + SWIG_PL_INCLUDES = @SWIG_PL_INCLUDES@ +--- a/build/ac-macros/swig.m4 ++++ b/build/ac-macros/swig.m4 +@@ -93,7 +93,8 @@ + AC_CACHE_CHECK([for Python includes], [ac_cv_python_includes],[ + ac_cv_python_includes="`$PYTHON ${abs_srcdir}/build/get-py-info.py --includes`" + ]) +- SWIG_PY_INCLUDES="\$(SWIG_INCLUDES) $ac_cv_python_includes" ++ PYTHON_INCLUDES="$ac_cv_python_includes" ++ SWIG_PY_INCLUDES="\$(SWIG_INCLUDES) \$(PYTHON_INCLUDES)" + + if test "$ac_cv_python_includes" = "none"; then + AC_MSG_WARN([python bindings cannot be built without distutils module]) +@@ -240,6 +241,7 @@ + AC_MSG_RESULT([$SWIG_RB_TEST_VERBOSE]) + fi + AC_SUBST(SWIG) ++ AC_SUBST(PYTHON_INCLUDES) + AC_SUBST(SWIG_PY_INCLUDES) + AC_SUBST(SWIG_PY_COMPILE) + AC_SUBST(SWIG_PY_LINK) +--- a/build.conf ++++ b/build.conf +@@ -378,7 +378,7 @@ + type = swig + path = subversion/bindings/swig + sources = core.i +-libs = libsvn_swig_py libsvn_swig_perl libsvn_swig_ruby ++libs = libsvn_swig_py$(PYVER) libsvn_swig_perl libsvn_swig_ruby + libsvn_diff libsvn_subr apr + description = Subversion core library bindings + include-runtime = yes +@@ -387,7 +387,7 @@ + type = swig + path = subversion/bindings/swig + sources = svn_client.i +-libs = libsvn_swig_py libsvn_swig_perl libsvn_swig_ruby ++libs = libsvn_swig_py$(PYVER) libsvn_swig_perl libsvn_swig_ruby + libsvn_client libsvn_subr apr + nonlibs = swig_core + description = Subversion client library bindings +@@ -396,7 +396,7 @@ + type = swig + path = subversion/bindings/swig + sources = svn_delta.i +-libs = libsvn_swig_py libsvn_swig_perl libsvn_swig_ruby ++libs = libsvn_swig_py$(PYVER) libsvn_swig_perl libsvn_swig_ruby + libsvn_delta libsvn_subr apr + nonlibs = swig_core + description = Subversion delta library bindings +@@ -405,7 +405,7 @@ + type = swig + path = subversion/bindings/swig + sources = svn_diff.i +-libs = libsvn_swig_py libsvn_swig_perl libsvn_swig_ruby ++libs = libsvn_swig_py$(PYVER) libsvn_swig_perl libsvn_swig_ruby + libsvn_diff libsvn_subr apr + nonlibs = swig_core + description = Subversion diff library bindings +@@ -414,7 +414,7 @@ + type = swig + path = subversion/bindings/swig + sources = svn_fs.i +-libs = libsvn_swig_py libsvn_swig_perl libsvn_swig_ruby ++libs = libsvn_swig_py$(PYVER) libsvn_swig_perl libsvn_swig_ruby + libsvn_fs libsvn_subr apr + nonlibs = swig_core + description = Subversion FS library bindings +@@ -423,7 +423,7 @@ + type = swig + path = subversion/bindings/swig + sources = svn_ra.i +-libs = libsvn_swig_py libsvn_swig_perl libsvn_swig_ruby ++libs = libsvn_swig_py$(PYVER) libsvn_swig_perl libsvn_swig_ruby + libsvn_ra libsvn_subr apr + nonlibs = swig_core + description = Subversion RA library bindings +@@ -432,7 +432,7 @@ + type = swig + path = subversion/bindings/swig + sources = svn_repos.i +-libs = libsvn_swig_py libsvn_swig_perl libsvn_swig_ruby ++libs = libsvn_swig_py$(PYVER) libsvn_swig_perl libsvn_swig_ruby + libsvn_repos libsvn_subr apr + nonlibs = swig_core + description = Subversion repository library bindings +@@ -441,13 +441,13 @@ + type = swig + path = subversion/bindings/swig + sources = svn_wc.i +-libs = libsvn_swig_py libsvn_swig_perl libsvn_swig_ruby ++libs = libsvn_swig_py$(PYVER) libsvn_swig_perl libsvn_swig_ruby + libsvn_wc libsvn_subr apr + nonlibs = swig_core + description = Subversion WC library bindings + + # SWIG utility library for Python modules +-[libsvn_swig_py] ++[libsvn_swig_py$(PYVER)] + type = swig_lib + lang = python + path = subversion/bindings/swig/python/libsvn_swig_py --- subversion-1.5.1dfsg1.orig/debian/man/svn-backup-dumps.1 +++ subversion-1.5.1dfsg1/debian/man/svn-backup-dumps.1 @@ -0,0 +1,168 @@ +.\" Process this file with +.\" Copyright 2006 by Troy Heber - taken directly from svn-backup-dumps +.\" Copyright (c) 2006 CollabNet. +.\" Permission is granted to everyone to use and distribute this work, +.\" without limitation, modified or unmodified, in any way, for any purpose. +.\" groff -man -Tascii svn-backup-dumps.1 +.\" +.TH svn\-backup\-dumps 1 "2006-11-09" +.SH NAME +svn\-backup\-dumps \- Create dumpfiles to backup a subversion repository. +.SH SYNOPSIS +.B svn\-backup\-dumps +.I +.I +.SH DESCRIPTION +.B svn\-backup\-dumps +creates dumpfiles from a subversion repository. It is intended for +use in cron jobs and post-commit hooks. +.PP +The basic modes of operation are: +.IP \(bu +Create a full dump (revisions 0 to HEAD) +.IP \(bu +Create incremental dump containing at most N revisions. +.IP \(bu +Create incremental single-revision dumps (for use in post-commit). +.PP +Dumpfiles are named in the format +.IR basename . rev .svndmp +or +.IR basename . rev . rev .svndmp, +where +.I basename +is the repository directory name, and the +.I rev +arguments are the first and last revision numbers represented in the +dumpfile, zero-padded to 6 digits. +.PP +Optionally, +.B svn\-backup\-dumps +can compress dumpfiles with +.BR gzip " or " bzip2 , +and can transfer them to another host using FTP or SMB (using +.BR smbclient ). +.\" +.SH OPTIONS +.TP +.B \-\-version +Show program's version number and exit. +.TP +.BR \-h ", " \-\-help +Show this help message and exit. +.TP +.B \-b +Compress the dump using +.BR bzip2 . +.TP +.B \-\-deltas +This is passed through to +.BR "svnadmin dump" . +.TP +.BI \-c " count" +Maximum number of revisions per dumpfile. +.TP +.B \-o +Overwrite files. +.TP +.B \-O +Overwrite all files. +.TP +.B \-q +Quiet. +.TP +.BI \-r " rev" +Specify a single-revision dumpfile. +.PP +.RI "\fB\-t\fR ftp:" host : user : password : path +.PD 0 +.TP +.RI "\fB\-t\fR smb:" share : user : password : path +.PD +Transfer dumps to another machine using the FTP or SMB protocols. +.I path +is where to store the dumpfiles on the remote server; any occurrence of +.I %r +in the path is replaced by the repository name. Support for "smb:" +requires the +.B smbclient +program. +.TP +.B \-z +Compress the dump using +.BR gzip . +.\" +.SH EXAMPLES +To create a full dump of all revisions of a repository +.IR /srv/svn/foo " in the directory " /var/backup/svn : +.PP +svn\-backup\-dumps /srv/svn/foo /var/backup/svn +.PP +The dumpfile will be named +.I src.000000-NNNNNN.svndmp.gz +where +.I NNNNNN +is the head revision number. +.\" +.PP +To create incremental dumps containing at most 1000 revisions: +.PP +svn\-backup\-dumps \-\-deltas \-z \-c 1000 /srv/svn/foo /var/backup/svn +.PP +If the youngest revision is 2923, it creates the following files: +.IP +.PD 0 +foo.000000-000999.svndmp.gz +.IP +foo.001000-001999.svndmp.gz +.IP +foo.002000-002923.svndmp.gz +.PD +.PP +If run again, later, when the youngest revision is 3045, it creates +these two files: +.IP +.PD 0 +foo.002000-002999.svndmp.gz +.IP +foo.003000-003045.svndmp.gz +.PD +.PP +Note that it does not remove the redundant file +foo.002000-002923.svndmp.gz. +.\" +.PP +To create incremental single-revision dumps from a post-commit hook: +.PP +svn\-backup\-dumps \-r $rev $repos /var/backups/svn +.PP +where +.IR $rev " and " $repos +are variables previously set in the post-commit script from its command +line. The dumpfile name will be in the form +.IR foo.000352.svndmp . +.\" +.PP +To send the dumpfiles to the SMB share +.I \\\\\\\\ERNEST\\\\BACKUPS +in a directory +.I \\\\svn\\\\foo +with user +.I svnuser +and password +.IR w0rth1ng : +.IP +svn\-backup\-dumps \-t "smb://ERNEST/BACKUPS:svnuser:w0rth1ng:svn/%r +/srv/svn/foo /tmp/tmpbackup +.PP +Note that the +.I %r +in the path is replaced by the repository name +.BR foo . +Note also that a local backup directory is required, at present, even +when using the +.B \-t +option. +.\" +.SH AUTHOR +Voluntary contributions made by many individuals. Copyright \(co 2006 CollabNet. --- subversion-1.5.1dfsg1.orig/debian/man/svn_load_dirs.1 +++ subversion-1.5.1dfsg1/debian/man/svn_load_dirs.1 @@ -0,0 +1,127 @@ +.TH SVN_LOAD_DIRS 1 + +.SH NAME +svn_load_dirs - Load directories into a Subversion repository + +.SH SYNOPSIS +.B svn_load_dirs +[\fIoptions\fR] \fIsvn_url\fR \fIsvn_import_dir\fR [\fIdirectory\fR ...] + +.SH DESCRIPTION +This tool can be used for importing one or more directories into a +Subversion repository. The difference from "svn import" is that +svn_load_dirs can update an existing directory tree, and tag it +properly. Only changes from the previous version will be recorded in +the revision, so that you can easily apply them on another branch. +For example, this is very useful for managing the upstream source when +maintaining Debian packages in Subversion. + +.SH OPTIONS +.TP +\fIsvn_url\fR +The base Subversion URL. +.TP +\fIsvn_import_dir\fR +The path relative to \fIsvn_url\fR where the directories are to be imported. +.TP +\fIdirectory ...\fR +The directories to import. If they are not specified on the command line, +they are read from standard input. +.TP +\fB\-no_user_input\fR +Don't ask any questions. Assume that the answer is yes. +.TP +\fB\-p\fR \fIfilename\fR +Apply the properties specified in the configuration file +\fIfilename\fR to matching files. See below for a description of +the configuration file format. +.TP +\fB\-svn_username\fR \fIusername\fR +Username to use when committing to the repository. +.TP +\fB\-svn_password\fR \fIpassword\fR +Password to use when committing to the repository. +.TP +\fB\-t\fR \fItag_dir\fR +Create a tag copy in \fItag_dir\fR, relative to +\fIsvn_url\fR. \fItag_dir\fR may contain a regular expression +enclosed within '@' characters. It will be replaced by the matching part +from the imported directory names. +.TP +\fB\-v\fR +Be more verbose. Use multiple times for increased effect. +.TP +\fB\-wc\fR \fIpath\fR +Use the already checked out working copy at \fIpath\fR instead of +checking out a new working copy. + +.SH PROPERTY CONFIGURATION FILE FORMAT +The property configuration file, which is specified by the \-p option, +contains rules for applying properties to the imported files. +It consists of lines of the following format: +.PP +.I regular_expression control property_name property_value +.PP +The meaning of the fields are: +.TP +.I regular_expression +A Perl-style regular expression matching the files to apply this rule to. +.TP +.I control +Either "break" or "cont". If set to "break", processing of the current +file will stop if this rule matches. If set to "cont", processing will +continue. The latter can be used to set multiple properties for one +file. +.TP +.I property_name +(Optional) The name of the property to set. +.TP +.I property_value +(Optional) Set the property to this value. +.PP +The last two fields may be omitted, in which case the rule will not +set any properties. This is useful for excluding certain files from +subsequent rules. +.PP +You need to quote the \fIregular_expression\fR, \fIproperty_name\fR +and \fIproperty_value\fR fields with double quotes ('"') if you have +whitespace in them. Single and double quotes can be escaped with +backslash ('\\'). + +.SH EXAMPLES +For example, to import the contents of the foo\-1.3 directory into the +upstream/current directory of the foo repository: +.PP +.HP +svn_load_dirs svn+ssh://svn.example.org/svn/foo upstream/current foo\-1.3 +.PP +A tag can also be added automatically using the \-t option: +.PP +.HP +svn_load_dirs svn+ssh://svn.example.org/svn/foo \-t \'upstream/@\\d+\\.\\w+@\' +upstream/current foo\-1.3 +.PP +Here's an example of a property configuration file: +.PP +\\.doc$ break svn:mime\-type application/msword +.br +\\.ds(p|w)$ break svn:eol\-style CRLF +.br +\\.dos2unix\-eol\\.sh$ break +.br +\&.*\ \ \ break svn:eol\-style native +.PP +This example specifies that .doc files are to be treated as binary +files, that .dsp and .dsw files have their line ending characters +kept, and that all other files except dos2unix\-eol.sh have their line +endings converted to the native style. + +.SH SEE ALSO +/usr/share/doc/subversion\-tools/svn_load_dirs.README.gz +.PP +\fBsvn\fR(1) + +.SH AUTHOR +This manual page was written by Per Olofsson for the +Debian distribution (but may be used by others). Some parts were taken +from the README. --- subversion-1.5.1dfsg1.orig/debian/man/svn-fast-backup.1 +++ subversion-1.5.1dfsg1/debian/man/svn-fast-backup.1 @@ -0,0 +1,78 @@ +.\" Process this file with +.\" Copyright 2006 by Troy Heber - taken directly from svn-fast-backup +.\" Copyright (c) 2006 CollabNet. +.\" Permission is granted to everyone to use and distribute this work, +.\" without limitation, modified or unmodified, in any way, for any purpose. +.\" groff -man -Tascii svn-fast-backup.1 +.\" +.TH svn\-fast\-backup 1 "2006-11-09" +.SH NAME +svn\-fast\-backup \- very fast backup for Subversion fsfs repositories. +.SH SYNOPSIS +.B svn\-fast\-backup +.RB [ \-q ] +.RB [ \-k {\fIN\fR|\fIall\fR}] +.RB [ \-f ] +.RB [ \-t ] +.RB [ \-s ] +.I repos_path +.I backup_dir +.\" +.SH DESCRIPTION +.B svn\-fast\-backup +uses +.B rsync +snapshots for very fast backup of a Subversion +.B fsfs +repository at +.I repos_path +to +.IR backup_dir / repos-rev , +the latest revision number in the repository. Multiple +.B fsfs +backups share data via hardlinks, so old backups are almost free, since +a newer revision of a repository is almost a complete superset of an +older revision. +.PP +This is good for replacing incremental log-dump+restore-style backups +because it is just as space-conserving and even faster; there is no +inter-backup state (old backups are essentially caches); each backup +directory is self-contained. It has the same command-line interface as +.BR svn\-hot\-backup (1) +(if you use +.BR \-\-force ), +but only works for +.B fsfs +repositories. +.PP +.B svn\-fast\-backup +keeps 64 backups by default and deletes backups older than these; this +can be adjusted with the +.B \-k +option. +.\" +.SH OPTIONS +.TP +.BR \-h ", " \-\-help +Shows some brief help text. +.TP +.BR \-q ", " \-\-quiet +Quieter-than-usual operation. +.TP +.BR \-k ", " \-\-keep=\fIN\fR +Keep a specified number of backups; the default is to keep 64. +.TP +.BR \-k ", " \-\-keep=all +Do not delete any old backups at all. +.TP +.BR \-f ", " \-\-force +Make a new backup even if one with the current revision exists. +.TP +.BR \-t ", " \-\-trace +Show actions. +.TP +.BR \-s ", " \-\-simulate +Don't perform actions. +.\" +.SH AUTHOR +Voluntary contributions made by many individuals. Copyright \(co 2006 CollabNet. --- subversion-1.5.1dfsg1.orig/debian/man/svn-hot-backup.1 +++ subversion-1.5.1dfsg1/debian/man/svn-hot-backup.1 @@ -0,0 +1,40 @@ +.\" Process this file with +.\" Copyright 2006 by Troy Heber - taken directly from svn-hot-backup +.\" Copyright (c) 2006 CollabNet. +.\" Permission is granted to everyone to use and distribute this work, +.\" without limitation, modified or unmodified, in any way, for any purpose. +.\" groff -man -Tascii svn-hot-backup.1 +.\" +.TH svn\-hot\-backup 1 "2006-11-09" +.SH NAME +svn\-hot\-backup \- perform a "hot" backup of a Berkeley DB repository. +.SH SYNOPSIS +.B svn\-hot\-backup +.RB [ \-\-archive-type=\fItype\fR ] +.I repos_path +.I backup_dir +.PP +.\" +.SH DESCRIPTION +.B svn\-hot\-backup +performs a "hot" backup of a Subversion BDB repository, and cleans old +logfiles after the backup completes. +.\" +.SH OPTIONS +.TP +.PD 0 +.B \-\-archive\-type=gz +.TP +.BI \-\-archive\-type=bz2 +.TP +.BI \-\-archive\-type=zip +.PD +Create a compressed archive of the backup, in +.IR .tar.gz ", " .tar.bz2 ", or " .zip +format respectively. +.TP +.BR \-h ", " \-\-help +Print this help message and exit. +.\" +.SH AUTHOR +Voluntary contributions made by many individuals. Copyright \(co 2006 CollabNet. --- subversion-1.5.1dfsg1.orig/debian/man/svnwrap.1 +++ subversion-1.5.1dfsg1/debian/man/svnwrap.1 @@ -0,0 +1,98 @@ +.\" svnwrap.1 +.\" Copyright 2006 by Peter Samuelson +.\" Permission is granted to everyone to use and distribute this work, +.\" without limitation, modified or unmodified, in any way, for any purpose. +.TH SVNWRAP 1 "2006-04-21" +.\" +.SH NAME +svnwrap \- Umask wrapper for subversion client commands +.\" +.SH SYNOPSIS +.B svnwrap +.RB { program } +.RI [ args... ] +.\" +.SH DESCRIPTION +.B svnwrap +is a simple shell script to work around permission problems when +sharing Subversion repositories between multiple local users. +.B svnwrap +can be used either by specifying a particular +.B subversion +client command on the command line, or by invoking it by the same name +as the desired client command, via a symlink. +.PP +.B svnwrap +sets the +.I umask +to 002, then launches the appropriate +.B subversion +client command. For complicated reasons, this is needed when using the +clients with +.IR BDB -format +repositories, but not for +.IR FSFS -format +ones. +.\" +.SH EXAMPLES +To create a new BDB-format shared repository (note that FSFS-format +shared repositories should also be created this way): +.PP +svnwrap\ svnadmin\ create\ \-\-fs\-type=bdb +.I /path/to/repo +.br +chgrp\ \-R +.I shared_group\ /path/to/repo +.PP +The following line in +.I /etc/inetd.conf +can be used to serve +.I svn:// +URLs: +.PP +svn\ stream\ tcp\ nowait +.I my_svn_user +/usr/bin/svnwrap\ svnserve\ svnserve\ \-i\ \-r +.I /srv/svn +.PP +The following commands enable use of +.B svnwrap +for local +.I file:/// +and remote +.I svn+ssh:// +URLs: +.PP +ln\ \-s\ /usr/bin/svnwrap\ /usr/local/bin/svn +.br +ln\ \-s\ /usr/bin/svnwrap\ /usr/local/bin/svnserve +.PP +.B svn +is used for local +.I file:/// +URLs, and +.B svnserve +is invoked by remote users of +.I svn+ssh:// +URLs. +.SH BUGS +If you symlink the +.B svn +binary to +.BR svnwrap , +as shown in one of the examples, +.I all local users' working copies will also use the new +.IR umask . +Be sure to warn your users about this, as security-related surprises +are rarely pleasant. +.\" +.SH "SEE ALSO" +.BR svnserve (8), +.BR svn (1), +.BR svnlook (1). +.\" +.SH AUTHOR +.B svnwrap +and this manual were written by Peter Samuelson +.\" +for the Debian Project (but may be used by others). --- subversion-1.5.1dfsg1.orig/debian/etc/50psvn.el +++ subversion-1.5.1dfsg1/debian/etc/50psvn.el @@ -0,0 +1,3 @@ +; Set up autoloads for psvn (svn directory edit mode for emacs) + +(autoload 'svn-status "psvn" nil t)