From c8b7f8772a3bbac902eb6eb61d6a3a2871575027 Mon Sep 17 00:00:00 2001 From: Emmanuel Engelhart Date: Tue, 18 May 2021 12:16:17 +0200 Subject: [PATCH] Fix Libkiwix Github repository URLS --- README.md | 10 +++++----- .../kiwixLibAndroid/build.gradle | 8 ++++---- debian/control | 2 +- meson.build | 2 +- test/data/library.xml | 6 +++--- test/library.cpp | 2 +- test/server.cpp | 6 +++--- 7 files changed, 18 insertions(+), 18 deletions(-) diff --git a/README.md b/README.md index 9a0c1ca12..e9ff16357 100644 --- a/README.md +++ b/README.md @@ -6,12 +6,12 @@ suite core. It contains the code shared by all Kiwix ports (Windows, GNU/Linux, macOS, Android, iOS, ...). [![Download](https://api.bintray.com/packages/kiwix/kiwix/kiwixlib/images/download.svg)](https://bintray.com/kiwix/kiwix/kiwixlib/_latestVersion) -[![Build Status](https://github.com/kiwix/kiwix-lib/workflows/CI/badge.svg?query=branch%3Amaster)](https://github.com/kiwix/kiwix-lib/actions?query=branch%3Amaster) -[![CodeFactor](https://www.codefactor.io/repository/github/kiwix/kiwix-lib/badge)](https://www.codefactor.io/repository/github/kiwix/kiwix-lib) -[![Codecov](https://codecov.io/gh/kiwix/kiwix-lib/branch/master/graph/badge.svg)](https://codecov.io/gh/kiwix/kiwix-lib) +[![Build Status](https://github.com/kiwix/libkiwix/workflows/CI/badge.svg?query=branch%3Amaster)](https://github.com/kiwix/libkiwix/actions?query=branch%3Amaster) +[![CodeFactor](https://www.codefactor.io/repository/github/kiwix/libkiwix/badge)](https://www.codefactor.io/repository/github/kiwix/libkiwix) +[![Codecov](https://codecov.io/gh/kiwix/libkiwix/branch/master/graph/badge.svg)](https://codecov.io/gh/kiwix/libkiwix) [![License: GPL v3](https://img.shields.io/badge/License-GPLv3-blue.svg)](https://www.gnu.org/licenses/gpl-3.0) -[![Packaging status](https://repology.org/badge/vertical-allrepos/kiwix-lib.svg)](https://repology.org/project/kiwix-lib/versions) +[![Packaging status](https://repology.org/badge/vertical-allrepos/libkiwix.svg)](https://repology.org/project/libkiwix/versions) Disclaimer ---------- @@ -56,7 +56,7 @@ In the worse case, you will have to download and compile bleeding edge version by hand. If you want to install these dependencies locally, then use the -`kiwix-lib` directory as install prefix. +`libkiwix` directory as install prefix. Environment ------------- diff --git a/android-kiwix-lib-publisher/kiwixLibAndroid/build.gradle b/android-kiwix-lib-publisher/kiwixLibAndroid/build.gradle index 67f45f4c7..01ab812ad 100644 --- a/android-kiwix-lib-publisher/kiwixLibAndroid/build.gradle +++ b/android-kiwix-lib-publisher/kiwixLibAndroid/build.gradle @@ -29,7 +29,7 @@ task writePom { version '10.0.0' + (System.env.KIWIXLIB_BUILDVERSION == null ? '' : '-'+System.env.KIWIXLIB_BUILDVERSION) packaging 'aar' name 'kiwixlib' - url 'https://github.com/kiwix/kiwix-lib' + url 'https://github.com/kiwix/libkiwix' licenses { license { name 'GPLv3' @@ -44,9 +44,9 @@ task writePom { } } scm { - connection 'https://github.com/kiwix/kiwix-lib.git' - developerConnection 'https://github.com/kiwix/kiwix-lib.git' - url 'https://github.com/kiwix/kiwix-lib' + connection 'https://github.com/kiwix/libkiwix.git' + developerConnection 'https://github.com/kiwix/libkiwix.git' + url 'https://github.com/kiwix/libkiwix' } } }.withXml { diff --git a/debian/control b/debian/control index 396af0855..733afdc9b 100644 --- a/debian/control +++ b/debian/control @@ -15,7 +15,7 @@ Build-Depends: debhelper-compat (= 13), zlib1g-dev Standards-Version: 4.5.0 Section: libs -Homepage: https://github.com/kiwix/kiwix-lib +Homepage: https://github.com/kiwix/libkiwix Rules-Requires-Root: no Package: libkiwix-dev diff --git a/meson.build b/meson.build index 7af35e225..3ca1004f2 100644 --- a/meson.build +++ b/meson.build @@ -18,7 +18,7 @@ if wrapper.contains('java') add_languages('java') endif -# See https://github.com/kiwix/kiwix-lib/issues/371 +# See https://github.com/kiwix/libkiwix/issues/371 if ['arm', 'mips', 'm68k', 'ppc', 'sh4'].contains(target_machine.cpu_family()) extra_libs += '-latomic' endif diff --git a/test/data/library.xml b/test/data/library.xml index 1ab2193b5..aa9502382 100644 --- a/test/data/library.xml +++ b/test/data/library.xml @@ -2,7 +2,7 @@ \n" \ " Kiwix\n" \ " \n" \ - " \n" \ + " \n" \ " \n" #define RAY_CHARLES_CATALOG_ENTRY \ @@ -654,7 +654,7 @@ std::string maskVariableOPDSFeedData(std::string s) " \n" \ " Kiwix\n" \ " \n" \ - " \n" \ + " \n" \ " \n" #define UNCATEGORIZED_RAY_CHARLES_CATALOG_ENTRY \ @@ -678,7 +678,7 @@ std::string maskVariableOPDSFeedData(std::string s) " \n" \ " Kiwix\n" \ " \n" \ - " \n" \ + " \n" \ " \n" TEST_F(LibraryServerTest, catalog_root_xml)