[Git][java-team/filius][master] 5 commits: Split source and general Debian information.
Andreas B. Mundt (@andi)
gitlab at salsa.debian.org
Mon Aug 7 14:44:50 BST 2023
Andreas B. Mundt pushed to branch master at Debian Java Maintainers / filius
Commits:
11938d44 by Andreas B. Mundt at 2023-08-07T14:42:44+02:00
Split source and general Debian information.
- - - - -
47815569 by Andreas B. Mundt at 2023-08-07T15:14:20+02:00
Convert markdown docs to HTML.
- - - - -
9f3545b2 by Andreas B. Mundt at 2023-08-07T15:29:21+02:00
Fix lintian warning 'classpath-contains-relative-path'.
- - - - -
1231b485 by Andreas B. Mundt at 2023-08-07T15:29:21+02:00
Register manual with doc-base.
- - - - -
4a7c1191 by Andreas B. Mundt at 2023-08-07T15:30:41+02:00
Update changelog.
- - - - -
11 changed files:
- + debian/README.Debian
- debian/README.source
- debian/changelog
- debian/control
- + debian/filius.doc-base
- + debian/filius.docs
- debian/filius.install
- debian/maven.rules
- + debian/patches/convert-docs-HTML.patch
- + debian/patches/fix-build-time-classpath.patch
- debian/patches/series
Changes:
=====================================
debian/README.Debian
=====================================
@@ -0,0 +1,10 @@
+ FILIUS in Debian
+==================
+Many examples and some documentation has been removed from the filius
+package because of its binary format. Please consult the following
+links for that content and some more documentation:
+
+ • https://www.lernsoftware-filius.de/
+ • https://gitlab.com/filius1/filius/-/tree/master/beispiele
+
+ -- Andreas B. Mundt <andi at debian.org> Mon, 07 Aug 2023 13:48:03 +0200
=====================================
debian/README.source
=====================================
@@ -7,10 +7,3 @@ from the maven-debian-helper package.
The build system uses Maven but prevents it from downloading
anything from the Internet, making the build compliant with
the Debian policy.
-
-Many examples and some documentation has been removed from the filius
-package because of its binary format. Please consult the following
-links for that content and some more documentation:
-
- • https://www.lernsoftware-filius.de/
- • https://gitlab.com/filius1/filius/-/tree/master/beispiele
=====================================
debian/changelog
=====================================
@@ -1,3 +1,11 @@
+filius (2.4.2~git20230806.eefa4ee3+ds-2) UNRELEASED; urgency=medium
+
+ * Split source and general Debian information in separate READMEs.
+ * Fix lintian warning 'classpath-contains-relative-path'.
+ * Convert markdown docs to HTML and register manual with doc-base.
+
+ -- Andreas B. Mundt <andi at debian.org> Mon, 07 Aug 2023 14:46:30 +0200
+
filius (2.4.2~git20230806.eefa4ee3+ds-1) unstable; urgency=medium
* Initial release (Closes: #982648)
=====================================
debian/control
=====================================
@@ -6,16 +6,18 @@ Uploaders: Andreas B. Mundt <andi at debian.org>
Rules-Requires-Root: no
Build-Depends: debhelper-compat (= 13),
default-jdk,
- libmaven-antrun-plugin-java,
- maven-debian-helper (>= 2.6)
+ maven-debian-helper (>= 2.6),
+ pandoc
Build-Depends-Indep: libbatik-java (>= 1.12),
libcommons-cli-java (>= 1.4),
libcommons-httpclient-java,
libcommons-io-java (>= 2.11.0),
libcommons-lang3-java (>= 3.12.0),
+ libexec-maven-plugin-java (>= 3.1.0),
libhtmlparser-java (>= 1.6.20060610.dfsg0-10),
libitext5-java (>= 5.5.13.3),
liblogback-java (>= 1.2.11),
+ libmaven-antrun-plugin-java (>= 1.7),
libmaven-dependency-plugin-java (>= 3.5.0),
libsemantic-version-java (>= 2.1.1),
libslf4j-java (>= 1.7.30)
=====================================
debian/filius.doc-base
=====================================
@@ -0,0 +1,10 @@
+Document: filius-manual-de
+Title: Skriptum zur Unterrichtsreihe „Netzwerke mit FILIUS“
+Author: Daniel Garmann <dgarmann at freenet.de>
+Abstract: The manual describes how to use FILIUS in class.
+ It provides many examples and exercises.
+Section: Education
+
+Format: HTML
+Index: /usr/share/doc/filius/Einfuehrung_Filius.html
+Files: /usr/share/doc/filius/Einfuehrung_Filius.html
=====================================
debian/filius.docs
=====================================
@@ -0,0 +1 @@
+src/info/*
=====================================
debian/filius.install
=====================================
@@ -2,7 +2,6 @@ debian/bin/filius usr/bin/
src/deb/application-filius-project.xml usr/share/mime/packages/
src/deb/filius.desktop usr/share/applications/
src/deb/filius32.png usr/share/pixmaps/
-src/info/* usr/share/doc/filius/
src/main/resources/config usr/share/filius/
src/main/resources/hilfe usr/share/filius/
src/main/resources/img usr/share/filius/
=====================================
debian/maven.rules
=====================================
@@ -2,4 +2,5 @@
com.itextpdf itextpdf jar s/5\..*/5.x/ * *
commons-httpclient commons-httpclient jar s/3\..*/3.x/ * *
de.skuzzle semantic-version jar s/.*/debian/ * *
+org.codehaus.mojo exec-maven-plugin jar s/.*/debian/ * *
filius filius jar s/.*/debian/ * *
=====================================
debian/patches/convert-docs-HTML.patch
=====================================
@@ -0,0 +1,36 @@
+Description: Generate HTML from markdown during build
+Author: Andreas B. Mundt <andi at debian.org>
+Forwarded: https://gitlab.com/filius1/filius/-/merge_requests/21
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/pom.xml
++++ b/pom.xml
+@@ -414,6 +414,28 @@
+ </execution>
+ </executions>
+ </plugin>
++ <plugin>
++ <groupId>org.codehaus.mojo</groupId>
++ <artifactId>exec-maven-plugin</artifactId>
++ <version>3.1.0</version>
++ <executions>
++ <execution>
++ <phase>prepare-package</phase>
++ <goals>
++ <goal>exec</goal>
++ </goals>
++ </execution>
++ </executions>
++ <configuration>
++ <executable>pandoc</executable>
++ <workingDirectory>src/info/</workingDirectory>
++ <arguments>
++ <argument>-o</argument>
++ <argument>Einfuehrung_Filius.html</argument>
++ <argument>Einfuehrung_Filius.md</argument>
++ </arguments>
++ </configuration>
++ </plugin>
+ <!-- Create Debian Package (used for Ubuntu Platform) -->
+ <plugin>
+ <artifactId>jdeb</artifactId>
=====================================
debian/patches/fix-build-time-classpath.patch
=====================================
@@ -0,0 +1,15 @@
+Description: Fix lintian warning 'classpath-contains-relative-path'.
+Author: Andreas B. Mundt <andi at debian.org>
+Forwarded: not-needed
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/pom.xml
++++ b/pom.xml
+@@ -194,7 +194,6 @@
+ <manifest>
+ <mainClass>filius.Main</mainClass>
+ <addClasspath>true</addClasspath>
+- <classpathPrefix>lib/</classpathPrefix>
+ </manifest>
+ <manifestEntries>
+ <Class-Path>.</Class-Path>
=====================================
debian/patches/series
=====================================
@@ -1,2 +1,4 @@
+convert-docs-HTML.patch
fix-exec-path.patch
add-keywords.patch
+fix-build-time-classpath.patch
View it on GitLab: https://salsa.debian.org/java-team/filius/-/compare/b4ea4982c9c4c7727fd6819aae99a3fb6c359589...4a7c11911d9109a42ae1387a3b4200272c11ee0c
--
View it on GitLab: https://salsa.debian.org/java-team/filius/-/compare/b4ea4982c9c4c7727fd6819aae99a3fb6c359589...4a7c11911d9109a42ae1387a3b4200272c11ee0c
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-java-commits/attachments/20230807/5d180545/attachment.htm>
More information about the pkg-java-commits
mailing list