The following commit has been merged in the master branch:
commit 4141faf3dacb16973b86b219de2ff86409693439
Author: Guillem Jover <[EMAIL PROTECTED]>
Date: Mon Aug 18 03:32:03 2008 +0300
Move dselect specific macros from dpkg.h to dselect/method.h
diff --git a/ChangeLog b/ChangeLog
index 962c883..3111705 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,14 @@
2008-08-18 Guillem Jover <[EMAIL PROTECTED]>
+ * lib/dpkg.h (CMETHOPTFILE, METHLOCKFILE, METHODSDIR)
+ (IMETHODMAXLEN, IOPTIONMAXLEN, METHODOPTIONSFILE)
+ (METHODSETUPSCRIPT, METHODUPDATESCRIPT, METHODINSTALLSCRIPT)
+ (OPTIONSDESCPFX, OPTIONINDEXMAXLEN): Move macros ...
+ * dselect/method.h: ... here.
+ * dselect/methparse.cc: Include "method.h".
+
+2008-08-18 Guillem Jover <[EMAIL PROTECTED]>
+
* man/dpkg-trigger.1: Mark program names in bold.
2008-08-18 Guillem Jover <[EMAIL PROTECTED]>
diff --git a/dselect/method.h b/dselect/method.h
index fa07f8a..ad7c312 100644
--- a/dselect/method.h
+++ b/dselect/method.h
@@ -23,6 +23,20 @@
#ifndef METHOD_H
#define METHOD_H
+#define CMETHOPTFILE "cmethopt"
+#define METHLOCKFILE "methlock"
+
+#define METHODSDIR "methods"
+
+#define IMETHODMAXLEN 50
+#define IOPTIONMAXLEN IMETHODMAXLEN
+#define METHODOPTIONSFILE "names"
+#define METHODSETUPSCRIPT "setup"
+#define METHODUPDATESCRIPT "update"
+#define METHODINSTALLSCRIPT "install"
+#define OPTIONSDESCPFX "desc."
+#define OPTIONINDEXMAXLEN 5
+
struct method {
struct method *next, *back;
char *name, *path, *pathinmeth;
diff --git a/dselect/methparse.cc b/dselect/methparse.cc
index b18aee8..d1b66c6 100644
--- a/dselect/methparse.cc
+++ b/dselect/methparse.cc
@@ -42,6 +42,7 @@ extern "C" {
}
#include "dselect.h"
#include "bindings.h"
+#include "method.h"
int noptions=0;
struct dselect_option *options=0, *coption=0;
diff --git a/lib/dpkg.h b/lib/dpkg.h
index 14a4ce1..fa1dada 100644
--- a/lib/dpkg.h
+++ b/lib/dpkg.h
@@ -89,8 +89,6 @@
#define STATUSFILE "status"
#define AVAILFILE "available"
#define LOCKFILE "lock"
-#define CMETHOPTFILE "cmethopt"
-#define METHLOCKFILE "methlock"
#define DIVERSIONSFILE "diversions"
#define STATOVERRIDEFILE "statoverride"
#define UPDATESDIR "updates/"
@@ -111,7 +109,6 @@
#define MAINTSCRIPTDPKGENVVAR "DPKG_RUNNING_VERSION"
#define LOCALLIBDIR "/usr/local/lib/dpkg"
-#define METHODSDIR "methods"
#define NOJOBCTRLSTOPENV "DPKG_NO_TSTP"
#define SHELLENV "SHELL"
@@ -119,15 +116,6 @@
#define PAGERENV "PAGER"
#define DEFAULTPAGER "pager"
-#define IMETHODMAXLEN 50
-#define IOPTIONMAXLEN IMETHODMAXLEN
-#define METHODOPTIONSFILE "names"
-#define METHODSETUPSCRIPT "setup"
-#define METHODUPDATESCRIPT "update"
-#define METHODINSTALLSCRIPT "install"
-#define OPTIONSDESCPFX "desc."
-#define OPTIONINDEXMAXLEN 5
-
#define PKGSCRIPTMAXARGS 10
#define MD5HASHLEN 32
#define MAXTRIGDIRECTIVE 256
--
dpkg's main repository
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
