More proofreading tweaks

This commit is contained in:
Joshua Boniface 2017-07-07 13:11:53 -04:00
parent 25493fc80c
commit 60fde26251
1 changed files with 5 additions and 3 deletions

View File

@ -215,7 +215,7 @@ $ vim debian/control
services. services.
``` ```
Next we edit the `rules` to add a few missing things. First, we add some additional configuration flags for disabling SSL (user something as a forward proxy, also prevents build errors) and specifying the library directory; this is needed for the build proess to find the `libreoffice` libraries. We also add a call to `autogen.sh` in the configuration step (missing inexplicably in this version), as well as overrides to the auto-build (to allow `-jX` flags to work) and the shlibdeps steps (to avoid more errors). Next we edit the `rules` to add a few missing things. First, we add some additional configuration flags for disabling SSL (instead use a forward proxy; this also prevents build errors) and specifying the library directory; this is needed for the build proess to find the `libreoffice` libraries. We also add a call to `autogen.sh` in the configuration step (missing inexplicably in this version), as well as overrides to the auto-build (to allow `-jX` flags to work).
``` ```
@@ -5,7 +5,7 @@ DPKG_EXPORT_BUILDFLAGS = 1 @@ -5,7 +5,7 @@ DPKG_EXPORT_BUILDFLAGS = 1
@ -254,7 +254,9 @@ $ vim debian/patches/series
+fix-libpath +fix-libpath
``` ```
Next we create the two patch files. The first is to enable SSL support always - this seems to contradict the above change to disable SSL, but otherwise the build process fails. The second fixes up the location of the `libreoffice` libraries so the `amd64`-only build can find where they exist in Stretch `amd64`. _Note: to avoid showing a diff of a diff, the following two entries are the verbatim contents of the file_ Next we create the two patch files. The first is to enable SSL support always - this seems to contradict the above change to disable SSL, but otherwise the build process fails. The second fixes up the location of the `libreoffice` libraries so the `amd64`-only build can find where they exist in Stretch `amd64`.
_Note: to avoid showing a diff of a diff, the following two entries are the verbatim contents of the file_
``` ```
$ vim debian/patches/enable-ssl-always $ vim debian/patches/enable-ssl-always
@ -331,7 +333,7 @@ Last-Update: 2017-06-23
``` ```
Now we install some required `npm` dependencies; the `nodejs-legacy` dependency should have provided `npm`; don't install the `npm` package itself as this will cause dependency hell. Now we install some required `npm` dependencies; the `nodejs-legacy` package will provide our `npm`; don't install the `npm` package itself as this will cause dependency hell. I do this in the main homedir to avoid putting cruft into the repos.
``` ```
cd ~ cd ~