Merge branch 'maint'

Conflicts:
	scripts/makepkg.sh.in

1 files changed, 6 insertions, 6 deletions

diff --git a/scripts/pacman-optimize.sh.in b/scripts/pacman-optimize.sh.in
index 7e9d7bb2..3c6cfa88 100644
--- a/scripts/pacman-optimize.sh.in
+++ b/scripts/pacman-optimize.sh.in
@@ -3,7 +3,7 @@
 #   pacman-optimize
 #   @configure_input@
 #
-#   Copyright (c) 2006-2011 Pacman Development Team <pacman-dev@archlinux.org>
+#   Copyright (c) 2006-2012 Pacman Development Team <pacman-dev@archlinux.org>
 #   Copyright (c) 2002-2006 by Judd Vinet <jvinet@zeroflux.org>
 #
 #   This program is free software; you can redistribute it and/or modify
@@ -33,11 +33,11 @@ m4_include(library/output_format.sh)
 
 usage() {
 	printf "pacman-optimize (pacman) %s\n\n" "$myver"
-	printf "$(gettext "Usage: %s [pacman_db_root]")\n\n" "$0"
-	printf "$(gettext "\
+	printf -- "$(gettext "Usage: %s [pacman_db_root]")\n\n" "$0"
+	printf -- "$(gettext "\
 pacman-optimize is a little hack that should improve the performance\n\
 of pacman when reading/writing to its filesystem-based database.\n\n")"
-	printf "$(gettext "\
+	printf -- "$(gettext "\
 Because pacman uses many small files to keep track of packages,\n\
 there is a tendency for these files to become fragmented over time.\n\
 This script attempts to relocate these small files into one\n\
@@ -48,8 +48,8 @@ does not have to move around the disk as much.\n")"
 
 version() {
 	printf "pacman-optimize (pacman) %s\n" "$myver"
-	printf "$(gettext "\
-Copyright (c) 2006-2011 Pacman Development Team <pacman-dev@archlinux.org>.\n\
+	printf -- "$(gettext "\
+Copyright (c) 2006-2012 Pacman Development Team <pacman-dev@archlinux.org>.\n\
 Copyright (C) 2002-2006 Judd Vinet <jvinet@zeroflux.org>.\n\n\
 This is free software; see the source for copying conditions.\n\
 There is NO WARRANTY, to the extent permitted by law.\n")"