[SCM] dpkg's main repository branch, master, updated. 1.16.0.3-160-gc819a40

Guillem Jover Thu, 07 Jul 2011 01:45:34 -0700

The following commit has been merged in the master branch:
commit cf22cf6118035ab8ee5cc25e5298a987073c8dc8
Author: Guillem Jover <guil...@debian.org>
Date:   Sun Jul 3 03:23:11 2011 +0200


    libdpkg: Rename myopt module to options

diff --git a/dpkg-deb/build.c b/dpkg-deb/build.c
index a88cb0e..75132ee 100644
--- a/dpkg-deb/build.c
+++ b/dpkg-deb/build.c
@@ -48,7 +48,7 @@
 #include <dpkg/subproc.h>
 #include <dpkg/compress.h>
 #include <dpkg/ar.h>
-#include <dpkg/myopt.h>
+#include <dpkg/options.h>
 
 #include "dpkg-deb.h"
 
diff --git a/dpkg-deb/extract.c b/dpkg-deb/extract.c
index 365be5d..2dde994 100644
--- a/dpkg-deb/extract.c
+++ b/dpkg-deb/extract.c
@@ -47,7 +47,7 @@
 #include <dpkg/command.h>
 #include <dpkg/compress.h>
 #include <dpkg/ar.h>
-#include <dpkg/myopt.h>
+#include <dpkg/options.h>
 
 #include "dpkg-deb.h"
 
diff --git a/dpkg-deb/info.c b/dpkg-deb/info.c
index 6f43f55..2bd0a5d 100644
--- a/dpkg-deb/info.c
+++ b/dpkg-deb/info.c
@@ -44,7 +44,7 @@
 #include <dpkg/buffer.h>
 #include <dpkg/path.h>
 #include <dpkg/subproc.h>
-#include <dpkg/myopt.h>
+#include <dpkg/options.h>
 
 #include "dpkg-deb.h"
 
diff --git a/dpkg-deb/main.c b/dpkg-deb/main.c
index 5aa6c4d..49cf5e5 100644
--- a/dpkg-deb/main.c
+++ b/dpkg-deb/main.c
@@ -42,7 +42,7 @@
 #include <dpkg/dpkg.h>
 #include <dpkg/dpkg-db.h>
 #include <dpkg/compress.h>
-#include <dpkg/myopt.h>
+#include <dpkg/options.h>
 
 #include "dpkg-deb.h"
 
diff --git a/dpkg-split/info.c b/dpkg-split/info.c
index 30e0c27..6066f73 100644
--- a/dpkg-split/info.c
+++ b/dpkg-split/info.c
@@ -37,7 +37,7 @@
 #include <dpkg/dpkg.h>
 #include <dpkg/dpkg-db.h>
 #include <dpkg/ar.h>
-#include <dpkg/myopt.h>
+#include <dpkg/options.h>
 
 #include "dpkg-split.h"
 
diff --git a/dpkg-split/join.c b/dpkg-split/join.c
index 03017c8..95ed64a 100644
--- a/dpkg-split/join.c
+++ b/dpkg-split/join.c
@@ -33,7 +33,7 @@
 #include <dpkg/dpkg.h>
 #include <dpkg/dpkg-db.h>
 #include <dpkg/buffer.h>
-#include <dpkg/myopt.h>
+#include <dpkg/options.h>
 
 #include "dpkg-split.h"
 
diff --git a/dpkg-split/main.c b/dpkg-split/main.c
index c6d956d..c4e7b33 100644
--- a/dpkg-split/main.c
+++ b/dpkg-split/main.c
@@ -37,7 +37,7 @@
 #include <dpkg/i18n.h>
 #include <dpkg/dpkg.h>
 #include <dpkg/dpkg-db.h>
-#include <dpkg/myopt.h>
+#include <dpkg/options.h>
 
 #include "dpkg-split.h"
 
diff --git a/dpkg-split/queue.c b/dpkg-split/queue.c
index 5372434..e758feb 100644
--- a/dpkg-split/queue.c
+++ b/dpkg-split/queue.c
@@ -39,7 +39,7 @@
 #include <dpkg/dpkg-db.h>
 #include <dpkg/dir.h>
 #include <dpkg/buffer.h>
-#include <dpkg/myopt.h>
+#include <dpkg/options.h>
 
 #include "dpkg-split.h"
 
diff --git a/dpkg-split/split.c b/dpkg-split/split.c
index d4fe4bc..1b40f34 100644
--- a/dpkg-split/split.c
+++ b/dpkg-split/split.c
@@ -43,7 +43,7 @@
 #include <dpkg/subproc.h>
 #include <dpkg/buffer.h>
 #include <dpkg/ar.h>
-#include <dpkg/myopt.h>
+#include <dpkg/options.h>
 
 #include "dpkg-split.h"
 
