-
Notifications
You must be signed in to change notification settings - Fork 5
Adding debian support #126
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
tbazant
wants to merge
4
commits into
main
Choose a base branch
from
tbazant-add-debian-subdir
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,7 @@ | ||
| geekodoc for Debian | ||
| ------------------ | ||
|
|
||
| * several wheel python modules are needed to build the package properly, | ||
| see the `pypi` subdirectory | ||
|
|
||
| -- Tomáš Bažant <[email protected]> Fri, 08 Dec 2023 14:47:25 +0100 |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| * Try building `python3 -m venv .venv` with `--system-site-packages`, | ||
| update the `control` file with dependencies and possibly remove one | ||
| or more python wheel packges in favour of system ones |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,30 @@ | ||
| geekodoc (2.3.2-2) UNRELEASED; urgency=medium | ||
|
|
||
| * aligned symlinks for rng and rnc files and directories | ||
| * limited the number of distributed schema files | ||
|
|
||
| -- Tomáš Bažant <[email protected]> Thu, 07 Mar 2024 13:56:34 +0100 | ||
|
|
||
| geekodoc (2.3.2-1) unstable; urgency=medium | ||
|
|
||
| * small text-flow improvements | ||
|
|
||
| -- Tomáš Bažant <[email protected]> Thu, 07 Mar 2024 12:00:55 +0100 | ||
|
|
||
| geekodoc (2.3.2-0) unstable; urgency=medium | ||
|
|
||
| * Added geekodoc v2 RNG file mapping. | ||
|
|
||
| -- Tomáš Bažant <[email protected]> Tue, 05 Mar 2024 17:28:25 +0100 | ||
|
|
||
| geekodoc (2.3.1-0) unstable; urgency=medium | ||
|
|
||
| * Updating to the latest version 2.3.1. | ||
|
|
||
| -- Tomáš Bažant <[email protected]> Tue, 05 Mar 2024 13:37:40 +0100 | ||
|
|
||
| geekodoc (2.2.2-2) unstable; urgency=medium | ||
|
|
||
| * Initial release. Properly repackaged. | ||
|
|
||
| -- Tomáš Bažant <[email protected]> Fri, 08 Dec 2023 14:47:25 +0100 |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,26 @@ | ||
| Source: geekodoc | ||
| Section: doc | ||
| Priority: optional | ||
| Maintainer: Tomáš Bažant <[email protected]> | ||
| Rules-Requires-Root: no | ||
| Build-Depends: | ||
| debhelper-compat (= 13), | ||
| xml-core, | ||
| python3-venv, | ||
| libxslt-dev, | ||
| python3-dev, | ||
| jing, | ||
| trang, | ||
| libxml2-utils | ||
| Standards-Version: 4.6.2 | ||
| Homepage: https://github.com/openSUSE/geekodoc | ||
|
|
||
| Package: geekodoc | ||
| Architecture: all | ||
| Depends: | ||
| ${shlibs:Depends}, | ||
| ${misc:Depends}, | ||
| Description: A RELAX NG schema and a subset of DocBook 5. | ||
| It restricts the content model of some elements and attributes to make it | ||
| easier to write documents. Valid GeekoDoc documents are also valid DocBook 5 | ||
| documents. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,25 @@ | ||
| Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ | ||
| Source: https://github.com/openSUSE/geekodoc | ||
| Upstream-Name: geekodoc | ||
| Upstream-Contact: Tom Schraitle, https://github.com/tomschr | ||
|
|
||
| Files: | ||
| debian/* | ||
| Copyright: | ||
| 2023 Tomáš Bažant <[email protected]> | ||
| License: GPL-2+ | ||
| This package is free software; you can redistribute it and/or modify | ||
| it under the terms of the GNU General Public License as published by | ||
| the Free Software Foundation; either version 2 of the License, or | ||
| (at your option) any later version. | ||
| . | ||
| This package is distributed in the hope that it will be useful, | ||
| but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| GNU General Public License for more details. | ||
| . | ||
| You should have received a copy of the GNU General Public License | ||
| along with this program. If not, see <https://www.gnu.org/licenses/> | ||
| Comment: | ||
| On Debian systems, the complete text of the GNU General | ||
| Public License version 2 can be found in "/usr/share/common-licenses/GPL-2". |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,2 @@ | ||
| README.source | ||
| README.Debian |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| #build/geekodoc/rng usr/share/xml/geekodoc | ||
| build/geekodoc/rng/1_5.1/geekodoc-v1-flat.rnc /usr/share/xml/geekodoc/rng/1_5.1/ | ||
| build/geekodoc/rng/1_5.1/geekodoc-v1-flat.rng /usr/share/xml/geekodoc/rng/1_5.1/ | ||
| build/geekodoc/rng/2_5.2/geekodoc-v2-flat.rnc /usr/share/xml/geekodoc/rng/2_5.2/ | ||
| build/geekodoc/rng/2_5.2/geekodoc-v2-flat.rng /usr/share/xml/geekodoc/rng/2_5.2/ |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,7 @@ | ||
| /usr/share/xml/geekodoc/rng/1_5.1/geekodoc-v1-flat.rnc /usr/share/xml/geekodoc/rng/1_5.1/geekodoc5-flat.rnc | ||
| /usr/share/xml/geekodoc/rng/1_5.1/geekodoc-v1-flat.rng /usr/share/xml/geekodoc/rng/1_5.1/geekodoc5-flat.rng | ||
| /usr/share/xml/geekodoc/rng/1_5.1/geekodoc-v1-flat.rnc /usr/share/xml/geekodoc/rng/geekodoc5-flat.rnc | ||
| /usr/share/xml/geekodoc/rng/1_5.1/geekodoc-v1-flat.rng /usr/share/xml/geekodoc/rng/geekodoc5-flat.rng | ||
| /usr/share/xml/geekodoc/rng/2_5.2/geekodoc-v2-flat.rng /usr/share/xml/geekodoc/rng/geekodoc-latest-flat.rng | ||
| /usr/share/xml/geekodoc/rng/2_5.2/geekodoc-v2-flat.rnc /usr/share/xml/geekodoc/rng/geekodoc-latest-flat.rnc | ||
| /usr/share/xml/geekodoc/rng/2_5.2 /usr/share/xml/geekodoc/rng/latest |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,7 @@ | ||
| local;catalog.d/geekodoc.xml;/usr/share/xml/geekodoc/catalog-geekodoc.xml | ||
|
|
||
| root-and-package;system;https://github.com/openSUSE/geekodoc/;/usr/share/xml/geekodoc/catalog-geekodoc.xml | ||
| root-and-package;system;urn:x-suse:rnc:v1:geekodoc-flat;/usr/share/xml/geekodoc/catalog-geekodoc.xml | ||
| root-and-package;system;urn:x-suse:rnc:v2:geekodoc-flat;/usr/share/xml/geekodoc/catalog-geekodoc.xml | ||
| root-and-package;system;urn:x-suse:rng:v1:geekodoc-flat;/usr/share/xml/geekodoc/catalog-geekodoc.xml | ||
| root-and-package;system;urn:x-suse:rng:v2:geekodoc-flat;/usr/share/xml/geekodoc/catalog-geekodoc.xml |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| update-buildsh.patch |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,20 @@ | ||
| --- a/build.sh | ||
| +++ b/build.sh | ||
| @@ -151,7 +151,7 @@ | ||
| # * jing | ||
| # * python3-rnginline (from obs://devel:languages:python/python3-rnginline) | ||
| # * docbook_5 (from obs://Publishing) | ||
| - local SCRIPTS="trang jing rnginline" | ||
| + local SCRIPTS="trang jing .venv/bin/rnginline" | ||
|
|
||
| for prog in $SCRIPTS; do | ||
| if ! command -v $prog >/dev/null; then | ||
| @@ -207,7 +207,7 @@ | ||
| rng="$f.rng" | ||
| rni="$f-flat.rni" | ||
| logdebug "Converting $rng -> $rni" | ||
| - rnginline "$rng" "$rni" | ||
| + .venv/bin/rnginline "$rng" "$rni" | ||
tbazant marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| if [[ "$?" -ne 0 ]]; then | ||
| exit_on_error "Conversion from $rng -> $rni failed" | ||
| fi | ||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,29 @@ | ||
| #!/usr/bin/make -f | ||
|
|
||
| # See debhelper(7) (uncomment to enable) | ||
|
|
||
| # Output every command that modifies files on the build system. | ||
| export DH_VERBOSE = 1 | ||
|
|
||
| %: | ||
| dh $@ | ||
|
|
||
| override_dh_auto_build: | ||
| python3 -m venv .venv | ||
| bash -c 'source .venv/bin/activate' | ||
| .venv/bin/pip install debian/pypi/docopt_ng-0.8.1-py2.py3-none-any.whl | ||
| .venv/bin/pip install debian/pypi/zipp-3.17.0-py3-none-any.whl | ||
| .venv/bin/pip install debian/pypi/importlib_metadata-6.11.0-py3-none-any.whl | ||
| .venv/bin/pip install debian/pypi/lxml-4.9.3-cp311-cp311-manylinux_2_28_x86_64.whl | ||
| .venv/bin/pip install debian/pypi/typing_extensions-4.9.0-py3-none-any.whl | ||
| .venv/bin/pip install debian/pypi/rnginline-1.0.0-py3-none-any.whl | ||
|
Comment on lines
+14
to
+19
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
|
||
| ./build.sh | ||
|
|
||
| override_dh_auto_clean: | ||
| rm -rf .venv dist/ build/ | ||
|
|
||
| override_dh_auto_install: | ||
| dh_install | ||
|
|
||
| override_dh_install: | ||
| dh_installxmlcatalogs | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| 3.0 (quilt) |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,6 @@ | ||
| debian/pypi/docopt_ng-0.8.1-py2.py3-none-any.whl | ||
| debian/pypi/rnginline-1.0.0-py3-none-any.whl | ||
| debian/pypi/zipp-3.17.0-py3-none-any.whl | ||
| debian/pypi/importlib_metadata-6.11.0-py3-none-any.whl | ||
| debian/pypi/lxml-4.9.3-cp311-cp311-manylinux_2_28_x86_64.whl | ||
| debian/pypi/typing_extensions-4.9.0-py3-none-any.whl |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| Bug-Database: https://github.com/openSUSE/geekodoc/issues | ||
| Bug-Submit: https://github.com/openSUSE/geekodoc/issues/new | ||
| Changelog: https://github.com/openSUSE/geekodoc/blob/main/ChangeLog | ||
| Repository-Browse: https://github.com/openSUSE/geekodoc | ||
| Repository: https://github.com/openSUSE/geekodoc.git |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,15 @@ | ||
| # Example watch control file for uscan. | ||
| # Rename this file to "watch" and then you can run the "uscan" command | ||
| # to check for upstream updates and more. | ||
| # See uscan(1) for format. | ||
|
|
||
| # Compulsory line, this is a version 4 file. | ||
| version=4 | ||
|
|
||
| # PGP signature mangle, so foo.tar.gz has foo.tar.gz.sig. | ||
| opts="pgpsigurlmangle=s%$%.sig%" | ||
|
|
||
| # GitHub hosted projects. | ||
| opts="filenamemangle=s%(?:.*?)?v?(@ANY_VERSION@@ARCHIVE_EXT@)%@PACKAGE@-$1%" \ | ||
| https://github.com/openSUSE/geekodoc/tags \ | ||
| (?:.*?/)v?@ANY_VERSION@@ARCHIVE_EXT@ |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.