1 |
commit: a520cba59f0d0a062a90de47ab963916ab1c3180 |
2 |
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Jan 25 17:59:42 2020 +0000 |
4 |
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Jan 28 00:23:32 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/devmanual.git/commit/?id=a520cba5 |
7 |
|
8 |
general-concepts/package-collisions: Moved here from ebuild-maintenance. |
9 |
|
10 |
This section is about a general concept, not a particular maintenance |
11 |
operation. |
12 |
|
13 |
Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org> |
14 |
|
15 |
ebuild-maintenance/text.xml | 1 - |
16 |
.../collisions => general-concepts/package-collisions}/text.xml | 2 +- |
17 |
general-concepts/text.xml | 1 + |
18 |
3 files changed, 2 insertions(+), 2 deletions(-) |
19 |
|
20 |
diff --git a/ebuild-maintenance/text.xml b/ebuild-maintenance/text.xml |
21 |
index 3576fbc..270230e 100644 |
22 |
--- a/ebuild-maintenance/text.xml |
23 |
+++ b/ebuild-maintenance/text.xml |
24 |
@@ -23,6 +23,5 @@ familiar with. |
25 |
<include href="new-ebuild/"/> |
26 |
<include href="git/"/> |
27 |
<include href="package-moves/"/> |
28 |
-<include href="collisions/"/> |
29 |
<include href="removal/"/> |
30 |
</guide> |
31 |
|
32 |
diff --git a/ebuild-maintenance/collisions/text.xml b/general-concepts/package-collisions/text.xml |
33 |
similarity index 97% |
34 |
rename from ebuild-maintenance/collisions/text.xml |
35 |
rename to general-concepts/package-collisions/text.xml |
36 |
index 6f5cec6..7b1b5f8 100644 |
37 |
--- a/ebuild-maintenance/collisions/text.xml |
38 |
+++ b/general-concepts/package-collisions/text.xml |
39 |
@@ -1,5 +1,5 @@ |
40 |
<?xml version="1.0"?> |
41 |
-<guide self="ebuild-maintenance/collisions/"> |
42 |
+<guide self="general-concepts/package-collisions/"> |
43 |
<chapter> |
44 |
<title>Package Collisions</title> |
45 |
<body> |
46 |
|
47 |
diff --git a/general-concepts/text.xml b/general-concepts/text.xml |
48 |
index e832db0..ace731e 100644 |
49 |
--- a/general-concepts/text.xml |
50 |
+++ b/general-concepts/text.xml |
51 |
@@ -34,6 +34,7 @@ writing ebuilds or working with the Gentoo repository. |
52 |
<include href="mirrors/"/> |
53 |
<include href="news/"/> |
54 |
<include href="overlay/"/> |
55 |
+<include href="package-collisions/"/> |
56 |
<include href="package-maintainers/"/> |
57 |
<include href="pic/"/> |
58 |
<include href="portage-cache/"/> |