From: graham.gower <graham.gower@e8e0d7a0-c8d9-11dd-a880-a1081c7ac358>
Date: Tue, 12 Jan 2010 00:52:10 +0000 (+0000)
Subject: s/dependences/dependencies/ Pointed out by klemmster in Issue 40.
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=396c9ed8f22850bb2c4065181fcc1875a20fbf12;p=oweals%2Fopkg-lede.git

s/dependences/dependencies/ Pointed out by klemmster in Issue 40.

git-svn-id: http://opkg.googlecode.com/svn/trunk@515 e8e0d7a0-c8d9-11dd-a880-a1081c7ac358
---

diff --git a/libopkg/opkg_conf.h b/libopkg/opkg_conf.h
index 0925b81..6e7aa7d 100644
--- a/libopkg/opkg_conf.h
+++ b/libopkg/opkg_conf.h
@@ -74,7 +74,7 @@ struct opkg_conf
      int force_removal_of_dependent_packages;
      int force_removal_of_essential_packages;
      int check_signature;
-     int nodeps; /* do not follow dependences */
+     int nodeps; /* do not follow dependencies */
      char *offline_root;
      int query_all;
      int verbosity;
diff --git a/libopkg/opkg_install.c b/libopkg/opkg_install.c
index e014d72..72c63ab 100644
--- a/libopkg/opkg_install.c
+++ b/libopkg/opkg_install.c
@@ -1237,7 +1237,7 @@ opkg_install_pkg(pkg_t *pkg, int from_upgrade)
 
      pkg->state_want = SW_INSTALL;
      if (old_pkg){                          
-         old_pkg->state_want = SW_DEINSTALL; /* needed for check_data_file_clashes of dependences */
+         old_pkg->state_want = SW_DEINSTALL; /* needed for check_data_file_clashes of dependencies */
      }
 
      err = check_conflicts_for(pkg);
diff --git a/libopkg/pkg_depends.c b/libopkg/pkg_depends.c
index 0e52d31..ee5e9b6 100644
--- a/libopkg/pkg_depends.c
+++ b/libopkg/pkg_depends.c
@@ -50,7 +50,7 @@ static int pkg_constraint_satisfied(pkg_t *pkg, void *cdata)
 	  return 0;
 }
 
-/* returns ndependences or negative error value */ 
+/* returns ndependencies or negative error value */ 
 int
 pkg_hash_fetch_unsatisfied_dependencies(pkg_t * pkg, pkg_vec_t *unsatisfied,
 		char *** unresolved)
diff --git a/src/opkg-cl.c b/src/opkg-cl.c
index 7a2bbf3..448387e 100644
--- a/src/opkg-cl.c
+++ b/src/opkg-cl.c
@@ -233,7 +233,7 @@ usage()
 	printf("\t--offline-root <dir>	offline installation of packages.\n");
 
 	printf("\nForce Options:\n");
-	printf("\t--force-depends		Install/remove despite failed dependences\n");
+	printf("\t--force-depends		Install/remove despite failed dependencies\n");
 	printf("\t--force-maintainer	Overwrite preexisting config files\n");
 	printf("\t--force-reinstall	Reinstall package(s)\n");
 	printf("\t--force-overwrite	Overwrite files from other package(s)\n");
@@ -241,7 +241,7 @@ usage()
 	printf("\t--force-space		Disable free space checks\n");
 	printf("\t--noaction		No action -- test only\n");
 	printf("\t--download-only	No action -- download only\n");
-	printf("\t--nodeps		Do not follow dependences\n");
+	printf("\t--nodeps		Do not follow dependencies\n");
 	printf("\t--force-removal-of-dependent-packages\n");
 	printf("\t			Remove package and all dependencies\n");
 	printf("\t--autoremove		Remove packages that were installed\n");