Fix all links pointing to old locations

Author: meator

src/mini-tutors/completions.md

@@ -44,13 +44,13 @@ or somewhere else. Or they might not be documented at all.
 Sometimes the build system needs to generate completions.
 
 This should be familiar to you if you've read my [xbps-src packaging
-tutorial](../xbps-src-tutorial/index.md), because it's used in
-[`bat`](../xbps-src-tutorial/packaging-bat.md) itself.
+tutorial](../packaging/index.md), because it's used in
+[`bat`](../packaging/bat.md) itself.
 
 A disadvantage of this approach is that the shell completion generation might
 have extra dependencies or it might require tweaking (like setting
 `BAT_ASSETS_GEN_DIR` in
-[`bat`](../xbps-src-tutorial/packaging-bat.md#installing-supplementary-files)).
+[`bat`](../packaging/bat.md#installing-supplementary-files)).
 
 If the build system generates completions, it also usually installs them. But
 this isn't the case in `bat` for example.

src/mini-tutors/git-submodules.md

@@ -16,7 +16,7 @@ that breakage won't occur, you should replace the submodule with actual packaged
 dependency.
 
 If you choose this path, you will likely have to [patch the build
-system](../xbps-src-tutorial/packaging-j4-dmenu-desktop.md#when-their-build-system-is-broken)
+system](../packaging/j4-dmenu-desktop.md#when-their-build-system-is-broken)
 or modify it in some other way to accept the packaged dependency. If you are
 knowledgable of git submodules and upstream's build system, you could propose a
 more packaging friendly way to handle dependencies [to
@@ -26,7 +26,7 @@ But if the project is using a old version of the submodule or a customized one,
 this likely won't be possible. The submodule also might not be packaged.
 
 Header only libraries also [don't really meet the quality
-requirements](../xbps-src-tutorial/packaging-j4-dmenu-desktop.md#quality-requirements) (but it
+requirements](../packaging/j4-dmenu-desktop.md#quality-requirements) (but it
 depends), so packaging them as a dependency might not be reasonable. Leaving the
 header only dependency as a git submodule is preferable in this scenario.
 
@@ -359,4 +359,4 @@ to change the name of the downloaded archive. They are then put into
            `build_wrksrc` can be used to tell `xbps-src` which of the extracted
            directories should be treated as the primary one. [CWD is set to
            `build_wrksrc` in some build
-           steps.](../xbps-src-tutorial/packaging-j4-dmenu-desktop.md#cwd)
+           steps.](../packaging/j4-dmenu-desktop.md#cwd)

src/package-update-tutorial.md

@@ -298,7 +298,7 @@ the project has one.
 It might be necessary to modify the template to fix the build. There is no
 universal way to fix these problems, but general understanding of `xbps-src` is
 helpful in these situations. I recommend you reading the [xbps-src packaging
-tutorial](xbps-src-tutorial/index.md).
+tutorial](packaging/index.md).
 
 ## `xlint`
 You should always run `xlint` when finishing a package. It can find common
@@ -317,10 +317,10 @@ haven't caused the warnings), it is tolerable to leave the warning be. You
 should make a comment about it in the pull request description.
 
 ## Making a pull request
-Contributing is described at [Contributing](xbps-src-tutorial/contributing.md). You should already
-have a working clone of your fork, the `upstream` remote should be set up and
-you should be on a non-default branch. You can skip these parts in
-[Contributing](xbps-src-tutorial/contributing.md).
+Contributing is described at [Contributing](packaging/contributing.md). You
+should already have a working clone of your fork, the `upstream` remote should
+be set up and you should be on a non-default branch. You can skip these parts in
+[Contributing](packaging/contributing.md).
 
 [You should ensure that the branch is up to date.](troubleshooting.md#being-up-to-date)
 
@@ -392,4 +392,4 @@ package](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md
           [different ways of cloning](tips_and_tricks.md#different-ways-of-cloning).
 [^remotes]: This is briefly described in the [remotes section of contributing
             (of this tutorial, not void-packages'
-            CONTRIBUTING)](xbps-src-tutorial/contributing.md#remotes)
+            CONTRIBUTING)](packaging/contributing.md#remotes)

src/packaging/bat.md

@@ -171,7 +171,7 @@ library in the runtime, it must be in `depends`. But that is not necessary,
 because `xbps-src` is smart.
 
 ## Shlib dependencies
-_This is described in [Packaging oniguruma](packaging-oniguruma.md) in detail._
+_This is described in [Packaging oniguruma](oniguruma.md) in detail._
 
 To compile the `bat` package which depends on library `oniguruma`, `bat` must
 have `oniguruma-devel` in its `hostmakedepends`. But `oniguruma` must be
@@ -193,7 +193,7 @@ there.
 Interpreted programming languages like Python can not have shlib dependency
 detection due to the way they work. You have to specify all `depends`
 dependencies for them. This is further described later in [packaging
-rofimoji](packaging-rofimoji.md#dependencies-for-interpreted-packages).
+rofimoji](rofimoji.md#dependencies-for-interpreted-packages).
 ```
 
 ### Some progress
@@ -470,7 +470,7 @@ You might be wondering how the SHLIB detection works. This is best explained
 while packaging a library. The next part of this tutorial packages
 [`oniguruma`](https://github.com/kkos/oniguruma), a dependency of `bat`:
 
-[Packaging oniguruma](packaging-oniguruma.md)
+[Packaging oniguruma](oniguruma.md)
 
 ---
 

src/packaging/contributing.md

@@ -21,7 +21,7 @@ CONTRIBUTING](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTI
 You should read it.
 
 If you have followed the tutorial (namely [Packaging
-j4-dmenu-desktop](packaging-j4-dmenu-desktop.md)), you should already have a
+j4-dmenu-desktop](j4-dmenu-desktop.md)), you should already have a
 `void-packages` clone. If that is the case, you don't have to clone it again,
 you just have to change the remotes. This is hinted at [below](#remotes).
 
@@ -213,9 +213,9 @@ reproduce the error locally.](../tips_and_tricks.md#reproduce-checks-locally)
 
 You should try to fix these errors. Cross compilation is the source of most
 problems when contributing new packages. This is briefly described in [Packaging
-j4-dmenu-desktop](packaging-j4-dmenu-desktop.md) in
-[this](packaging-j4-dmenu-desktop.md#when-their-build-system-is-broken) and
-[this](packaging-j4-dmenu-desktop.md#patches) section.
+j4-dmenu-desktop](j4-dmenu-desktop.md) in
+[this](j4-dmenu-desktop.md#when-their-build-system-is-broken) and
+[this](j4-dmenu-desktop.md#patches) section.
 
 You should also make sure whether you have correctly divided dependencies to
 `hostmakedepends` and `makedepends`. If a dependency is in the wrong category,
@@ -249,7 +249,7 @@ manipulating git history.
 _Do not actually contribute `bat` and `oniguruma`! They are already packaged._
 
 Your repo should look something like this if you have been following [Packaging
-bat](packaging-bat.md) and [Packaging oniguruma](packaging-oniguruma.md):
+bat](bat.md) and [Packaging oniguruma](oniguruma.md):
 ```git
 > git status
 On branch bat

src/packaging/index.md

@@ -17,7 +17,7 @@ for personal use.
 - knowledge of libraries (what's a static/dynamic library, why are they
   important, what's a SONAME etc.) is useful
 - knowing what is a patch, how to make one and how to apply one is preferable
-  (they are used in [packaging j4-dmenu-desktop](packaging-j4-dmenu-desktop.md)
+  (they are used in [packaging j4-dmenu-desktop](j4-dmenu-desktop.md)
   section of this tutorial, but shouldn't be necessary in more normal use)
 
 ### Non-prerequisites
@@ -35,15 +35,14 @@ I try to cover the basics. Feel free to skip some sections. But don't skip too
 much. This tutorial is written to be read from beginning to the end.
 
 This tutorial is divided into four sections: packaging
-[`j4-dmenu-desktop`](packaging-j4-dmenu-desktop.md), [`bat`](packaging-bat.md),
-[`oniguruma`](packaging-oniguruma.md) and [`rofimoji`](packaging-rofimoji.md).
-Packaging [`j4-dmenu-desktop`](packaging-j4-dmenu-desktop.md) showcases basic
-concepts of `xbps-src` and [`bat`](packaging-bat.md),
-[`oniguruma`](packaging-oniguruma.md) and [`rofimoji`](packaging-rofimoji.md)
+[`j4-dmenu-desktop`](j4-dmenu-desktop.md), [`bat`](bat.md),
+[`oniguruma`](oniguruma.md) and [`rofimoji`](rofimoji.md).  Packaging
+[`j4-dmenu-desktop`](j4-dmenu-desktop.md) showcases basic concepts of `xbps-src`
+and [`bat`](bat.md), [`oniguruma`](oniguruma.md) and [`rofimoji`](rofimoji.md)
 show additional concepts that couldn't be shown on `j4-dmenu-desktop`.
 
 All four of these are already packaged in Void Linux. The first three are
-compiled programs, [`rofimoji`](packaging-rofimoji.md) is not.
+compiled programs, [`rofimoji`](rofimoji.md) is not.
 
 Contributing the packages to
 [`void-packages`](https://github.com/void-linux/void-packages) is described in

src/packaging/j4-dmenu-desktop.md

@@ -885,7 +885,7 @@ Stages are usually executed in `$wrksrc`.
 Concepts described here hold true for **compiled** packages and libraries. They
 do not apply for packages which aren't compiled (like Python
 packages[^bytecompiled]). This is further described in [packaging
-rofimoji](packaging-rofimoji.md).
+rofimoji](rofimoji.md).
 
 If you intent to package non-compiled packages, you should still read the
 following sections, but you can pay less attention to them.
@@ -1591,7 +1591,7 @@ Packaging `j4-dmenu-desktop` shows most useful capabilities of `xbps-src` but
 not all of them. I've written a (significantly shorter) walkthrough through
 packaging another program, [`bat`](https://github.com/sharkdp/bat):
 
-[Packaging bat](packaging-bat.md)
+[Packaging bat](bat.md)
 
 ---
 [^youcan]: I'm sure there's a way to install a package without its dependencies,

src/packaging/oniguruma.md

@@ -393,8 +393,7 @@ If a library is a dependency of another package, we **should** add the SHLIB to
 packaged because they are the dependency of the target executable which the
 packager wants, standalone libraries aren't usually packaged and one could even
 argue that it wouldn't be accepted because of [packaging
-requirements](packaging-j4-dmenu-desktop.md#quality-requirements), but it
-depends).
+requirements](j4-dmenu-desktop.md#quality-requirements), but it depends).
 
 ### How to add a shlib dependency?
 The error message emitted by by `./xbps-src pkg bat` already shows the SONAME
@@ -460,8 +459,8 @@ a carefully crafted packaging tutorial or something.
 The documentation doesn't get installed to `$DESTDIR` by default, it just lies
 in `doc/` subdirectory of source. Their build system doesn't install it.[^cmake]
 But the documentation doesn't need to be generated ([unlike the manpage and
-completions in `bat`](packaging-bat.md#installing-supplementary-files)), we can
-just copy the files to `$DESTDIR`.
+completions in `bat`](bat.md#installing-supplementary-files)), we can just copy
+the files to `$DESTDIR`.
 
 Where will we install the documentation? `usr/share/doc/oniguruma/` is
 appropriate. `/usr/share/doc/` is usually used for these sorts of things.
@@ -653,7 +652,7 @@ oniguruma:8: license 'BSD', but no use of vlicense
 ```
 
 `BSD-2-Clause` is one of the licenses which require installation. The solution
-is the same [as in `bat`](packaging-bat.md#installing-licenses):
+is the same [as in `bat`](bat.md#installing-licenses):
 
 ```bash
 # Template file for 'oniguruma'
@@ -827,7 +826,7 @@ handling the name dynamically serves no practical purpose.
 I'm sure you're pretty tired of `bat` now. Let's package something completely
 different: [`rofimoji`](https://github.com/fdw/rofimoji):
 
-[Packaging rofimoji](packaging-rofimoji.md)
+[Packaging rofimoji](rofimoji.md)
 
 [^minimal]: Some people (although they are a minority) use an alternative
             `base-` package instead of `base-system` for their system. But these

src/packaging/rofimoji.md

@@ -143,8 +143,8 @@ This is our dependency. But I should talk about dependencies more.
 
 ## Dependencies for interpreted packages
 As I've mentioned in [the cross compilation section of packaging
-j4-dmenu-desktop](packaging-j4-dmenu-desktop.md#what-is-cross-compilation),
-cross compilation isn't really a thing for interpreted languages like Python.
+j4-dmenu-desktop](j4-dmenu-desktop.md#what-is-cross-compilation), cross
+compilation isn't really a thing for interpreted languages like Python.
 
 ```admonish
 This is true for
@@ -167,8 +167,8 @@ makedepends="python3-devel"
 ```
 
 One disadvantage of interpreted packages is that [Shlib
-detection](packaging-oniguruma.md#shlib-dependencies) doesn't exist for them.
-This means that you have to manually add all dependencies to `depends`.
+detection](oniguruma.md#shlib-dependencies) doesn't exist for them.  This means
+that you have to manually add all dependencies to `depends`.
 
 ## Hunting for dependencies
 As you may know, the main package manager for Python is `pip`. It uses the

src/tips_and_tricks.md

@@ -145,7 +145,7 @@ The following architectures are checked:
 
 I assume you are on `x86_64` (I make this assumption in the entire tutorial as
 I've mentioned in
-[j4-dmenu-desktop](xbps-src-tutorial/packaging-j4-dmenu-desktop.md#void-packages-structure)). The
+[j4-dmenu-desktop](packaging/j4-dmenu-desktop.md#void-packages-structure)). The
 following instructions can be easily changed to fit other architectures as well.
 For example if you are on `musl`, you won't have to create a special builddir
 for `x86_64-musl` because that is your default builddir.
@@ -464,7 +464,7 @@ _If you're on `x86_64`, this method is recommended only for `i686` and `x86_64-m
 
 ### Running compiled programs inside `masterdir` (QEMU build helper) { #qemu }
 As I've mentioned in [Packaging
-j4-dmenu-desktop](xbps-src-tutorial/packaging-j4-dmenu-desktop.md#what-is-cross-compilation), you
+j4-dmenu-desktop](packaging/j4-dmenu-desktop.md#what-is-cross-compilation), you
 can't run compiled executables when building a template under normal conditions.
 
 _This applies only for **cross compilation**, not for [native compilation for
@@ -501,9 +501,8 @@ hungry.
 If upstream's build system wants to execute things (and it isn't `cmake` nor
 `meson`[^badqemu]), you will have to convince it to use QEMU. You'll probably
 have to [make patches to the build
-system](xbps-src-tutorial/packaging-j4-dmenu-desktop.md#when-their-build-system-is-broken). This
-can be difficult
-sometimes. You should consider [notifying upstream about
+system](packaging/j4-dmenu-desktop.md#when-their-build-system-is-broken). This
+can be difficult sometimes. You should consider [notifying upstream about
 it](troubleshooting.md#notifying-upstream).
 
 ### Using the native package