Merge branch 'maint'

Conflicts:
	scripts/makepkg.sh.in

1 files changed, 4 insertions, 4 deletions

diff --git a/scripts/pacman-db-upgrade.sh.in b/scripts/pacman-db-upgrade.sh.in
index 402a3199..894152f6 100644
--- a/scripts/pacman-db-upgrade.sh.in
+++ b/scripts/pacman-db-upgrade.sh.in
@@ -3,7 +3,7 @@
 #   pacman-db-upgrade - upgrade the local pacman db to a newer format
 #   @configure_input@
 #
-#   Copyright (c) 2010-2011 Pacman Development Team <pacman-dev@archlinux.org>
+#   Copyright (c) 2010-2012 Pacman Development Team <pacman-dev@archlinux.org>
 #
 #   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
@@ -32,13 +32,13 @@ m4_include(library/output_format.sh)
 
 usage() {
 	printf "pacman-db-upgrade (pacman) %s\n\n" "$myver"
-	printf "$(gettext "Usage: %s [pacman_db_root]")\n\n" "$0"
+	printf -- "$(gettext "Usage: %s [pacman_db_root]")\n\n" "$0"
 }
 
 version() {
 	printf "pacman-db-upgrade (pacman) %s\n" "$myver"
-	printf "$(gettext "\
-Copyright (c) 2010-2011 Pacman Development Team <pacman-dev@archlinux.org>.\n\
+	printf -- "$(gettext "\
+Copyright (c) 2010-2012 Pacman Development Team <pacman-dev@archlinux.org>.\n\
 This is free software; see the source for copying conditions.\n\
 There is NO WARRANTY, to the extent permitted by law.\n")"
 }