[Monotone-commits-diffs] net.venge.monotone: 95731cd1e35212fe53f223b7a3645225c8fc84f8

[code]

revision:            95731cd1e35212fe53f223b7a3645225c8fc84f8
date:                2011-02-17T21:02:01
author:              address@hidden
branch:              net.venge.monotone
changelog:
* configure.ac: change PACKAGE_BUGREPORT from address@hidden to
  https://code.monotone.ca/p/monotone/issues/ and set the project's URL; 
  also add a new define for the build date (which is actually the date
  on which you run ./configure, but its close enough)
* Makefile.am (po/monotone.pot): change the header of the generated POT file
  to be more descriptive and use PACKAGE_BUGREPORT as msgid-bugs-address
* src/ui.cc, src/unix/main.cc, src/win32/main.cc: encapsulate
  PACKAGE_BUGREPORT in '<' '>'
* po/Makevars: change COPYRIGHT_HOLDER to the monotone development team;
  this is of course no legal entity, but we have surely more than just
  one copyright holder nowadays and listing only one is not sufficient.
  If anyone asks, this term used here and in the manual page should
  hint you at AUTHORS. Also change MSGID_BUGS_ADDRESS here as well,
  though I'm unsure if it is still needed now that we set msgid-bugs-address
  directly to PACKAGE_BUGREPORT.
* src/cmd.cc (manpage): insert BUILD_DATE in the header of the man page
  and in the copyright line instead of just calculating the current
  year; replace individual URLs with PACKAGE_URL and PACKAGE_BUGREPORT,
  _()-localize some missing man sections and let the copyright begin
  in 2003, not 2004.

manifest:
format_version "1"

new_manifest [6ed29e85ccfead612eba910820e28d1e64aabff8]

old_revision [f48ec2c6991d0c828690e43ef06f4c7d896495ba]

patch "Makefile.am"
 from [1f088dd1ec5ee5dc7fa80753a6bd819aafc68132]
   to [2602846635765fb4abf19a5b03f369faad12a887]

patch "configure.ac"
 from [fefe751910927cc8a95a9766966ae00a7beb6ae0]
   to [2b4740aed6b34d84d773fae7071b0aa9f86c3eb4]

patch "po/Makevars"
 from [21ea46d8804edc5eef509858140a75fb0e40623c]
   to [c5537f0df5ba8397dbb5b6c0b6e7a2f884d96f0b]

patch "src/cmd.cc"
 from [a30ab07e170d4057669ae434735272338667915d]
   to [d824fb0d9171a2ab5df2a0984ddcd9e789548ec5]

patch "src/ui.cc"
 from [d003e3d9943dee48b7352f6f0f64e8821bb4a38f]
   to [08a1162f01fedf3ebaa2c6ff2fcb80fcf8c08180]

patch "src/unix/main.cc"
 from [f94cabc965121551caecbbe27fe893a41772a9bb]
   to [5efc020c5161416cf9f7d951263beedf66670ad1]

patch "src/win32/main.cc"
 from [aa09703bc453afe8687268684a65cc908f292dbf]
   to [f0e660ace85556a78767524a5c8a70d7514b6c1e]
============================================================
--- Makefile.am	1f088dd1ec5ee5dc7fa80753a6bd819aafc68132
+++ Makefile.am	2602846635765fb4abf19a5b03f369faad12a887
@@ -447,11 +447,16 @@ po/$(PACKAGE).pot: $(POTFILES)
 
 po/$(PACKAGE).pot: $(POTFILES)
 	[ -d po ] || mkdir -p po
-	$(V_xgettext)$(XGETTEXT) -o$@ -D. -D$(top_srcdir) -cTRANSLATORS: \
+	$(V_xgettext)$(XGETTEXT) address@hidden -D. -D$(top_srcdir) -cTRANSLATORS: \
 	  --copyright-holder='$(COPYRIGHT_HOLDER)' \
-	  --msgid-bugs-address='$(MSGID_BUGS_ADDRESS)' \
+	  --msgid-bugs-address='$(PACKAGE_BUGREPORT)' \
 	  $(XGETTEXT_PKG_OPTS) $(XGETTEXT_OPTS) \
 	  $(POTFILES)