diff --git a/dselect/main.cc b/dselect/main.cc
index fa58def..6508b1f 100644
--- a/dselect/main.cc
+++ b/dselect/main.cc
@@ -51,7 +51,7 @@
 #include <dpkg/i18n.h>
 #include <dpkg/dpkg.h>
 #include <dpkg/dpkg-db.h>
-#include <dpkg/myopt.h>
+#include <dpkg/options.h>
 
 #include "dselect.h"
 #include "bindings.h"
diff --git a/lib/dpkg/Makefile.am b/lib/dpkg/Makefile.am
index a1c8f8e..7950835 100644
--- a/lib/dpkg/Makefile.am
+++ b/lib/dpkg/Makefile.am
@@ -43,9 +43,9 @@ libdpkg_a_SOURCES = \
        log.c \
        md5.c md5.h \
        mlib.c \
-       myopt.c \
        namevalue.c \
        nfmalloc.c \
+       options.c \
        parse.c \
        parsehelp.c \
        path.c \
@@ -83,8 +83,8 @@ pkginclude_HEADERS = \
        file.h \
        glob.h \
        macros.h \
-       myopt.h \
        namevalue.h \
+       options.h \
        parsedump.h \
        path.h \
        pkg.h \
diff --git a/lib/dpkg/myopt.c b/lib/dpkg/options.c
similarity index 99%
rename from lib/dpkg/myopt.c
rename to lib/dpkg/options.c
index 4181a90..3575e29 100644
--- a/lib/dpkg/myopt.c
+++ b/lib/dpkg/options.c
@@ -1,6 +1,6 @@
 /*
  * libdpkg - Debian packaging suite library routines
- * myopt.c - my very own option parsing
+ * options.c - option parsing functions
  *
  * Copyright © 1994,1995 Ian Jackson <i...@chiark.greenend.org.uk>
  * Copyright © 2000,2002 Wichert Akkerman <wich...@deephackmode.org>
@@ -33,7 +33,7 @@
 #include <dpkg/i18n.h>
 #include <dpkg/dpkg.h>
 #include <dpkg/string.h>
-#include <dpkg/myopt.h>
+#include <dpkg/options.h>
 
 static const char *printforhelp;
 
diff --git a/lib/dpkg/myopt.h b/lib/dpkg/options.h
similarity index 94%
rename from lib/dpkg/myopt.h
rename to lib/dpkg/options.h
index 230fd89..ba415bf 100644
--- a/lib/dpkg/myopt.h
+++ b/lib/dpkg/options.h
@@ -1,6 +1,6 @@
 /*
  * libdpkg - Debian packaging suite library routines
- * myopt.h - declarations for my very own option parsing
+ * options.h - option parsing functions
  *
  * Copyright © 1994,1995 Ian Jackson <i...@chiark.greenend.org.uk>
  *
@@ -18,8 +18,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef MYOPT_H
-#define MYOPT_H
+#ifndef LIBDPKG_OPTIONS_H
+#define LIBDPKG_OPTIONS_H
 
 #include <dpkg/macros.h>
 
@@ -72,4 +72,4 @@ void setobsolete(const struct cmdinfo *cip, const char 
*value);
 
 DPKG_END_DECLS
 
-#endif /* MYOPT_H */
+#endif /* LIBDPKG_OPTIONS_H */
diff --git a/src/archives.c b/src/archives.c
index ff1d273..f060e70 100644
--- a/src/archives.c
+++ b/src/archives.c
@@ -51,7 +51,7 @@
 #include <dpkg/command.h>
 #include <dpkg/file.h>
 #include <dpkg/tarfn.h>
-#include <dpkg/myopt.h>
+#include <dpkg/options.h>
 #include <dpkg/triglib.h>
 
 #ifdef WITH_SELINUX
diff --git a/src/cleanup.c b/src/cleanup.c
index 91ffb2c..eff81aa 100644
--- a/src/cleanup.c
+++ b/src/cleanup.c
@@ -37,7 +37,7 @@
 #include <dpkg/i18n.h>
 #include <dpkg/dpkg.h>
 #include <dpkg/dpkg-db.h>
-#include <dpkg/myopt.h>
+#include <dpkg/options.h>
 
 #include "filesdb.h"
 #include "main.h"
diff --git a/src/divertcmd.c b/src/divertcmd.c
index efd08b5..a37624e 100644
--- a/src/divertcmd.c
+++ b/src/divertcmd.c
@@ -41,7 +41,7 @@
 #include <dpkg/file.h>
 #include <dpkg/glob.h>
 #include <dpkg/buffer.h>
-#include <dpkg/myopt.h>
+#include <dpkg/options.h>
 
 #include "filesdb.h"
 
diff --git a/src/enquiry.c b/src/enquiry.c
index 25ae142..40c3e73 100644
--- a/src/enquiry.c
+++ b/src/enquiry.c
@@ -40,7 +40,7 @@
 #include <dpkg/dpkg.h>
 #include <dpkg/dpkg-db.h>
 #include <dpkg/pkg-show.h>
