The following commit has been merged in the master branch:
commit 4b8061f8583220089eda1611fb7c55efd0cb41b5
Author: Guillem Jover <guil...@debian.org>
Date:   Tue May 12 16:24:58 2009 +0200

    Remove obsolete --largemem and --smallmem dpkg options

diff --git a/README.feature-removal-schedule b/README.feature-removal-schedule
index 9f8c39d..e40a860 100644
--- a/README.feature-removal-schedule
+++ b/README.feature-removal-schedule
@@ -38,11 +38,6 @@ Status: obsolete
 When: lenny+1
 Warning: program
 
-What: --largemem, --smallmem (dpkg option)
-Status: obsolete
-When: lenny+1
-Warning: program
-
 What: --no-auto-select (dpkg option)
 Status: deprecated
 When: lenny+1
@@ -103,4 +98,9 @@ Why:
  This program was needed long time ago to fixup broken info dir files
  generated by buggy install-info programs. Should not be needed anymore.
 
+What: --largemem, --smallmem (dpkg option)
+Status: removed
+When: 1.15.1
+Why:
+ These options have been no-ops for a long time.
 
diff --git a/debian/changelog b/debian/changelog
index 41e5fff..95e87b4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -106,6 +106,7 @@ dpkg (1.15.1) UNRELEASED; urgency=low
     --help output.
   * Print a warning when using obsolete '--print-installation-architecture'.
     Closes: #528171
+  * Remove obsolete --largemem and --smallmem dpkg options.
 
   [ Frank Lichtenheld ]
   * Dpkg::Version: Remove unnecessary function next_elem which just
diff --git a/src/main.c b/src/main.c
index 9dc4adb..385d179 100644
--- a/src/main.c
+++ b/src/main.c
@@ -447,8 +447,6 @@ static const struct cmdinfo cmdinfos[]= {
   { "no-also-select",    'N', 0, &f_alsoselect, NULL,      NULL,    0 },
   { "skip-same-version", 'E', 0, &f_skipsame,   NULL,      NULL,    1 },
   { "auto-deconfigure",  'B', 0, &f_autodeconf, NULL,      NULL,    1 },
-  OBSOLETE( "largemem", 0 ),
-  OBSOLETE( "smallmem", 0 ),
   { "root",              0,   1, NULL,          NULL,      setroot,       0 },
   { "abort-after",       0,   1, &errabort,     NULL,      setinteger,    0 },
   { "admindir",          0,   1, NULL,          &admindir, NULL,          0 },
diff --git a/src/main.h b/src/main.h
index 036696c..c45a8ee 100644
--- a/src/main.h
+++ b/src/main.h
@@ -86,7 +86,7 @@ extern const char *const statusstrings[];
 
 extern const struct cmdinfo *cipaction;
 extern int f_pending, f_recursive, f_alsoselect, f_skipsame, f_noact;
-extern int f_autodeconf, f_largemem, f_nodebsig;
+extern int f_autodeconf, f_nodebsig;
 extern int f_triggers;
 extern unsigned long f_debug;
 extern int fc_downgrade, fc_configureany, fc_hold, fc_removereinstreq, 
fc_overwrite;

-- 
dpkg's main repository


-- 
To UNSUBSCRIBE, email to debian-dpkg-cvs-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org

Reply via email to