+        YEAR=$(word 1, $(subst -, ,$(BUILD_DATE)))
+	sed -e 's/FIRST AUTHOR <address@hidden>, YEAR./Please see po\/README.<lang> for individual copyrights./' \
+	  -e 's/(C) YEAR/(C) 2003 - $(YEAR)/' -e 's/PACKAGE/$(PACKAGE)/' \
+	  -e 's/SOME DESCRIPTIVE TITLE/monotone message string catalogue/' < address@hidden > $@
+	rm address@hidden
 
 dist-nls: $(ALL_GMOFILES)
 	cp $(ALL_GMOFILES) $(distdir)/po
============================================================
--- configure.ac	fefe751910927cc8a95a9766966ae00a7beb6ae0
+++ configure.ac	2b4740aed6b34d84d773fae7071b0aa9f86c3eb4
@@ -10,7 +10,8 @@ AC_PREREQ(2.58)
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.58)
-AC_INIT([monotone], [1.0dev], address@hidden)
+AC_INIT([monotone], [1.0dev], [https://code.monotone.ca/p/monotone/issues/], ,
+	[http://www.monotone.ca])
 AM_INIT_AUTOMAKE([1.9 tar-ustar dist-bzip2 no-dist-gzip std-options])
 AC_CONFIG_SRCDIR([src/app_state.cc])
 AC_CONFIG_HEADERS([config.h])
@@ -41,6 +42,11 @@ AC_MSG_CHECKING([category of operating s
 AC_CANONICAL_HOST
 AC_MSG_CHECKING([category of operating system])
 
+BUILD_DATE=`date '+%F'`
+AC_SUBST([BUILD_DATE])
+AC_DEFINE_UNQUOTED([BUILD_DATE], ["$BUILD_DATE"],
+	[The date of the build, used in the manual page and other places.])
+
 WIN32_PLATFORM=false
 os_err_t="int"
 case "$host" in
============================================================
--- src/ui.cc	d003e3d9943dee48b7352f6f0f64e8821bb4a38f
+++ src/ui.cc	08a1162f01fedf3ebaa2c6ff2fcb80fcf8c08180
@@ -658,7 +658,7 @@ user_interface::fatal(string const & fat
   inform(F("fatal: %s\n"
            "this is almost certainly a bug in monotone.\n"
            "please send this error message, the output of '%s version --full',\n"
-           "and a description of what you were doing to %s.")
+           "and a description of what you were doing to <%s>.")
          % fatal % prog_name % PACKAGE_BUGREPORT);
   global_sanity.dump_buffer();
 }
@@ -671,7 +671,7 @@ user_interface::fatal_db(string const & 
   inform(F("fatal: %s\n"
            "this is almost certainly a bug in monotone.\n"
            "please send this error message, the output of '%s version --full',\n"
-           "and a description of what you were doing to %s.\n"
+           "and a description of what you were doing to <%s>.\n"
            "This error appears to have been triggered by something in the\n"
            "database you were using, so please preserve it in case it can\n"
            "help in finding the bug.")
============================================================
--- po/Makevars	21ea46d8804edc5eef509858140a75fb0e40623c
+++ po/Makevars	c5537f0df5ba8397dbb5b6c0b6e7a2f884d96f0b
@@ -24,7 +24,7 @@ XGETTEXT_OPTIONS_NO_FLAG=--keyword=F --k
 # or entity, or to disclaim their copyright.  The empty string stands for
 # the public domain; in this case the translators are expected to disclaim
 # their copyright.
-COPYRIGHT_HOLDER = Graydon Hoare <address@hidden>
+COPYRIGHT_HOLDER = The monotone development team <http://www.monotone.ca>
 
 # This is the email address or URL to which the translators should report
 # bugs in the untranslated strings:
@@ -40,4 +40,4 @@ COPYRIGHT_HOLDER = Graydon Hoare <graydo
 # It can be your email address, or a mailing list address where translators
 # can write to without being subscribed, or the URL of a web page through
 # which the translators can contact you.
-MSGID_BUGS_ADDRESS = address@hidden
+MSGID_BUGS_ADDRESS = https://code.monotone.ca/p/monotone/issues/
============================================================
--- src/unix/main.cc	f94cabc965121551caecbbe27fe893a41772a9bb
+++ src/unix/main.cc	5efc020c5161416cf9f7d951263beedf66670ad1
@@ -59,8 +59,8 @@ bug_report_message()
                       "\nplease send this error message, the output of '");
   write_str_to_stderr(argv0);
   write_str_to_stderr(" version --full',"
-                      "\nand a description of what you were doing to "
-                      PACKAGE_BUGREPORT "\n");
+                      "\nand a description of what you were doing to <"
+                      PACKAGE_BUGREPORT ">\n");
 }
 
 // this handler takes signals which would normally trigger a core
============================================================
--- src/win32/main.cc	aa09703bc453afe8687268684a65cc908f292dbf
+++ src/win32/main.cc	f0e660ace85556a78767524a5c8a70d7514b6c1e
@@ -62,8 +62,8 @@ bug_report_message()
                       "\nplease send this error message, the output of '");
   write_str_to_stderr(argv0);
   write_str_to_stderr(" version --full',"
-                      "\nand a description of what you were doing to "
-                      PACKAGE_BUGREPORT "\n");
+                      "\nand a description of what you were doing to <"
+                      PACKAGE_BUGREPORT ">\n");
 }
 
 static void
