From: Guillem Jover <guillem@debian.org>
Date: Mon, 28 Jan 2008 04:28:19 +0000 (+0200)
Subject: Rename getopt to libcompat
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2b6c73e20054e850c0c2ee497780b0b0b27144d9;p=dpkg

Rename getopt to libcompat
---

diff --git a/ChangeLog b/ChangeLog
index fe45de82..7f225d02 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+2008-01-28  Guillem Jover  <guillem@debian.org>
+
+	* getopt: Rename to ...
+	* libcompat: ... this.
+	* configure.ac (AC_CONFIG_FILES): Likewise.
+	* Makefile.am (SUBDIRS): Likewise.
+	* utils/Makefile.am (INCLUDES): Likewise.
+	(start_stop_daemon_LDADD): Use '../libcompat/libcompat.a' instead of
+	'../getopt/libopt.a'.
+	* libcompat/Makefile.am (noinst_LIBRARIES): Rename 'libopt.a' to
+	'libcompat.a'.
+	(libopt_a_SOURCES): Rename to ...
+	(libcompat_a_SOURCES): ... this.
+
 2008-01-27  Raphael Hertzog  <hertzog@debian.org>
 
 	* README.feature-removal-schedule: Deprecate support of substvars
diff --git a/Makefile.am b/Makefile.am
index 28cd3b06..529fa65a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -5,7 +5,7 @@ if WITH_DSELECT
 endif
 
 SUBDIRS = \
-	getopt \
+	libcompat \
 	lib \
 	src \
 	$(MAYBE_DSELECT) \
diff --git a/configure.ac b/configure.ac
index aaf51d07..a32ebf40 100644
--- a/configure.ac
+++ b/configure.ac
@@ -106,7 +106,7 @@ AC_CONFIG_FILES([ Makefile
 		  dselect/Makefile
 		  dselect/methods/Makefile
 		  dselect/po/Makefile.in
-		  getopt/Makefile
+		  libcompat/Makefile
 		  lib/Makefile
 		  man/Makefile
 		  origins/Makefile
diff --git a/getopt/.gitignore b/libcompat/.gitignore
similarity index 100%
rename from getopt/.gitignore
rename to libcompat/.gitignore
diff --git a/getopt/Makefile.am b/libcompat/Makefile.am
similarity index 83%
rename from getopt/Makefile.am
rename to libcompat/Makefile.am
index 9201a267..ba93ee40 100644
--- a/getopt/Makefile.am
+++ b/libcompat/Makefile.am
@@ -6,9 +6,9 @@ INCLUDES = \
 	-I$(top_srcdir)/lib
 
 
-noinst_LIBRARIES = libopt.a
+noinst_LIBRARIES = libcompat.a
 
-libopt_a_SOURCES = \
+libcompat_a_SOURCES = \
 	closeout.c closeout.h \
 	error.h \
 	getopt.c getopt.h \
diff --git a/getopt/closeout.c b/libcompat/closeout.c
similarity index 100%
rename from getopt/closeout.c
rename to libcompat/closeout.c
diff --git a/getopt/closeout.h b/libcompat/closeout.h
similarity index 100%
rename from getopt/closeout.h
rename to libcompat/closeout.h
diff --git a/getopt/error.h b/libcompat/error.h
similarity index 100%
rename from getopt/error.h
rename to libcompat/error.h
diff --git a/getopt/getopt.c b/libcompat/getopt.c
similarity index 100%
rename from getopt/getopt.c
rename to libcompat/getopt.c
diff --git a/getopt/getopt.h b/libcompat/getopt.h
similarity index 100%
rename from getopt/getopt.h
rename to libcompat/getopt.h
diff --git a/getopt/getopt1.c b/libcompat/getopt1.c
similarity index 100%
rename from getopt/getopt1.c
rename to libcompat/getopt1.c
diff --git a/getopt/long-options.c b/libcompat/long-options.c
similarity index 100%
rename from getopt/long-options.c
rename to libcompat/long-options.c
diff --git a/getopt/long-options.h b/libcompat/long-options.h
similarity index 100%
rename from getopt/long-options.h
rename to libcompat/long-options.h
diff --git a/getopt/obstack.c b/libcompat/obstack.c
similarity index 100%
rename from getopt/obstack.c
rename to libcompat/obstack.c
diff --git a/getopt/obstack.h b/libcompat/obstack.h
similarity index 100%
rename from getopt/obstack.h
rename to libcompat/obstack.h
diff --git a/utils/Makefile.am b/utils/Makefile.am
index ef456357..2f5fb35b 100644
--- a/utils/Makefile.am
+++ b/utils/Makefile.am
@@ -3,7 +3,7 @@
 localedir = $(datadir)/locale
 INCLUDES = \
 	-DLOCALEDIR=\"$(localedir)\" \
-	-I$(top_srcdir)/getopt \
+	-I$(top_srcdir)/libcompat \
 	-I$(top_srcdir)/lib
 
 
@@ -13,6 +13,6 @@ if WITH_START_STOP_DAEMON
   start_stop_daemon_SOURCES = \
 	start-stop-daemon.c
 
-  start_stop_daemon_LDADD = ../getopt/libopt.a $(SSD_LIBS)
+  start_stop_daemon_LDADD = ../libcompat/libcompat.a $(SSD_LIBS)
 endif