Changeset 1315 for trunk


Ignore:
Timestamp:
Nov 18, 2010, 3:50:28 AM (10 years ago)
Author:
Peter Johansson
Message:

merge patch release 0.9.1 into trunk

Location:
trunk
Files:
13 edited

Legend:

Unmodified
Added
Removed
  • trunk

  • trunk/Makefile.am

    r1308 r1315  
    8383
    8484# run in end of release target
    85 RELEASE_HOOK = build_support/Portfile
     85RELEASE_HOOK = build_support/Portfile.v$(VERSION)
    8686
    8787edit = $(SED) \
     
    8989  -e 's|@VERSION[@]|$(VERSION)|g'
    9090
    91 build_support/Portfile: Makefile build_support/Portfile.in
     91build_support/Portfile.v$(VERSION): Makefile build_support/Portfile.in
    9292  @rm -f $@ $@.t
    9393  @openssl version > /dev/null || exit 1
     
    9797  rmd160=`cut -f 2 -d ' ' $(distdir).tar.gz.rmd160`;\
    9898  $(edit) -e "s|@SHA1SUM[@]|$$sha1|g" -e "s|@RMD160SUM[@]|$$rmd160|g" \
    99   '$(srcdir)/$@.in' > $@.t
     99  '$(srcdir)/build_support/Portfile.in' > $@.t
    100100  @chmod a-w $@.t
    101101  @mv $@.t $@
  • trunk/NEWS

    r1293 r1315  
    1212svndigest 0.9.x series from
    1313    http://dev.thep.lu.se/svndigest/svn/branches/0.9-stable
     14
     15Version 0.9.1 (released 18 November 2010)
     16  - Corrected dependency is test suite when not having test repo (bug #487)
     17  - Corrected generated config file (bug #486)
     18
     19  A complete list of closed tickets can be found here [[br]]
     20  http://dev.thep.lu.se/svndigest/query?status=closed&milestone=0.9.1
    1421
    1522Version 0.9 (released 6 November 2010)
  • trunk/lib/Configuration.cc

    r1243 r1315  
    716716       << "### Right hand side may contain \"$i\", which will be replaced \n"
    717717       << "### with the ith wild card in lhs string.\n";
    718 
    719     if (!conf.dictionary_.empty()) {
    720       os << "\n"
    721          << "### Section for setting dictionary for file names.\n"
    722          << "### Prior looking for file name pattern in section "
    723          << "[parsing-codons],\n"
    724          << "### the file name may be translated according to the rules \n"
    725          << "### in this section. In default setting there is, for example,\n"
    726          << "### a rule to translate `<FILENAME>.in' to `<FILENAME>'.\n"
    727          << "### The format of the entries is:\n"
    728          << "###    file-name-pattern = new-name\n"
    729          << "### Left hand side may contain wildcards (such as '*' and '?').\n"
    730          << "### Right hand side may contain \"$i\", which will be replaced \n"
    731          << "### with the ith wild card in lhs string.\n"
    732          << "[file-name-dictionary]\n";
    733       for (size_t i=0; i<conf.dictionary_.size(); ++i)
    734         os << conf.dictionary_[i].first << " = "
    735            << conf.dictionary_[i].second << "\n";
    736     }
     718    os << "[file-name-dictionary]\n";
     719    for (size_t i=0; i<conf.dictionary_.size(); ++i)
     720      os << conf.dictionary_[i].first << " = "
     721         << conf.dictionary_[i].second << "\n";
     722
    737723    if (!conf.string2codons_.empty()) {
    738724      os << "\n"
  • trunk/m4/apache_LICENSE-2.0.txt

    • Property svn:mergeinfo changed (with no actual effect on merging)
  • trunk/m4/ax_cxx_check_flag.m4

    • Property svn:mergeinfo changed (with no actual effect on merging)
  • trunk/m4/ax_cxxcpp_check_flag.m4

    • Property svn:mergeinfo changed (with no actual effect on merging)
  • trunk/m4/ax_ld_check_flag.m4

    • Property svn:mergeinfo changed (with no actual effect on merging)
  • trunk/m4/find_apr.m4

    • Property svn:mergeinfo changed (with no actual effect on merging)
  • trunk/m4/pkg.m4

    • Property svn:mergeinfo changed (with no actual effect on merging)
  • trunk/m4/version.m4

  • trunk/m4/yat_add_flag.m4

    • Property svn:mergeinfo changed (with no actual effect on merging)
  • trunk/test/Makefile.am

    r1308 r1315  
    8686lazycheck:; $(MAKE) $(AM_MAKEFLAGS) check RECHECK_LOGS=
    8787
     88if HAVE_SVN_WC
    8889repo_stamp = $(srcdir)/repo/db/current
     90else
     91repo_stamp =
     92endif
    8993
    9094# dependencies for lazycheck
     
    98102svndigest_copy_cache_test.log:init.sh $(top_builddir)/bin/svndigest-copy-cache $(repo_stamp)
    99103
    100 cache_partial.log: $(repo_stamp) $(srcdir)/data/AUTHORS.svndigest-cache-r61
     104cache_partial.log: $(repo_stamp)
    101105copyright.log: $(repo_stamp)
    102106stats.log: $(repo_stamp)
Note: See TracChangeset for help on using the changeset viewer.