#
#
# patch "options.cc"
#  from [fc13a81ba6b871aa3ab75229d7ac50c529c62eb4]
#    to [aa1b83a97c8af2aaedfa061447d8a12a2be04e01]
# 
# patch "options.hh"
#  from [b94db10edba0a37126d75b8d6c33f3b1d1cfe08b]
#    to [639934070e6a7ef8e526c75be49cf17923535242]
# 
# patch "options_list.hh"
#  from [ac7b0d7c95fa204b8a66df665a791b532a650887]
#    to [1b07d8c2b93a24bddba2a87281a924aff6b9d621]
#
============================================================
--- options.cc	fc13a81ba6b871aa3ab75229d7ac50c529c62eb4
+++ options.cc	aa1b83a97c8af2aaedfa061447d8a12a2be04e01
@@ -47,7 +47,7 @@ options::children()
 #     define OPTSET_REL(parent, child) \
       val[&options::opts:: parent].insert(&options::opts:: child);
 #     define HIDE(option)
-#     define DEPRECATE(option, reason)
+#     define DEPRECATE(option, reason, deprecated_in, will_remove_in)
 
 #     include "options_list.hh"
 
@@ -76,7 +76,7 @@ options::var_membership()
 #     define OPTION(optset, name, hasarg, optstring, description)
 #     define OPTSET_REL(parent, child)
 #     define HIDE(option)
-#     define DEPRECATE(option, reason)
+#     define DEPRECATE(option, reason, deprecated_in, will_remove_in)
 
 #     include "options_list.hh"
 
@@ -105,7 +105,7 @@ options::hidden()
 #     define OPTSET_REL(parent, child)
 #     define HIDE(option)                       \
       val[&opts:: option ## _opt ] = true;
-#     define DEPRECATE(option, reason)
+#     define DEPRECATE(option, reason, deprecated_in, will_remove_in)
 
 #     include "options_list.hh"
 
@@ -132,7 +132,7 @@ options::deprecated()
 #     define OPTION(optset, name, hasarg, optstring, description)
 #     define OPTSET_REL(parent, child)
 #     define HIDE(option)
-#     define DEPRECATE(option, reason)          \
+#     define DEPRECATE(option, reason, deprecated_in, will_remove_in)   \
       val[&opts:: option ## _opt ] = reason ;
 
 #     include "options_list.hh"
@@ -158,7 +158,7 @@ options::options()
     name ## _given = false;
 # define OPTSET_REL(parent, child)
 # define HIDE(option)
-# define DEPRECATE(option, reason)
+# define DEPRECATE(option, reason, deprecated_in, will_remove_in)
 
 # include "options_list.hh"
 
@@ -180,7 +180,7 @@ options::operator = (options const & oth
     name ## _given = other.name ## _given;
 # define OPTSET_REL(parent, child)
 # define HIDE(option)
-# define DEPRECATE(option, reason)
+# define DEPRECATE(option, reason, deprecated_in, will_remove_in)
 
 # include "options_list.hh"
 
@@ -276,7 +276,7 @@ options::options_type const & options::o
 
 # define OPTSET_REL(parent, child)
 # define HIDE(option)
-# define DEPRECATE(option, reason)
+# define DEPRECATE(option, reason, deprecated_in, will_remove_in)
 
 #define option_bodies
 # include "options_list.hh"
============================================================
--- options.hh	b94db10edba0a37126d75b8d6c33f3b1d1cfe08b
+++ options.hh	639934070e6a7ef8e526c75be49cf17923535242
@@ -54,7 +54,7 @@ struct options
 
 # define OPTSET_REL(parent, child)
 # define HIDE(option)
-# define DEPRECATE(option, reason)
+# define DEPRECATE(option, reason, deprecated_in, will_remove_in)
 
 # include "options_list.hh"
 
@@ -85,7 +85,7 @@ private:                                
 
 # define OPTSET_REL(parent, child)
 # define HIDE(option)
-# define DEPRECATE(option, reason)
+# define DEPRECATE(option, reason, deprecated_in, will_remove_in)
 
 # include "options_list.hh"
 
============================================================
--- options_list.hh	ac7b0d7c95fa204b8a66df665a791b532a650887
+++ options_list.hh	1b07d8c2b93a24bddba2a87281a924aff6b9d621
@@ -54,7 +54,7 @@
  *     In general, options should be hidden if they are introduced for
  *     testing purposes.
  *
- *   DEPRECATE(option, reason)
+ *   DEPRECATE(option, reason, deprecated_in, will_remove_in)
  *     Do not show the named option in help output (even with --hidden), and
  *     give a warning if it is used. The reason should be
  *     gettext_noopt("some text here") as it is translatable.
@@ -630,7 +630,7 @@ OPTSET(full)
 #endif
 
 OPTSET(full)
-DEPRECATE(full, gettext_noop("please use --verbose instead"))
+DEPRECATE(full, gettext_noop("please use --verbose instead"), 1.0, 2.0)
 OPTION(full, full, false, "full",
        gettext_noop("print detailed information"))
 #ifdef option_bodies