-#include <dpkg/myopt.h>
+#include <dpkg/options.h>
 
 #include "filesdb.h"
 #include "main.h"
diff --git a/src/errors.c b/src/errors.c
index f016910..ce04212 100644
--- a/src/errors.c
+++ b/src/errors.c
@@ -37,7 +37,7 @@
 #include <dpkg/i18n.h>
 #include <dpkg/dpkg.h>
 #include <dpkg/dpkg-db.h>
-#include <dpkg/myopt.h>
+#include <dpkg/options.h>
 
 #include "main.h"
 
diff --git a/src/main.c b/src/main.c
index d3e7d25..22bf819 100644
--- a/src/main.c
+++ b/src/main.c
@@ -48,7 +48,7 @@
 #include <dpkg/dpkg-db.h>
 #include <dpkg/subproc.h>
 #include <dpkg/command.h>
-#include <dpkg/myopt.h>
+#include <dpkg/options.h>
 
 #include "main.h"
 #include "filesdb.h"
diff --git a/src/packages.c b/src/packages.c
index c67a600..b129474 100644
--- a/src/packages.c
+++ b/src/packages.c
@@ -38,7 +38,7 @@
 #include <dpkg/dpkg-db.h>
 #include <dpkg/pkg-list.h>
 #include <dpkg/pkg-queue.h>
-#include <dpkg/myopt.h>
+#include <dpkg/options.h>
 
 #include "filesdb.h"
 #include "main.h"
diff --git a/src/processarc.c b/src/processarc.c
index 39205d9..fa41833 100644
--- a/src/processarc.c
+++ b/src/processarc.c
@@ -47,7 +47,7 @@
 #include <dpkg/subproc.h>
 #include <dpkg/dir.h>
 #include <dpkg/tarfn.h>
-#include <dpkg/myopt.h>
+#include <dpkg/options.h>
 #include <dpkg/triglib.h>
 
 #include "filesdb.h"
diff --git a/src/querycmd.c b/src/querycmd.c
index 71855e4..cdda47d 100644
--- a/src/querycmd.c
+++ b/src/querycmd.c
@@ -46,7 +46,7 @@
 #include <dpkg/pkg-format.h>
 #include <dpkg/pkg-show.h>
 #include <dpkg/path.h>
-#include <dpkg/myopt.h>
+#include <dpkg/options.h>
 
 #include "filesdb.h"
 #include "infodb.h"
diff --git a/src/remove.c b/src/remove.c
index aee25e7..d41465e 100644
--- a/src/remove.c
+++ b/src/remove.c
@@ -37,7 +37,7 @@
 #include <dpkg/dpkg.h>
 #include <dpkg/dpkg-db.h>
 #include <dpkg/dir.h>
-#include <dpkg/myopt.h>
+#include <dpkg/options.h>
 #include <dpkg/triglib.h>
 
 #include "infodb.h"
diff --git a/src/select.c b/src/select.c
index 712db97..f3c0e1a 100644
--- a/src/select.c
+++ b/src/select.c
@@ -31,7 +31,7 @@
 #include <dpkg/dpkg.h>
 #include <dpkg/dpkg-db.h>
 #include <dpkg/pkg-array.h>
-#include <dpkg/myopt.h>
+#include <dpkg/options.h>
 
 #include "filesdb.h"
 #include "main.h"
diff --git a/src/statcmd.c b/src/statcmd.c
index b59d1b8..11ae1cf 100644
--- a/src/statcmd.c
+++ b/src/statcmd.c
@@ -43,7 +43,7 @@
 #include <dpkg/path.h>
 #include <dpkg/dir.h>
 #include <dpkg/glob.h>
-#include <dpkg/myopt.h>
+#include <dpkg/options.h>
 
 #include "main.h"
 #include "filesdb.h"
diff --git a/src/trigcmd.c b/src/trigcmd.c
index 4c42044..09fb346 100644
--- a/src/trigcmd.c
+++ b/src/trigcmd.c
@@ -38,7 +38,7 @@
 #include <dpkg/i18n.h>
 #include <dpkg/dpkg.h>
 #include <dpkg/dpkg-db.h>
-#include <dpkg/myopt.h>
+#include <dpkg/options.h>
 #include <dpkg/trigdeferred.h>
 #include <dpkg/triglib.h>
 
diff --git a/src/update.c b/src/update.c
index 227c9d1..44ef965 100644
--- a/src/update.c
+++ b/src/update.c
@@ -30,7 +30,7 @@
 #include <dpkg/i18n.h>
 #include <dpkg/dpkg.h>
 #include <dpkg/dpkg-db.h>
-#include <dpkg/myopt.h>
+#include <dpkg/options.h>
 
 #include "main.h"
 

-- 
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

[SCM] dpkg's main repository branch, master, updated. 1.16.0.3-160-gc819a40

Reply via email to