============================================================
--- src/cmd.cc	a30ab07e170d4057669ae434735272338667915d
+++ src/cmd.cc	d824fb0d9171a2ab5df2a0984ddcd9e789548ec5
@@ -715,7 +715,7 @@ man_title(string const & title)
 man_title(string const & title)
 {
   return ".TH \"" + title + "\" 1 "+
-         "\"" + date_t::now().as_formatted_localtime("%Y-%m-%d") + "\" " +
+         "\"" + BUILD_DATE + "\" " +
          "\"" + PACKAGE_STRING + "\"\n";
 }
 
@@ -925,11 +925,11 @@ CMD_NO_WORKSPACE(manpage, "manpage", "",
           "interface for scripting purposes and thorough documentation.")
      << "\n\n";
   ss << (F("For more information on monotone, visit %s.")
-          % man_bold("http://www.monotone.ca")).str()
+          % man_bold(PACKAGE_URL)).str()
      << "\n\n";
   ss << (F("The complete documentation, including a tutorial for a quick start "
            "with the system, can be found online on %s.")
-          % man_bold("http://www.monotone.ca/docs")).str() << "\n";
+          % man_bold(PACKAGE_URL "/docs")).str() << "\n";
 
   ss << man_section(_("Global Options"));
   ss << get_options_string(options::opts::globals(), app.opts, 25) << "\n";
@@ -939,25 +939,25 @@ CMD_NO_WORKSPACE(manpage, "manpage", "",
 
   ss << man_section(_("See Also"));
   ss << (F("info %s and the documentation on %s")
-          % prog_name % man_bold("http://www.monotone.ca/docs")).str() << "\n";
+          % prog_name % man_bold(PACKAGE_URL "/docs")).str() << "\n";
 
-  ss << man_section("Bugs");
+  ss << man_section(_("Bugs"));
   ss << (F("Please report bugs to %s.")
-          % man_bold("https://code.monotone.ca/p/monotone/issues")).str()<< "\n";
+          % man_bold(PACKAGE_BUGREPORT)).str()<< "\n";
 
-  ss << man_section("Authors");
+  ss << man_section(_("Authors"));
   ss << _("monotone was written originally by Graydon Hoare "
-          "<address@hidden> in 2004 and has since then received "
+          "<address@hidden> in 2003 and has since then received "
           "numerous contributions from many individuals. "
           "A complete list of authors can be found in AUTHORS.")
      << "\n\n";
   ss << _("Nowadays, monotone is maintained by a collective of enthusiastic "
           "programmers, known as the monotone development team.") << "\n";
 
-  ss << man_section("Copyright");
-  ss << (F("monotone and this man page is Copyright (c) 2004 \\- %s by "
+  ss << man_section(_("Copyright"));
+  ss << (F("monotone and this man page is Copyright (c) 2003 \\- %s by "
            "the monotone development team.")
-           % date_t::now().as_formatted_localtime("%Y")).str() << "\n";
+           % string(BUILD_DATE).substr(0, 4)).str() << "\n";
 
   if (!app.opts.formatted)
     {