Commit 65029f0257e4f77db985019e2c3a544573dd0e6c - comidi-clojure

+1

-0

debian/.gitignore less more

!pom.xml

+14

-0

debian/changelog less more

	0	comidi-clojure (0.3.1-2) unstable; urgency=medium
	1
	2	* Add prospective upstream patch (issues/36, pull/37) to fix spec
	3	conformance issues following the upgrade to Clojure 1.9+, fixing
	4	the FTBFS due to test failures (Closes: #889125).
	5	* Update Vcs-{Browser,Git} to point to salsa (alioth's replacement).
	6
	7	-- Cyril Brulebois <kibi@debian.org> Thu, 07 Feb 2019 13:58:55 +0100
	8
	9	comidi-clojure (0.3.1-1) unstable; urgency=medium
	10
	11	* Initial release (Closes: #855765)
	12
	13	-- Apollon Oikonomopoulos <apoikos@debian.org> Sat, 05 Aug 2017 13:02:02 -0400

+1

-0

debian/compat less more

0

10

+37

-0

debian/control less more

	0	Source: comidi-clojure
	1	Section: java
	2	Priority: optional
	3	Maintainer: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org>
	4	Uploaders: Apollon Oikonomopoulos <apoikos@debian.org>
	5	Build-Depends:
	6	debhelper (>= 10),
	7	javahelper (>= 0.32),
	8	maven-repo-helper (>= 1.7),
	9	clojure (>= 1.8),
	10	libclj-time-clojure (>= 0.10.0),
	11	libbidi-clojure (>= 1.23.1),
	12	libcompojure-clojure (>= 1.4.0),
	13	libprismatic-schema-clojure (>= 1.0.4),
	14	libkitchensink-clojure (>= 1.1.0),
	15	libtext-markdown-perl \| markdown,
	16	default-jdk-headless
	17	Standards-Version: 4.0.0
	18	Vcs-Git: https://salsa.debian.org/java-team/comidi-clojure.git
	19	Vcs-Browser: https://salsa.debian.org/java-team/comidi-clojure
	20	Homepage: https://github.com/puppetlabs/comidi
	21
	22	Package: libcomidi-clojure
	23	Architecture: all
	24	Depends:
	25	${java:Depends},
	26	${misc:Depends}
	27	Recommends: ${java:Recommends}
	28	Description: HTTP route definitions for Clojure
	29	Comidi is a library containing utility functions and compojure-like
	30	syntax-sugar wrappers around the bidi web routing library.
	31	It aims to provide a way to define your web routes that takes advantage of the
	32	strengths of both bidi and compojure:
	33	.
	34	* Route definitions are simple, composable and introspectable data structures.
	35	* Helper functions / macros for defining routes still provide the nice syntax
	36	of compojure

+27

-0

debian/copyright less more

	0	Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
	1	Upstream-Name: comidi
	2	Source: https://github.com/puppetlabs/comidi
	3
	4	Files: *
	5	Copyright: (C) 2005-2015 Puppet Labs Inc
	6	License: Apache-2.0
	7
	8	Files: debian/*
	9	Copyright: 2017 Apollon Oikonomopoulos <apoikos@debian.org>
	10	License: Apache-2.0
	11
	12	License: Apache-2.0
	13	Licensed under the Apache License, Version 2.0 (the "License");
	14	you may not use this file except in compliance with the License.
	15	You may obtain a copy of the License at
	16	.
	17	http://www.apache.org/licenses/LICENSE-2.0
	18	.
	19	Unless required by applicable law or agreed to in writing, software
	20	distributed under the License is distributed on an "AS IS" BASIS,
	21	WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
	22	See the License for the specific language governing permissions and
	23	limitations under the License.
	24	.
	25	On Debian systems, the complete text of the Apache License 2.0 can
	26	be found in "/usr/share/common-licenses/Apache-2.0"

+2

-0

debian/footer.html less more

	0	</body>
	1	</html>

+6

-0

debian/header.html less more

	0	<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
	1	<html>
	2	<head>
	3	<title>@TITLE@</title>
	4	</head>
	5	<body>

+1

-0

debian/libcomidi-clojure.docs less more

0

*.md

+1

-0

debian/libcomidi-clojure.jlibs less more

0

comidi.jar

+1

-0

debian/libcomidi-clojure.poms less more

0

debian/pom.xml --usj-name=comidi

+37

-0

debian/patches/0001-Fix-test-failure-with-Clojure-1.9.patch less more

	0	From feed07ec54e9d68e3bf52dd1f1a56138d8fd0eab Mon Sep 17 00:00:00 2001
	1	From: Cyril Brulebois <kibi@debian.org>
	2	Date: Wed, 2 Jan 2019 04:34:31 +0100
	3	Subject: [PATCH] Fix test failure with Clojure 1.9+
	4	MIME-Version: 1.0
	5	Content-Type: text/plain; charset=UTF-8
	6	Content-Transfer-Encoding: 8bit
	7
	8	Quoting the Clojure documentation:
	9
	10	Use :require in the ns macro in preference to calling this directly.
	11
	12	As kindly pointed out by Alex Miller (@puredanger), the “require” syntax
	13	happened to work accidentally in Clojure 1.8, but that's now rejected by
	14	Clojure 1.9+ with:
	15
	16	Call to clojure.core/ns did not conform to spec: […] Extra input
	17
	18	Debian bug report: https://bugs.debian.org/889125
	19	---
	20	test/puppetlabs/comidi_test.clj \| 2 +-
	21	1 file changed, 1 insertion(+), 1 deletion(-)
	22
	23	diff --git a/test/puppetlabs/comidi_test.clj b/test/puppetlabs/comidi_test.clj
	24	index 0b3a53a..4d0e064 100644
	25	--- a/test/puppetlabs/comidi_test.clj
	26	+++ b/test/puppetlabs/comidi_test.clj
	27	@@ -1,5 +1,5 @@
	28	(ns puppetlabs.comidi-test
	29	- (require [clojure.test :refer :all]
	30	+ (:require [clojure.test :refer :all]
	31	[puppetlabs.comidi :as comidi :refer :all]
	32	[schema.test :as schema-test]
	33	[schema.core :as schema]
	34	--
	35	2.11.0
	36

+1

-0

debian/patches/series less more

0

0001-Fix-test-failure-with-Clojure-1.9.patch

+100

-0

debian/pom.xml less more

	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">
	1	<modelVersion>4.0.0</modelVersion>
	2	<groupId>puppetlabs</groupId>
	3	<artifactId>comidi</artifactId>
	4	<packaging>jar</packaging>
	5	<version>0.3.1</version>
	6	<name>comidi</name>
	7	<description>Puppet Labs utility functions and compojure-like wrappers for use with the bidi web routing library</description>
	8	<url>https://github.com/puppetlabs/comidi</url>
	9	<scm>
	10	<tag>57a87f68aa328c6442f141bb5250399e2571ecbe
	11	</tag>
	12	<url/>
	13	</scm>
	14	<build>
	15	<sourceDirectory>src</sourceDirectory>
	16	<testSourceDirectory>test</testSourceDirectory>
	17	<resources>
	18	<resource>
	19	<directory>resources</directory>
	20	</resource>
	21	</resources>
	22	<testResources>
	23	<testResource>
	24	<directory>resources</directory>
	25	</testResource>
	26	</testResources>
	27	<directory>target</directory>
	28	<outputDirectory>target/classes</outputDirectory>
	29	<plugins/>
	30	</build>
	31	<repositories>
	32	<repository>
	33	<id>central</id>
	34	<url>https://repo1.maven.org/maven2/</url>
	35	<snapshots>
	36	<enabled>false</enabled>
	37	</snapshots>
	38	<releases>
	39	<enabled>true</enabled>
	40	</releases>
	41	</repository>
	42	<repository>
	43	<id>clojars</id>
	44	<url>https://clojars.org/repo/</url>
	45	<snapshots>
	46	<enabled>true</enabled>
	47	</snapshots>
	48	<releases>
	49	<enabled>true</enabled>
	50	</releases>
	51	</repository>
	52	</repositories>
	53	<dependencyManagement>
	54	<dependencies/>
	55	</dependencyManagement>
	56	<dependencies>
	57	<dependency>
	58	<groupId>org.clojure</groupId>
	59	<artifactId>clojure</artifactId>
	60	<version>1.7.0</version>
	61	</dependency>
	62	<dependency>
	63	<groupId>clj-time</groupId>
	64	<artifactId>clj-time</artifactId>
	65	<version>0.10.0</version>
	66	</dependency>
	67	<dependency>
	68	<groupId>bidi</groupId>
	69	<artifactId>bidi</artifactId>
	70	<version>1.23.1</version>
	71	<exclusions>
	72	<exclusion>
	73	<groupId>org.clojure</groupId>
	74	<artifactId>clojurescript</artifactId>
	75	</exclusion>
	76	</exclusions>
	77	</dependency>
	78	<dependency>
	79	<groupId>compojure</groupId>
	80	<artifactId>compojure</artifactId>
	81	<version>1.4.0</version>
	82	</dependency>
	83	<dependency>
	84	<groupId>prismatic</groupId>
	85	<artifactId>schema</artifactId>
	86	<version>1.0.4</version>
	87	</dependency>
	88	<dependency>
	89	<groupId>puppetlabs</groupId>
	90	<artifactId>kitchensink</artifactId>
	91	<version>1.1.0</version>
	92	</dependency>
	93	</dependencies>
	94	</project>
	95
	96	<!-- This file was autogenerated by Leiningen.
	97	Please do not edit it directly; instead edit project.clj and regenerate it.
	98	It should not be considered canonical data. For more information see
	99	https://github.com/technomancy/leiningen -->

+34

-0

debian/rules less more

	0	#!/usr/bin/make -f
	1
	2	include /usr/share/javahelper/java-vars.mk
	3
	4	MDWN_DOCS = $(patsubst %.md,%.html,$(wildcard $(CURDIR)/*.md))
	5
	6	PRODUCED_JAR=comidi.jar
	7	export CLASSPATH=/usr/share/java/clojure.jar:/usr/share/java/clj-time.jar:/usr/share/java/bidi.jar:/usr/share/java/compojure.jar:/usr/share/java/prismatic-schema.jar:/usr/share/java/kitchensink.jar
	8
	9	%:
	10	dh $@ --with javahelper --with jh_maven_repo_helper
	11
	12	override_jh_build: $(MDWN_DOCS)
	13	jar cf $(PRODUCED_JAR) -C src .
	14	mkdir -p $(CURDIR)/doc/html && mv $(CURDIR)/*.html $(CURDIR)/doc/html
	15
	16	override_jh_classpath:
	17	jh_classpath $(PRODUCED_JAR)
	18
	19	override_jh_clean:
	20	jh_clean
	21	rm -f $(CURDIR)/$(PRODUCED_JAR)
	22	rm -rf $(CURDIR)/doc/html
	23
	24	%.html:%.md
	25	cat debian/header.html > $@
	26	sed -i'' -e 's#@TITLE@#$(shell head -n 1 $< \| sed 's/^#\s//')#g' $@
	27	markdown $< >> $@
	28	cat debian/footer.html >> $@
	29
	30	override_dh_auto_test:
	31	dh_auto_test
	32	(cd test && find . -name "*.clj" \| \
	33	xargs --verbose clojure -cp $(CURDIR)/$(PRODUCED_JAR):$(CLASSPATH))

+1

-0

debian/source/format less more

0

3.0 (quilt)

+3

-0

debian/watch less more

	0	version=4
	1	opts=filenamemangle=s!./archive/(.)!comidi-$1! \
	2	https://github.com/puppetlabs/comidi/releases .*/archive/([\d.]+)\.tar\.gz