Skip to content
Commits on Source (2)
  • Markus Koschany's avatar
    Import Upstream version 9.1.2 · a9881b06
    Markus Koschany authored
    a9881b06
  • Markus Koschany's avatar
    Import Debian changes 9.1.2-1 · 86c9fb46
    Markus Koschany authored
    fontawesomefx (9.1.2-1) unstable; urgency=medium
    
      * New upstream version 9.1.2.
        - New build system: Gradle
      * Switch to compat level 11.
      * Declare compliance with Debian Policy 4.2.1.
      * Build-depend on libopenjfx-java instead of openjfx.
      * Fix FTBFS with OpenJFX 11. (Closes: #893194)
      * Remove get-orig-source target.
      * Add build.patch and use Debian's system libraries.
      * Install all icon font jars. Update the package description accordingly.
    86c9fb46
/target/
\ No newline at end of file
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<gradle-project-properties>
<!--DO NOT EDIT THIS FILE! - Used by the Gradle plugin of NetBeans.-->
<source-level>1.9</source-level>
<license-header>
<name>apache20</name>
<property name="organization">Jens Deters</property>
</license-header>
<built-in-tasks>
<task>
<display-name>run</display-name>
<non-blocking>no</non-blocking>
<task-names>
<name must-exist="no">run</name>
</task-names>
<task-args/>
<task-jvm-args>
<arg>-Dprism.debugfonts=true</arg>
</task-jvm-args>
</task>
</built-in-tasks>
</gradle-project-properties>
apply plugin: 'base'
apply from: 'deploy.gradle'
buildscript {
repositories {
jcenter()
}
dependencies {
classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.6'
}
}
// Create the pom configuration:
def pomConfig = {
licenses {
license {
name "The Apache Software License, Version 2.0"
url "http://www.apache.org/licenses/LICENSE-2.0.txt"
distribution "repo"
}
}
developers {
developer {
id "developer-id"
name "developer-name"
email "dev@d.com"
}
}
scm {
url "https://github.com/yourgithubaccount/example"
}
}
subprojects {
apply plugin: 'maven-publish'
apply plugin: 'com.jfrog.bintray'
apply plugin: "java"
apply plugin: "signing"
signing {
sign configurations.archives
}
group = artifactGroupId
sourceCompatibility = '1.9'
[compileJava, compileTestJava]*.options*.encoding = 'UTF-8'
bintray {
user = System.getenv('BINTRAY_USER')
key = System.getenv('BINTRAY_KEY')
pkg {
repo = 'maven'
name = artifactName
userOrg = artifactUserOrg
licenses = artifactLicenses
vcsUrl = artifactGitUrl
publications = artifactPublications
websiteUrl = artifactWebSiteUrl
issueTrackerUrl = artifactIssueTrackerUrl
publicDownloadNumbers = true
version {
gpg {
sign = true
passphrase = System.getenv('SIGNING_PASSWORD')
}
name = '9.1.2'
desc = 'FontAwesomeFX 9.1.2'
vcsTag = 'fontawesomefx-9.1.2'
}
}
}
repositories {
mavenCentral()
mavenLocal()
}
task javadocJar(type: Jar) {
classifier 'javadoc'
from javadoc.destinationDir
}
task sourceJar(type: Jar) {
from sourceSets.main.allJava
classifier "sources"
}
publishing {
publications {
mavenJava(MavenPublication) {
from components.java
artifact sourceJar {
classifier "sources"
}
artifact javadocJar {
classifier "javadoc"
}
pom.withXml {
def root = asNode()
root.appendNode('description', artifactDescription)
root.appendNode('name', artifactName)
root.appendNode('url', artifactWebSiteUrl)
root.children().last() + pomConfig
}
}
}
}
dependencies {
testCompile 'junit:junit:4.10'
}
afterEvaluate {
repositories {
jcenter()
}
compileJava {
doFirst {
options.compilerArgs = [
'--module-path', classpath.asPath,
]
classpath = files()
}
}
test {
inputs.property("moduleName", moduleName)
doFirst {
jvmArgs = [
'--module-path', classpath.asPath,
'--add-modules', 'ALL-MODULE-PATH',
'--add-reads', "$moduleName=junit",
'--patch-module', "$moduleName=" + files(sourceSets.test.java.outputDir).asPath,
]
classpath = files()
}
}
jar {
inputs.property("moduleName", moduleName)
manifest {
attributes('Main-Class': mainClassName)
attributes('Automatic-Module-Name': moduleName)
}
}
}
}
task wrapper(type: Wrapper) {
gradleVersion = '4.2'
}
Information about fontawesomefx
-------------------------------
This package was debianized using the mh_make command
from the maven-debian-helper package.
Steps to create the original tarball:
1. git clone https://Jerady@bitbucket.org/Jerady/fontawesomefx.git
2. git checkout fontawesomefx-9.1.2
3. find . -name "*.jar" -delete
4. tar caf fontawesomefx_9.1.2.orig.tar.xz fontawesomefx
The build system uses Maven but prevents it from downloading
anything from the Internet, making the build compliant with
the Debian policy.
fontawesomefx (9.1.2-1) unstable; urgency=medium
* New upstream version 9.1.2.
- New build system: Gradle
* Switch to compat level 11.
* Declare compliance with Debian Policy 4.2.1.
* Build-depend on libopenjfx-java instead of openjfx.
* Fix FTBFS with OpenJFX 11. (Closes: #893194)
* Remove get-orig-source target.
* Add build.patch and use Debian's system libraries.
* Install all icon font jars. Update the package description accordingly.
-- Markus Koschany <apo@debian.org> Mon, 08 Oct 2018 18:42:45 +0200
fontawesomefx (8.9-1) unstable; urgency=medium
* Initial release (Closes: #866894)
......
......@@ -5,12 +5,13 @@ Maintainer: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.or
Uploaders:
Markus Koschany <apo@debian.org>
Build-Depends:
debhelper (>= 10),
debhelper (>= 11),
gradle-debian-helper,
default-jdk,
junit4,
maven-debian-helper (>= 2.1),
openjfx
Standards-Version: 4.0.0
libopenjfx-java,
maven-repo-helper
Standards-Version: 4.2.1
Vcs-Git: https://anonscm.debian.org/git/pkg-java/fontawesomefx.git
Vcs-Browser: https://anonscm.debian.org/git/pkg-java/fontawesomefx.git
Homepage: http://www.jensd.de
......@@ -18,12 +19,9 @@ Homepage: http://www.jensd.de
Package: libfontawesomefx-java
Architecture: all
Depends:
${maven:Depends},
${misc:Depends}
Suggests:
${maven:OptionalDepends}
Description: Font Awesome perfectly integrated into JavaFX
This package allows Java developers to easily integrate the Font Awesome icon
font created by Dave Gandy into their JavaFX applications. This is possible
because all icons are scalable vector graphics and each icon can be styled
with CSS.
This package allows Java developers to easily integrate different icon fonts
like Font Awesome, WeatherIcons, MaterialStackIcons, Material Design Font,
Octicons and 525Icons into their JavaFX applications. This is possible because
all icons are scalable vector graphics and each icon can be styled with CSS.
......@@ -6,26 +6,30 @@ Files: *
Copyright: 2015-2017, www.jensd.de
License: Apache-2.0
Files: src/main/resources/de/jensd/fx/glyphs/octicons/octicons.ttf
Files: fontawesomefx-octicons/src/main/resources/de/jensd/fx/glyphs/octicons/octicons.ttf
Copyright: 2012-2016, Github Inc.
License: Expat
Files: src/main/resources/de/jensd/fx/glyphs/weathericons/weathericons-regular-webfont.ttf
Files: fontawesomefx-weathericons/src/main/resources/de/jensd/fx/glyphs/weathericons/weathericons-regular-webfont.ttf
Copyright: Erik Flowers and Lukas Bischoff
License: OFL-1.1
Files: src/main/resources/de/jensd/fx/glyphs/materialicons/MaterialIcons-Regular.ttf
src/main/resources/de/jensd/fx/glyphs/materialdesignicons/materialdesignicons-webfont_OLD.ttf
src/main/resources/de/jensd/fx/glyphs/materialdesignicons/materialdesignicons-webfont.ttf
Files: fontawesomefx-materialicons/src/main/resources/de/jensd/fx/glyphs/materialicons/MaterialIcons-Regular.ttf
fontawesomefx-materialdesignfont/src/main/resources/de/jensd/fx/glyphs/materialdesignicons/materialdesignicons-webfont.ttf
fontawesomefx-materialstackicons/src/main/resources/de/jensd/fx/glyphs/materialstackicons/MaterialIcons-Regular.ttf
Copyright: Google Inc.
License: Apache-2.0
Files: src/main/resources/de/jensd/fx/glyphs/fontawesome/fontawesome-webfont.ttf
Files: fontawesomefx-fontawesome/src/main/resources/de/jensd/fx/glyphs/fontawesome/fontawesome-webfont.ttf
Copyright: Dave Gandy
License: OFL-1.1
Files: fontawesomefx-icons525/src/main/resources/de/jensd/fx/glyphs/icons525/525icons.ttf
Copyright: Rune Strømsted
License: OFL-1.1
Files: debian/*
Copyright: 2017, Markus Koschany <apo@debian.org>
Copyright: 2017-2018, Markus Koschany <apo@debian.org>
License: Apache-2.0
License: Apache-2.0
......
......@@ -25,4 +25,13 @@
# --site-xml=<location>: Optional, the location for site.xml if it needs to be installed.
# Empty by default. [mh_install]
#
pom.xml --has-package-version
debian/poms/fontawesomefx-commons.pom.xml --java-lib --artifact=fontawesomefx-commons/build/libs/fontawesomefx-commons-9.1.2.jar
debian/poms/fontawesomefx-controls.pom.xml --java-lib --artifact=fontawesomefx-controls/build/libs/fontawesomefx-controls-9.1.2.jar
debian/poms/fontawesomefx-emojione.pom.xml --java-lib --artifact=fontawesomefx-emojione/build/libs/fontawesomefx-emojione-3.1.1-9.1.2.jar
debian/poms/fontawesomefx-fontawesome.pom.xml --java-lib --artifact=fontawesomefx-fontawesome/build/libs/fontawesomefx-fontawesome-4.7.0-9.1.2.jar
debian/poms/fontawesomefx-icons525.pom.xml --java-lib --artifact=fontawesomefx-icons525/build/libs/fontawesomefx-icons525-4.2.0-9.1.2.jar
debian/poms/fontawesomefx-materialdesignfont.pom.xml --java-lib --artifact=fontawesomefx-materialdesignfont/build/libs/fontawesomefx-materialdesignfont-2.0.26-9.1.2.jar
debian/poms/fontawesomefx-materialicons.pom.xml --java-lib --artifact=fontawesomefx-materialicons/build/libs/fontawesomefx-materialicons-2.2.0-9.1.2.jar
debian/poms/fontawesomefx-materialstackicons.pom.xml --java-lib --artifact=fontawesomefx-materialstackicons/build/libs/fontawesomefx-materialstackicons-2.1-5-9.1.2.jar
debian/poms/fontawesomefx-octicons.pom.xml --java-lib --artifact=fontawesomefx-octicons/build/libs/fontawesomefx-octicons-4.3.0-9.1.2.jar
debian/poms/fontawesomefx-weathericons.pom.xml --java-lib --artifact=fontawesomefx-weathericons/build/libs/fontawesomefx-weathericons-2.0.10-9.1.2.jar
org.apache.maven.plugins maven-gpg-plugin * * * *
org.apache.maven.plugins maven-javadoc-plugin * * * *
org.apache.maven.plugins maven-release-plugin * * * *
org.apache.maven.plugins maven-source-plugin * * * *
# Include here properties to pass to Maven during the build.
# For example:
# maven.test.skip=true
de.jensd fontawesomefx jar s/.*/debian/ * *
junit junit jar s/4\..*/4.x/ * *
From: Markus Koschany <apo@debian.org>
Date: Mon, 8 Oct 2018 15:24:44 +0200
Subject: build
Use Debian's system libraries and make it Debian compliant.
---
build.gradle | 67 ++++++++----------------------------------------------------
1 file changed, 9 insertions(+), 58 deletions(-)
diff --git a/build.gradle b/build.gradle
index 0e6b7b7..b7b15a9 100644
--- a/build.gradle
+++ b/build.gradle
@@ -5,9 +5,6 @@ buildscript {
repositories {
jcenter()
}
- dependencies {
- classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.6'
- }
}
// Create the pom configuration:
@@ -33,47 +30,18 @@ def pomConfig = {
}
subprojects {
- apply plugin: 'maven-publish'
- apply plugin: 'com.jfrog.bintray'
apply plugin: "java"
- apply plugin: "signing"
-
- signing {
- sign configurations.archives
- }
group = artifactGroupId
sourceCompatibility = '1.9'
[compileJava, compileTestJava]*.options*.encoding = 'UTF-8'
- bintray {
- user = System.getenv('BINTRAY_USER')
- key = System.getenv('BINTRAY_KEY')
- pkg {
- repo = 'maven'
- name = artifactName
- userOrg = artifactUserOrg
- licenses = artifactLicenses
- vcsUrl = artifactGitUrl
- publications = artifactPublications
- websiteUrl = artifactWebSiteUrl
- issueTrackerUrl = artifactIssueTrackerUrl
- publicDownloadNumbers = true
- version {
- gpg {
- sign = true
- passphrase = System.getenv('SIGNING_PASSWORD')
- }
- name = '9.1.2'
- desc = 'FontAwesomeFX 9.1.2'
- vcsTag = 'fontawesomefx-9.1.2'
- }
- }
- }
-
repositories {
mavenCentral()
mavenLocal()
+ flatDir {
+ dirs '/usr/share/java/'
+ }
}
task javadocJar(type: Jar) {
@@ -86,31 +54,14 @@ subprojects {
classifier "sources"
}
- publishing {
- publications {
- mavenJava(MavenPublication) {
- from components.java
- artifact sourceJar {
- classifier "sources"
- }
-
- artifact javadocJar {
- classifier "javadoc"
- }
-
- pom.withXml {
- def root = asNode()
- root.appendNode('description', artifactDescription)
- root.appendNode('name', artifactName)
- root.appendNode('url', artifactWebSiteUrl)
- root.children().last() + pomConfig
- }
- }
- }
- }
-
dependencies {
testCompile 'junit:junit:4.10'
+ compile name: 'javafx-base'
+ compile name: 'javafx-swing'
+ compile name: 'javafx-web'
+ compile name: 'javafx-graphics'
+ compile name: 'javafx-controls'
+ compile name: 'javafx-fxml'
}
afterEvaluate {
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<groupId>de.jensd</groupId>
<artifactId>fontawesomefx-commons</artifactId>
<version>9.1.2</version>
<description>Provide WebFont Icons for JavaFX Apps</description>
<name>FontAwesomeFX</name>
<url>https://bitbucket.org/Jerady/fontawesomefx/overview</url>
<licenses>
<license>
<name>The Apache Software License, Version 2.0</name>
<url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
<distribution>repo</distribution>
</license>
</licenses>
<developers>
<developer>
<id>developer-id</id>
<name>developer-name</name>
<email>dev@d.com</email>
</developer>
</developers>
<scm>
<url>https://github.com/yourgithubaccount/example</url>
</scm>
</project>
\ No newline at end of file
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<groupId>de.jensd</groupId>
<artifactId>fontawesomefx-controls</artifactId>
<version>9.1.2</version>
<dependencies>
<dependency>
<groupId>de.jensd</groupId>
<artifactId>fontawesomefx-commons</artifactId>
<version>9.1.2</version>
<scope>compile</scope>
</dependency>
</dependencies>
<description>Provide WebFont Icons for JavaFX Apps</description>
<name>FontAwesomeFX</name>
<url>https://bitbucket.org/Jerady/fontawesomefx/overview</url>
<licenses>
<license>
<name>The Apache Software License, Version 2.0</name>
<url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
<distribution>repo</distribution>
</license>
</licenses>
<developers>
<developer>
<id>developer-id</id>
<name>developer-name</name>
<email>dev@d.com</email>
</developer>
</developers>
<scm>
<url>https://github.com/yourgithubaccount/example</url>
</scm>
</project>
\ No newline at end of file
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<groupId>de.jensd</groupId>
<artifactId>fontawesomefx-emojione</artifactId>
<version>3.1.1-9.1.2</version>
<dependencies>
<dependency>
<groupId>de.jensd</groupId>
<artifactId>fontawesomefx-commons</artifactId>
<version>9.1.2</version>
<scope>compile</scope>
</dependency>
</dependencies>
<description>Provide WebFont Icons for JavaFX Apps</description>
<name>FontAwesomeFX</name>
<url>https://bitbucket.org/Jerady/fontawesomefx/overview</url>
<licenses>
<license>
<name>The Apache Software License, Version 2.0</name>
<url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
<distribution>repo</distribution>
</license>
</licenses>
<developers>
<developer>
<id>developer-id</id>
<name>developer-name</name>
<email>dev@d.com</email>
</developer>
</developers>
<scm>
<url>https://github.com/yourgithubaccount/example</url>
</scm>
</project>
\ No newline at end of file
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<groupId>de.jensd</groupId>
<artifactId>fontawesomefx-fontawesome</artifactId>
<version>4.7.0-9.1.2</version>
<dependencies>
<dependency>
<groupId>de.jensd</groupId>
<artifactId>fontawesomefx-commons</artifactId>
<version>9.1.2</version>
<scope>compile</scope>
</dependency>
</dependencies>
<description>Provide WebFont Icons for JavaFX Apps</description>
<name>FontAwesomeFX</name>
<url>https://bitbucket.org/Jerady/fontawesomefx/overview</url>
<licenses>
<license>
<name>The Apache Software License, Version 2.0</name>
<url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
<distribution>repo</distribution>
</license>
</licenses>
<developers>
<developer>
<id>developer-id</id>
<name>developer-name</name>
<email>dev@d.com</email>
</developer>
</developers>
<scm>
<url>https://github.com/yourgithubaccount/example</url>
</scm>
</project>
\ No newline at end of file
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<groupId>de.jensd</groupId>
<artifactId>fontawesomefx-icons525</artifactId>
<version>4.2.0-9.1.2</version>
<dependencies>
<dependency>
<groupId>de.jensd</groupId>
<artifactId>fontawesomefx-commons</artifactId>
<version>9.1.2</version>
<scope>compile</scope>
</dependency>
</dependencies>
<description>Provide WebFont Icons for JavaFX Apps</description>
<name>FontAwesomeFX</name>
<url>https://bitbucket.org/Jerady/fontawesomefx/overview</url>
<licenses>
<license>
<name>The Apache Software License, Version 2.0</name>
<url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
<distribution>repo</distribution>
</license>
</licenses>
<developers>
<developer>
<id>developer-id</id>
<name>developer-name</name>
<email>dev@d.com</email>
</developer>
</developers>
<scm>
<url>https://github.com/yourgithubaccount/example</url>
</scm>
</project>
\ No newline at end of file
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<groupId>de.jensd</groupId>
<artifactId>fontawesomefx-materialdesignfont</artifactId>
<version>2.0.26-9.1.2</version>
<dependencies>
<dependency>
<groupId>de.jensd</groupId>
<artifactId>fontawesomefx-commons</artifactId>
<version>9.1.2</version>
<scope>compile</scope>
</dependency>
</dependencies>
<description>Provide WebFont Icons for JavaFX Apps</description>
<name>FontAwesomeFX</name>
<url>https://bitbucket.org/Jerady/fontawesomefx/overview</url>
<licenses>
<license>
<name>The Apache Software License, Version 2.0</name>
<url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
<distribution>repo</distribution>
</license>
</licenses>
<developers>
<developer>
<id>developer-id</id>
<name>developer-name</name>
<email>dev@d.com</email>
</developer>
</developers>
<scm>
<url>https://github.com/yourgithubaccount/example</url>
</scm>
</project>
\ No newline at end of file