[Git][clojure-team/core-async-clojure][debian/main] 9 commits: Stop building the documentation.
Louis-Philippe Véronneau
gitlab at salsa.debian.org
Sat Nov 14 00:42:26 GMT 2020
Louis-Philippe Véronneau pushed to branch debian/main at Debian Clojure Maintainers / core-async-clojure
Commits:
9209c8fa by Louis-Philippe Véronneau at 2020-11-13T19:40:59-05:00
Stop building the documentation.
- - - - -
7cbf4d9c by Louis-Philippe Véronneau at 2020-11-13T19:41:04-05:00
d/control: update the VCS urls.
- - - - -
bb9ab473 by Louis-Philippe Véronneau at 2020-11-13T19:41:26-05:00
d/rules: remove java build parts, as there is no java code anymore
- - - - -
1fcbbff1 by Louis-Philippe Véronneau at 2020-11-13T19:41:28-05:00
d/poms: use upstream's pom.xml.
- - - - -
1f8bb219 by Louis-Philippe Véronneau at 2020-11-13T19:41:28-05:00
d/control: update formatting, debhelper version and standards version.
- - - - -
f28ed76f by Louis-Philippe Véronneau at 2020-11-13T19:41:28-05:00
d/watch: update to version 4.
- - - - -
0181c563 by Louis-Philippe Véronneau at 2020-11-13T19:41:28-05:00
d/examples: install upstream examples.
- - - - -
23b43c57 by Louis-Philippe Véronneau at 2020-11-13T19:41:29-05:00
d/tests: add autopkgtests.
- - - - -
e8a9042a by Louis-Philippe Véronneau at 2020-11-13T19:41:29-05:00
d/copyright: add pollo's contributions.
- - - - -
17 changed files:
- debian/changelog
- − debian/compat
- debian/control
- debian/copyright
- − debian/footer.html
- − debian/header.html
- − debian/libcore-async-clojure.doc-base
- debian/libcore-async-clojure.docs
- + debian/libcore-async-clojure.examples
- debian/libcore-async-clojure.poms
- − debian/maven-meta/pom.properties
- − debian/maven-meta/pom.xml
- debian/rules
- + debian/tests/build
- + debian/tests/control
- + debian/tests/unittests
- debian/watch
Changes:
=====================================
debian/changelog
=====================================
@@ -2,6 +2,15 @@ core-async-clojure (1.3.610-1) UNRELEASED; urgency=medium
* New upstream release.
* New maintainer: pollo is taking over this package.
+ * Stop building the documentation.
+ * d/control: update the VCS urls.
+ * d/rules: remove java build parts, as there is no java code anymore.
+ * d/poms: use upstream's pom.xml.
+ * d/control: update formatting, debhelper version and standards version.
+ * d/watch: update to version 4.
+ * d/examples: install upstream examples.
+ * d/tests: add autopkgtests.
+ * d/copyright: add pollo's contributions.
-- Louis-Philippe Véronneau <pollo at debian.org> Fri, 13 Nov 2020 15:32:56 -0500
=====================================
debian/compat deleted
=====================================
@@ -1 +0,0 @@
-10
=====================================
debian/control
=====================================
@@ -3,17 +3,17 @@ Section: java
Priority: optional
Maintainer: Debian Clojure Maintainers <pkg-clojure-maintainers at lists.alioth.debian.org>
Uploaders: Louis-Philippe Véronneau <pollo at debian.org>
-Build-Depends: clojure (>= 1.8),
- debhelper (>= 10),
+Build-Depends: debhelper-compat (= 13),
+ javahelper,
+ maven-repo-helper,
+ clojure,
default-jdk,
- javahelper (>= 0.43),
- libtext-markdown-perl | markdown,
- libtools-analyzer-jvm-clojure (>= 0.7.0),
- maven-repo-helper (>= 1.7)
-Standards-Version: 4.0.0
-Vcs-Git: https://anonscm.debian.org/git/pkg-java/core-async-clojure.git
-Vcs-Browser: https://anonscm.debian.org/git/pkg-java/core-async-clojure.git
-Homepage: http://github.com/clojure/core.async
+ libtools-analyzer-jvm-clojure
+Standards-Version: 4.5.0
+Vcs-Git: https://salsa.debian.org/clojure-team/core-async-clojure.git
+Vcs-Browser: https://salsa.debian.org/clojure-team/core-async-clojure
+Homepage: https://github.com/clojure/core.async
+Rules-Requires-Root: no
Package: libcore-async-clojure
Architecture: all
=====================================
debian/copyright
=====================================
@@ -7,7 +7,8 @@ Copyright: Copyright (C) 2017 Rich Hickey and contributors
License: EPL-1.0
Files: debian/*
-Copyright: 2017 Apollon Oikonomopoulos <apoikos at debian.org)
+Copyright: 2017 Apollon Oikonomopoulos <apoikos at debian.org>
+ 2020, Louis-Philippe Véronneau <pollo at debian.org>
License: EPL-1.0
License: EPL-1.0
=====================================
debian/footer.html deleted
=====================================
@@ -1,2 +0,0 @@
-</body>
-</html>
\ No newline at end of file
=====================================
debian/header.html deleted
=====================================
@@ -1,6 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html>
-<head>
-<title>@TITLE@</title>
-</head>
-<body>
\ No newline at end of file
=====================================
debian/libcore-async-clojure.doc-base deleted
=====================================
@@ -1,13 +0,0 @@
-Document: core-async-clojure
-Title: core-async-clojure
-Author:
-Abstract: core-async-clojure readme
-Section: Programming
-
-Format: HTML
-Index: /usr/share/doc/libcore-async-clojure/html/README.html
-Files: /usr/share/doc/libcore-async-clojure/html/README.html
-
-Format: Text
-Index: /usr/share/doc/libcore-async-clojure/README.md.gz
-Files: /usr/share/doc/libcore-async-clojure/README.md.gz
=====================================
debian/libcore-async-clojure.docs
=====================================
@@ -1,2 +1 @@
-*.md
-doc/*
+README.md
=====================================
debian/libcore-async-clojure.examples
=====================================
@@ -0,0 +1,5 @@
+examples/ex-alts.clj
+examples/ex-altsgo.clj
+examples/ex-async.clj
+examples/ex-go.clj
+examples/walkthrough.clj
=====================================
debian/libcore-async-clojure.poms
=====================================
@@ -1 +1 @@
-debian/maven-meta/pom.xml --usj-name=core.async
+pom.xml --artifact=core.async.jar --usj-name=core.async
=====================================
debian/maven-meta/pom.properties deleted
=====================================
@@ -1,5 +0,0 @@
-#Generated by Maven
-#Wed Aug 08 06:38:33 CDT 2012
-version=0.2.395
-groupId=org.clojure
-artifactId=core.async
=====================================
debian/maven-meta/pom.xml deleted
=====================================
@@ -1,112 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <artifactId>pom.contrib</artifactId>
- <groupId>org.clojure</groupId>
- <version>0.1.2</version>
- <relativePath/>
- </parent>
- <groupId>org.clojure</groupId>
- <artifactId>core.async</artifactId>
- <packaging>jar</packaging>
- <version>0.1.0-SNAPSHOT</version>
- <name>core.async</name>
- <description>Facilities for async programming and communication in Clojure</description>
- <url>https://github.com/clojure/core.async</url>
- <licenses>
- <license>
- <name>Eclipse Public License</name>
- <url>http://www.eclipse.org/legal/epl-v10.html</url>
- </license>
- </licenses>
- <scm>
- <tag>cfd95c6814f5051136dcc8f974ddbfe7d028c109
-</tag>
- <url/>
- </scm>
- <build>
- <sourceDirectory>src/main/clojure</sourceDirectory>
- <testSourceDirectory>src/test/clojure</testSourceDirectory>
- <resources>
- <resource>
- <directory>resources</directory>
- </resource>
- </resources>
- <testResources>
- <testResource>
- <directory>resources</directory>
- </testResource>
- </testResources>
- <directory>target</directory>
- <outputDirectory>target/classes</outputDirectory>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>build-helper-maven-plugin</artifactId>
- <version>1.7</version>
- <executions>
- <execution>
- <id>add-source</id>
- <phase>generate-sources</phase>
- <goals>
- <goal>add-source</goal>
- </goals>
- <configuration>
- <sources>
- <source>src/main/java</source>
- </sources>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- <repositories>
- <repository>
- <id>central</id>
- <url>https://repo1.maven.org/maven2/</url>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- <releases>
- <enabled>true</enabled>
- </releases>
- </repository>
- <repository>
- <id>clojars</id>
- <url>https://clojars.org/repo/</url>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- <releases>
- <enabled>true</enabled>
- </releases>
- </repository>
- </repositories>
- <dependencyManagement>
- <dependencies/>
- </dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>org.clojure</groupId>
- <artifactId>clojure</artifactId>
- <version>1.7.0</version>
- </dependency>
- <dependency>
- <groupId>org.clojure</groupId>
- <artifactId>tools.analyzer.jvm</artifactId>
- <version>0.6.10</version>
- </dependency>
- <dependency>
- <groupId>org.clojure</groupId>
- <artifactId>clojurescript</artifactId>
- <version>1.7.170</version>
- <scope>provided</scope>
- </dependency>
- </dependencies>
-</project>
-
-<!-- This file was autogenerated by Leiningen.
- Please do not edit it directly; instead edit project.clj and regenerate it.
- It should not be considered canonical data. For more information see
- https://github.com/technomancy/leiningen -->
=====================================
debian/rules
=====================================
@@ -1,30 +1,19 @@
#!/usr/bin/make -f
include /usr/share/javahelper/java-vars.mk
-export JAVA_HOME=/usr/lib/jvm/default-java
-export CLASSPATH=/usr/share/java/clojure.jar:/usr/share/java/tools.analyzer.jvm.jar
-MDWN_DOCS = README.html
PRODUCED_JAR=core.async.jar
-NAMESPACE=org.clojure/core.async
-MAVEN_META=META-INF/maven/$(NAMESPACE)
+export CLASSPATH=/usr/share/java/clojure.jar:/usr/share/java/tools.analyzer.jvm.jar
%:
dh $@ --with javahelper,jh_maven_repo_helper
-override_jh_build: $(MDWN_DOCS)
- jh_build $(PRODUCED_JAR) src/main/java
- jar uf $(PRODUCED_JAR) -C src/main/clojure .
- mkdir -p $(CURDIR)/doc/html && mv $(CURDIR)/README.html $(CURDIR)/doc/html
- mkdir -p $(CURDIR)/meta/$(MAVEN_META)
- cp $(CURDIR)/debian/maven-meta/* $(CURDIR)/meta/$(MAVEN_META)
- jar uf $(PRODUCED_JAR) -C meta/ META-INF
+override_jh_build:
+ jar cf $(PRODUCED_JAR) -C src/main/clojure .
override_jh_clean:
jh_clean
rm -f $(CURDIR)/$(PRODUCED_JAR)
- rm -rf $(CURDIR)/doc/html
- rm -rf $(CURDIR)/meta
override_jh_classpath:
jh_classpath $(PRODUCED_JAR)
@@ -33,9 +22,3 @@ override_dh_auto_test:
dh_auto_test
(cd src/test/clojure && find . -name '*.clj' | \
xargs clojure -cp $(CLASSPATH):$(CURDIR)/$(PRODUCED_JAR))
-
-%.html:%.md
- cat debian/header.html > $@
- sed -i'' -e 's/@TITLE@/$(shell head -n 1 $< | sed 's/^#*\s*//')/g' $@
- markdown $< >> $@
- cat debian/footer.html >> $@
=====================================
debian/tests/build
=====================================
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+CLASSPATH=/usr/share/java/clojure.jar:/usr/share/java/tools.analyzer.jvm.jar:/usr/share/java/core.async.jar
+
+clojure -cp $CLASSPATH -e '(use '"'"'clojure.core.async)'
=====================================
debian/tests/control
=====================================
@@ -0,0 +1,6 @@
+Tests: build
+Depends: @, clojure
+Restrictions: allow-stderr, superficial
+
+Tests: unittests
+Depends: @, clojure
=====================================
debian/tests/unittests
=====================================
@@ -0,0 +1,9 @@
+#!/bin/sh
+set -efu
+
+CLASSPATH=/usr/share/java/clojure.jar:/usr/share/java/tools.analyzer.jvm.jar:/usr/share/java/core.async.jar
+
+cp -a src/test/clojure "$AUTOPKGTEST_TMP/test"
+cd "$AUTOPKGTEST_TMP"
+
+find . -name "*.clj" | xargs clojure -cp $CLASSPATH
=====================================
debian/watch
=====================================
@@ -1,2 +1,2 @@
-version=3
-https://github.com/clojure/core.async/tags .*[-/]{1}(\d[\d\.]+)\.tar\.gz
+version=4
+ https://github.com/clojure/core.async/tags .*[-/]{1}(\d[\d\.]+)\.tar\.gz
View it on GitLab: https://salsa.debian.org/clojure-team/core-async-clojure/-/compare/98fce9109047b38958cb9868d07eb318adccd2cc...e8a9042abb23070c516713992fab65053023d29f
--
View it on GitLab: https://salsa.debian.org/clojure-team/core-async-clojure/-/compare/98fce9109047b38958cb9868d07eb318adccd2cc...e8a9042abb23070c516713992fab65053023d29f
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/20201114/21683197/attachment.html>
More information about the pkg-java-commits
mailing list