[Git][clojure-team/ring-clojure][debian/main] 4 commits: Rebuild using leiningen.
Louis-Philippe Véronneau
gitlab at salsa.debian.org
Tue Dec 22 19:01:07 GMT 2020
Louis-Philippe Véronneau pushed to branch debian/main at Debian Clojure Maintainers / ring-clojure
Commits:
01151a91 by Louis-Philippe Véronneau at 2020-12-22T13:48:22-05:00
Rebuild using leiningen.
- - - - -
17f33d5f by Louis-Philippe Véronneau at 2020-12-22T13:48:27-05:00
d/watch: update to v4 and use git mode.
- - - - -
d77c0520 by Louis-Philippe Véronneau at 2020-12-22T13:48:27-05:00
d/tests: add autopkgtests.
- - - - -
83790629 by Louis-Philippe Véronneau at 2020-12-22T13:51:04-05:00
Release 1.6.2-4 to unstable
- - - - -
28 changed files:
- debian/changelog
- debian/control
- − debian/core.pom.xml
- − debian/jetty-adapter.pom.xml
- debian/libring-core-clojure.classpath
- debian/libring-core-clojure.jlibs
- debian/libring-core-clojure.poms
- debian/libring-jetty-adapter-clojure.classpath
- debian/libring-jetty-adapter-clojure.jlibs
- debian/libring-jetty-adapter-clojure.poms
- debian/libring-servlet-clojure.classpath
- debian/libring-servlet-clojure.jlibs
- debian/libring-servlet-clojure.poms
- − debian/maven.rules
- + debian/patches/0001_Lein_Local_Core.patch
- + debian/patches/0002_Lein_Local_Servlet.patch
- + debian/patches/0003_Lein_Local_Jetty.patch
- + debian/patches/series
- debian/rules
- − debian/servlet.pom.xml
- + debian/tests/build-core
- + debian/tests/build-jetty
- + debian/tests/build-servlet
- + debian/tests/control
- + debian/tests/unittests-core
- + debian/tests/unittests-jetty
- + debian/tests/unittests-servlet
- debian/watch
Changes:
=====================================
debian/changelog
=====================================
@@ -1,3 +1,12 @@
+ring-clojure (1.6.2-4) unstable; urgency=medium
+
+ * Team upload.
+ * Rebuild using leiningen.
+ * d/watch: update to v4 and use git mode.
+ * d/tests: add autopkgtests.
+
+ -- Louis-Philippe Véronneau <pollo at debian.org> Tue, 22 Dec 2020 13:50:37 -0500
+
ring-clojure (1.6.2-3) unstable; urgency=medium
* Team upload.
=====================================
debian/control
=====================================
@@ -3,20 +3,25 @@ Section: java
Priority: optional
Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
Uploaders: Apollon Oikonomopoulos <apoikos at debian.org>
-Build-Depends: clojure (>= 1.8),
- debhelper-compat (= 13),
+Build-Depends: debhelper-compat (= 13),
default-jdk,
- javahelper (>= 0.32),
- libring-codec-clojure,
+ javahelper,
+ maven-repo-helper,
+ libclojure-java,
+ libring-codec-clojure (>= 1.1.2),
libcommons-io-java,
libcommons-fileupload-java,
- libclj-http-clojure,
- libclj-time-clojure,
- libcrypto-random-clojure,
- libcrypto-equality-clojure,
+ libclj-time-clojure (>= 0.15.2),
+ libcrypto-random-clojure (>= 1.2.1),
+ libcrypto-equality-clojure (>= 1.0.0-2),
+ libring-core-clojure (>= 1.6.2-3),
+ libservlet-api-java,
+ libring-servlet-clojure,
libjetty9-java,
- markdown,
- maven-repo-helper (>= 1.5~)
+ libclj-http-clojure,
+ libnrepl-clojure <!nocheck>,
+ libcomplete-clojure <!nocheck>,
+ leiningen,
Standards-Version: 4.5.1
Vcs-Git: https://salsa.debian.org/java-team/ring-clojure.git
Vcs-Browser: https://salsa.debian.org/java-team/ring-clojure
@@ -25,7 +30,15 @@ Rules-Requires-Root: no
Package: libring-core-clojure
Architecture: all
-Depends: ${java:Depends}, ${misc:Depends}
+Depends: ${java:Depends},
+ ${misc:Depends},
+ libclojure-java,
+ libring-codec-clojure,
+ libcommons-io-java,
+ libcommons-fileupload-java,
+ libclj-time-clojure,
+ libcrypto-random-clojure,
+ libcrypto-equality-clojure,
Recommends: ${java:Recommends}
Description: Clojure web applications library
Ring is a Clojure web applications library inspired by Python's WSGI
@@ -52,7 +65,10 @@ Description: Clojure web applications library
Package: libring-servlet-clojure
Architecture: all
-Depends: ${java:Depends}, ${misc:Depends}
+Depends: ${java:Depends},
+ ${misc:Depends},
+ libring-core-clojure,
+ libservlet-api-java,
Recommends: ${java:Recommends}
Description: Clojure web applications library - servlet utilities
Ring is a Clojure web applications library inspired by Python's WSGI
@@ -65,7 +81,12 @@ Description: Clojure web applications library - servlet utilities
Package: libring-jetty-adapter-clojure
Architecture: all
-Depends: ${java:Depends}, ${misc:Depends}
+Depends: ${java:Depends},
+ ${misc:Depends},
+ libring-core-clojure,
+ libring-servlet-clojure,
+ libjetty9-java,
+ libclj-http-clojure,
Recommends: ${java:Recommends}
Description: Clojure web applications library - Jetty adapter
Ring is a Clojure web applications library inspired by Python's WSGI
=====================================
debian/core.pom.xml deleted
=====================================
@@ -1,111 +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>
- <groupId>ring</groupId>
- <artifactId>ring-core</artifactId>
- <packaging>jar</packaging>
- <version>1.6.2</version>
- <name>ring-core</name>
- <description>Ring core libraries.</description>
- <url>https://github.com/ring-clojure/ring</url>
- <licenses>
- <license>
- <name>The MIT License</name>
- <url>http://opensource.org/licenses/MIT</url>
- </license>
- </licenses>
- <scm>
- <tag>86237baaca7b17c2aa284ced054eb3785cd943a1
-</tag>
- <url/>
- </scm>
- <build>
- <sourceDirectory>src</sourceDirectory>
- <testSourceDirectory>test</testSourceDirectory>
- <resources>
- <resource>
- <directory>resources</directory>
- </resource>
- </resources>
- <testResources>
- <testResource>
- <directory>resources</directory>
- </testResource>
- </testResources>
- <directory>target</directory>
- <outputDirectory>target/classes</outputDirectory>
- <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.5.1</version>
- </dependency>
- <dependency>
- <groupId>ring</groupId>
- <artifactId>ring-codec</artifactId>
- <version>1.0.1</version>
- </dependency>
- <dependency>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
- <version>2.5</version>
- </dependency>
- <dependency>
- <groupId>commons-fileupload</groupId>
- <artifactId>commons-fileupload</artifactId>
- <version>1.3.2</version>
- </dependency>
- <dependency>
- <groupId>clj-time</groupId>
- <artifactId>clj-time</artifactId>
- <version>0.11.0</version>
- </dependency>
- <dependency>
- <groupId>crypto-random</groupId>
- <artifactId>crypto-random</artifactId>
- <version>1.2.0</version>
- </dependency>
- <dependency>
- <groupId>crypto-equality</groupId>
- <artifactId>crypto-equality</artifactId>
- <version>1.0.0</version>
- </dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>2.5</version>
- <scope>test</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/jetty-adapter.pom.xml deleted
=====================================
@@ -1,96 +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>
- <groupId>ring</groupId>
- <artifactId>ring-jetty-adapter</artifactId>
- <packaging>jar</packaging>
- <version>1.6.2</version>
- <name>ring-jetty-adapter</name>
- <description>Ring Jetty adapter.</description>
- <url>https://github.com/ring-clojure/ring</url>
- <licenses>
- <license>
- <name>The MIT License</name>
- <url>http://opensource.org/licenses/MIT</url>
- </license>
- </licenses>
- <scm>
- <tag>86237baaca7b17c2aa284ced054eb3785cd943a1
-</tag>
- <url/>
- </scm>
- <build>
- <sourceDirectory>src</sourceDirectory>
- <testSourceDirectory>test</testSourceDirectory>
- <resources>
- <resource>
- <directory>resources</directory>
- </resource>
- </resources>
- <testResources>
- <testResource>
- <directory>resources</directory>
- </testResource>
- </testResources>
- <directory>target</directory>
- <outputDirectory>target/classes</outputDirectory>
- <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.5.1</version>
- </dependency>
- <dependency>
- <groupId>ring</groupId>
- <artifactId>ring-core</artifactId>
- <version>1.6.2</version>
- </dependency>
- <dependency>
- <groupId>ring</groupId>
- <artifactId>ring-servlet</artifactId>
- <version>1.6.2</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-server</artifactId>
- <version>9.2.21.v20170120</version>
- </dependency>
- <dependency>
- <groupId>clj-http</groupId>
- <artifactId>clj-http</artifactId>
- <version>2.2.0</version>
- <scope>test</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/libring-core-clojure.classpath
=====================================
@@ -1 +1 @@
-usr/share/java/ring-core.jar /usr/share/java/clojure.jar /usr/share/java/tools.reader.jar /usr/share/java/ring-codec.jar /usr/share/java/commons-io.jar /usr/share/java/commons-fileupload.jar /usr/share/java/clj-time.jar /usr/share/java/crypto-random.jar /usr/share/java/crypto-equality.jar
+usr/share/java/ring-core.jar /usr/share/java/clojure.jar /usr/share/java/ring-codec.jar /usr/share/java/commons-io.jar /usr/share/java/commons-fileupload.jar /usr/share/java/clj-time.jar /usr/share/java/crypto-random.jar /usr/share/java/crypto-equality.jar
=====================================
debian/libring-core-clojure.jlibs
=====================================
@@ -1 +1 @@
-ring-core.jar
+ring-core/target/ring-core.jar
=====================================
debian/libring-core-clojure.poms
=====================================
@@ -1,28 +1 @@
-# List of POM files for the package
-# Format of this file is:
-# <path to pom file> [option]*
-# where option can be:
-# --ignore: ignore this POM and its artifact if any
-# --ignore-pom: don't install the POM. To use on POM files that are created
-# temporarily for certain artifacts such as Javadoc jars. [mh_install, mh_installpoms]
-# --no-parent: remove the <parent> tag from the POM
-# --package=<package>: an alternative package to use when installing this POM
-# and its artifact
-# --has-package-version: to indicate that the original version of the POM is the same as the upstream part
-# of the version for the package.
-# --keep-elements=<elem1,elem2>: a list of XML elements to keep in the POM
-# during a clean operation with mh_cleanpom or mh_installpom
-# --artifact=<path>: path to the build artifact associated with this POM,
-# it will be installed when using the command mh_install. [mh_install]
-# --java-lib: install the jar into /usr/share/java to comply with Debian
-# packaging guidelines
-# --usj-name=<name>: name to use when installing the library in /usr/share/java
-# --usj-version=<version>: version to use when installing the library in /usr/share/java
-# --no-usj-versionless: don't install the versionless link in /usr/share/java
-# --dest-jar=<path>: the destination for the real jar.
-# It will be installed with mh_install. [mh_install]
-# --classifier=<classifier>: Optional, the classifier for the jar. Empty by default.
-# --site-xml=<location>: Optional, the location for site.xml if it needs to be installed.
-# Empty by default. [mh_install]
-#
-debian/core.pom.xml --artifact=ring-core.jar --usj-name=ring-core
+debian/ring-core.pom.xml --artifact=ring-core/target/ring-core.jar --usj-name=ring-core
=====================================
debian/libring-jetty-adapter-clojure.classpath
=====================================
@@ -1 +1 @@
-usr/share/java/ring-jetty-adapter.jar /usr/share/java/clojure.jar /usr/share/java/ring-core.jar /usr/share/java/ring-servlet.jar /usr/share/java/jetty9-server.jar /usr/share/java/jetty9-util.jar /usr/share/java/jetty9-http.jar /usr/share/java/jetty9-io.jar
+usr/share/java/ring-jetty-adapter.jar /usr/share/java/clojure.jar /usr/share/java/ring-core.jar /usr/share/java/ring-servlet.jar /usr/share/java/jetty9-server.jar /usr/share/java/jetty9-util.jar /usr/share/java/jetty9-http.jar /usr/share/java/jetty9-io.jar /usr/share/java/clj-http.jar
=====================================
debian/libring-jetty-adapter-clojure.jlibs
=====================================
@@ -1 +1 @@
-ring-jetty-adapter.jar
+ring-jetty-adapter/target/ring-jetty-adapter.jar
=====================================
debian/libring-jetty-adapter-clojure.poms
=====================================
@@ -1,28 +1 @@
-# List of POM files for the package
-# Format of this file is:
-# <path to pom file> [option]*
-# where option can be:
-# --ignore: ignore this POM and its artifact if any
-# --ignore-pom: don't install the POM. To use on POM files that are created
-# temporarily for certain artifacts such as Javadoc jars. [mh_install, mh_installpoms]
-# --no-parent: remove the <parent> tag from the POM
-# --package=<package>: an alternative package to use when installing this POM
-# and its artifact
-# --has-package-version: to indicate that the original version of the POM is the same as the upstream part
-# of the version for the package.
-# --keep-elements=<elem1,elem2>: a list of XML elements to keep in the POM
-# during a clean operation with mh_cleanpom or mh_installpom
-# --artifact=<path>: path to the build artifact associated with this POM,
-# it will be installed when using the command mh_install. [mh_install]
-# --java-lib: install the jar into /usr/share/java to comply with Debian
-# packaging guidelines
-# --usj-name=<name>: name to use when installing the library in /usr/share/java
-# --usj-version=<version>: version to use when installing the library in /usr/share/java
-# --no-usj-versionless: don't install the versionless link in /usr/share/java
-# --dest-jar=<path>: the destination for the real jar.
-# It will be installed with mh_install. [mh_install]
-# --classifier=<classifier>: Optional, the classifier for the jar. Empty by default.
-# --site-xml=<location>: Optional, the location for site.xml if it needs to be installed.
-# Empty by default. [mh_install]
-#
-debian/jetty-adapter.pom.xml --artifact=ring-jetty-adapter.jar --usj-name=ring-jetty-adapter
+debian/ring-jetty-adapter.pom.xml --artifact=ring-jetty-adapter/target/ring-jetty-adapter.jar --usj-name=ring-jetty-adapter
=====================================
debian/libring-servlet-clojure.classpath
=====================================
@@ -1 +1 @@
-usr/share/java/ring-servlet.jar /usr/share/java/clojure.jar
+usr/share/java/ring-servlet.jar /usr/share/java/clojure.jar /usr/share/java/ring-core.jar /usr/share/java/servlet-api.jar
=====================================
debian/libring-servlet-clojure.jlibs
=====================================
@@ -1 +1 @@
-ring-servlet.jar
+ring-servlet/target/ring-servlet.jar
=====================================
debian/libring-servlet-clojure.poms
=====================================
@@ -1,28 +1 @@
-# List of POM files for the package
-# Format of this file is:
-# <path to pom file> [option]*
-# where option can be:
-# --ignore: ignore this POM and its artifact if any
-# --ignore-pom: don't install the POM. To use on POM files that are created
-# temporarily for certain artifacts such as Javadoc jars. [mh_install, mh_installpoms]
-# --no-parent: remove the <parent> tag from the POM
-# --package=<package>: an alternative package to use when installing this POM
-# and its artifact
-# --has-package-version: to indicate that the original version of the POM is the same as the upstream part
-# of the version for the package.
-# --keep-elements=<elem1,elem2>: a list of XML elements to keep in the POM
-# during a clean operation with mh_cleanpom or mh_installpom
-# --artifact=<path>: path to the build artifact associated with this POM,
-# it will be installed when using the command mh_install. [mh_install]
-# --java-lib: install the jar into /usr/share/java to comply with Debian
-# packaging guidelines
-# --usj-name=<name>: name to use when installing the library in /usr/share/java
-# --usj-version=<version>: version to use when installing the library in /usr/share/java
-# --no-usj-versionless: don't install the versionless link in /usr/share/java
-# --dest-jar=<path>: the destination for the real jar.
-# It will be installed with mh_install. [mh_install]
-# --classifier=<classifier>: Optional, the classifier for the jar. Empty by default.
-# --site-xml=<location>: Optional, the location for site.xml if it needs to be installed.
-# Empty by default. [mh_install]
-#
-debian/servlet.pom.xml --artifact=ring-servlet.jar --usj-name=ring-servlet
+debian/ring-servlet.pom.xml --artifact=ring-servlet/target/ring-servlet.jar --usj-name=ring-servlet
=====================================
debian/maven.rules deleted
=====================================
@@ -1 +0,0 @@
-* clojure * s/([0-9]+)\.([0-9]+).*/$1.$2.x/ * *
=====================================
debian/patches/0001_Lein_Local_Core.patch
=====================================
@@ -0,0 +1,34 @@
+Patch ring-core project.clj to build locally using lein.
+Index: ring-clojure/ring-core/project.clj
+===================================================================
+--- ring-clojure.orig/ring-core/project.clj
++++ ring-clojure/ring-core/project.clj
+@@ -4,17 +4,18 @@
+ :scm {:dir ".."}
+ :license {:name "The MIT License"
+ :url "http://opensource.org/licenses/MIT"}
+- :dependencies [[org.clojure/clojure "1.5.1"]
+- [ring/ring-codec "1.0.1"]
+- [commons-io "2.5"]
+- [commons-fileupload "1.3.2"]
+- [clj-time "0.11.0"]
+- [crypto-random "1.2.0"]
+- [crypto-equality "1.0.0"]]
++ :dependencies [[org.clojure/clojure "1.10.x"]
++ [ring/ring-codec "debian"]
++ [commons-io "debian"]
++ [commons-fileupload "debian"]
++ [clj-time "debian"]
++ [crypto-random "debian"]
++ [crypto-equality "debian"]]
+ :aliases {"test-all" ["with-profile" "default:+1.6:+1.7:+1.8" "test"]}
+ :profiles
+- {:provided {:dependencies [[javax.servlet/servlet-api "2.5"]]}
+- :dev {:dependencies [[javax.servlet/servlet-api "2.5"]]}
++ {:provided {:dependencies [[javax.servlet/servlet-api "debian"]]}
++ :dev {:dependencies [[javax.servlet/servlet-api "debian"]]}
+ :1.6 {:dependencies [[org.clojure/clojure "1.6.0"]]}
+ :1.7 {:dependencies [[org.clojure/clojure "1.7.0"]]}
+- :1.8 {:dependencies [[org.clojure/clojure "1.8.0"]]}})
++ :1.8 {:dependencies [[org.clojure/clojure "1.8.0"]]}}
++ :local-repo "../debian/maven-repo")
=====================================
debian/patches/0002_Lein_Local_Servlet.patch
=====================================
@@ -0,0 +1,24 @@
+Patch ring-servlet project.clj to build locally using lein.
+Index: ring-clojure/ring-servlet/project.clj
+===================================================================
+--- ring-clojure.orig/ring-servlet/project.clj
++++ ring-clojure/ring-servlet/project.clj
+@@ -4,12 +4,13 @@
+ :scm {:dir ".."}
+ :license {:name "The MIT License"
+ :url "http://opensource.org/licenses/MIT"}
+- :dependencies [[org.clojure/clojure "1.5.1"]
+- [ring/ring-core "1.6.2"]]
++ :dependencies [[org.clojure/clojure "1.10.x"]
++ [ring/ring-core "debian"]]
+ :aliases {"test-all" ["with-profile" "default:+1.6:+1.7:+1.8" "test"]}
+ :profiles
+- {:provided {:dependencies [[javax.servlet/javax.servlet-api "3.1.0"]]}
+- :dev {:dependencies [[javax.servlet/javax.servlet-api "3.1.0"]]}
++ {:provided {:dependencies [[javax.servlet/javax.servlet-api "debian"]]}
++ :dev {:dependencies [[javax.servlet/javax.servlet-api "debian"]]}
+ :1.6 {:dependencies [[org.clojure/clojure "1.6.0"]]}
+ :1.7 {:dependencies [[org.clojure/clojure "1.7.0"]]}
+- :1.8 {:dependencies [[org.clojure/clojure "1.8.0"]]}})
++ :1.8 {:dependencies [[org.clojure/clojure "1.8.0"]]}}
++ :local-repo "../debian/maven-repo")
=====================================
debian/patches/0003_Lein_Local_Jetty.patch
=====================================
@@ -0,0 +1,27 @@
+Patch jetty-adapter project.clj to build locally using lein.
+Index: ring-clojure/ring-jetty-adapter/project.clj
+===================================================================
+--- ring-clojure.orig/ring-jetty-adapter/project.clj
++++ ring-clojure/ring-jetty-adapter/project.clj
+@@ -4,14 +4,15 @@
+ :scm {:dir ".."}
+ :license {:name "The MIT License"
+ :url "http://opensource.org/licenses/MIT"}
+- :dependencies [[org.clojure/clojure "1.5.1"]
+- [ring/ring-core "1.6.2"]
+- [ring/ring-servlet "1.6.2"]
+- [org.eclipse.jetty/jetty-server "9.2.21.v20170120"]]
++ :dependencies [[org.clojure/clojure "1.10.x"]
++ [ring/ring-core "debian"]
++ [ring/ring-servlet "debian"]
++ [org.eclipse.jetty/jetty-server "9.x"]]
+ :aliases {"test-all" ["with-profile" "default:+1.6:+1.7:+1.8" "test"]}
+ :profiles
+- {:dev {:dependencies [[clj-http "2.2.0"]]
++ {:dev {:dependencies [[clj-http "debian"]]
+ :jvm-opts ["-Dorg.eclipse.jetty.server.HttpChannelState.DEFAULT_TIMEOUT=500"]}
+ :1.6 {:dependencies [[org.clojure/clojure "1.6.0"]]}
+ :1.7 {:dependencies [[org.clojure/clojure "1.7.0"]]}
+- :1.8 {:dependencies [[org.clojure/clojure "1.8.0"]]}})
++ :1.8 {:dependencies [[org.clojure/clojure "1.8.0"]]}}
++ :local-repo "../debian/maven-repo")
=====================================
debian/patches/series
=====================================
@@ -0,0 +1,3 @@
+0001_Lein_Local_Core.patch
+0002_Lein_Local_Servlet.patch
+0003_Lein_Local_Jetty.patch
=====================================
debian/rules
=====================================
@@ -1,36 +1,38 @@
#!/usr/bin/make -f
include /usr/share/javahelper/java-vars.mk
+include /usr/share/dpkg/pkg-info.mk
-CORE_CLASSPATH=$(shell cat debian/libring-core-clojure.classpath | cut -d ' ' -f 2- | sed 's/ /:/g')
-JETTY_CLASSPATH=$(shell cat debian/libring-jetty-adapter-clojure.classpath | cut -d ' ' -f 2- | sed 's/ /:/g')
-SERVLET_CLASSPATH=/usr/share/java/servlet-api-3.1.jar
+export LEIN_HOME=$(CURDIR)/.lein
+export LEIN_OFFLINE=true
+SUB_PROJECTS=ring-core ring-servlet ring-jetty-adapter
%:
dh $@ --with javahelper --with maven_repo_helper
-override_jh_build:
- jar cf ring-core.jar -C ring-core/src .
- jar cf ring-servlet.jar -C ring-servlet/src .
- jar cf ring-jetty-adapter.jar -C ring-jetty-adapter/src .
+override_dh_auto_configure:
+ cd debian && ln -sf /usr/share/maven-repo .
-# Work around jh_classpath not being able to handle multiple packages correctly
-override_jh_classpath:
- jh_classpath -plibring-core-clojure
- jh_classpath -plibring-servlet-clojure
- jh_classpath -plibring-jetty-adapter-clojure
+override_dh_auto_build:
+ for sub in $(SUB_PROJECTS) ; do \
+ cd $$sub; \
+ lein pom ../debian/$$sub.pom.xml; \
+ lein jar; \
+ cd target && ln -sf $$sub-$(DEB_VERSION_UPSTREAM).jar $$sub.jar; \
+ cd ../..; \
+ done
-# Sorting the filenames according to the C locale is sufficient to get a
-# successful run as of 1.6.2 but further updates might need to encode a
-# specific sequence instead (#918437):
override_dh_auto_test:
- find ring-core/test -name '*.clj' | LC_ALL=C sort | \
- xargs --verbose clojure -cp ring-core.jar:$(CORE_CLASSPATH)
- find ring-servlet/test -name '*.clj' | LC_ALL=C sort | \
- xargs --verbose clojure -cp ring-servlet.jar:ring-core.jar:$(SERVLET_CLASSPATH)
- find ring-jetty-adapter/test -name '*.clj' | LC_ALL=C sort | \
- xargs --verbose clojure -cp ring-jetty-adapter.jar:ring-servlet.jar:ring-core.jar:$(SERVLET_CLASSPATH):$(JETTY_CLASSPATH):/usr/share/java/clj-http.jar:/usr/share/java/commons-logging.jar
+ for sub in $(SUB_PROJECTS) ; do \
+ cd $$sub; \
+ lein test; \
+ cd ..; \
+ done
-override_jh_clean:
- jh_clean
- rm -f $(CURDIR)/*.jar
+override_dh_clean:
+ rm -f debian/maven-repo
+ for sub in $(SUB_PROJECTS) ; do \
+ rm -Rf $$sub/target; \
+ rm -f debian/$$sub.pom.xml; \
+ done
+ dh_clean
=====================================
debian/servlet.pom.xml deleted
=====================================
@@ -1,86 +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>
- <groupId>ring</groupId>
- <artifactId>ring-servlet</artifactId>
- <packaging>jar</packaging>
- <version>1.6.2</version>
- <name>ring-servlet</name>
- <description>Ring servlet utilities.</description>
- <url>https://github.com/ring-clojure/ring</url>
- <licenses>
- <license>
- <name>The MIT License</name>
- <url>http://opensource.org/licenses/MIT</url>
- </license>
- </licenses>
- <scm>
- <tag>86237baaca7b17c2aa284ced054eb3785cd943a1
-</tag>
- <url/>
- </scm>
- <build>
- <sourceDirectory>src</sourceDirectory>
- <testSourceDirectory>test</testSourceDirectory>
- <resources>
- <resource>
- <directory>resources</directory>
- </resource>
- </resources>
- <testResources>
- <testResource>
- <directory>resources</directory>
- </testResource>
- </testResources>
- <directory>target</directory>
- <outputDirectory>target/classes</outputDirectory>
- <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.5.1</version>
- </dependency>
- <dependency>
- <groupId>ring</groupId>
- <artifactId>ring-core</artifactId>
- <version>1.6.2</version>
- </dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>javax.servlet-api</artifactId>
- <version>3.1.0</version>
- <scope>test</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/tests/build-core
=====================================
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+CLASSPATH=/usr/share/java/clojure.jar:/usr/share/java/ring-codec.jar:/usr/share/java/commons-io.jar:/usr/share/java/commons-fileupload.jar:/usr/share/java/clj-time.jar:/usr/share/java/crypto-random.jar:/usr/share/java/crypto-equality.jar:/usr/share/java/ring-core.jar
+
+clojure -cp $CLASSPATH -e '(use '"'"'ring.core.protocols)'
=====================================
debian/tests/build-jetty
=====================================
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+CLASSPATH=/usr/share/java/clojure.jar:/usr/share/java/ring-core.jar:/usr/share/java/ring-servlet.jar:/usr/share/java/jetty9-server.jar:/usr/share/java/jetty9-util.jar:/usr/share/java/jetty9-http.jar:/usr/share/java/jetty9-io.jar:/usr/share/java/clj-http.jar:/usr/share/java/ring-jetty-adapter.jar
+
+clojure -cp $CLASSPATH -e '(use '"'"'ring.adapter.jetty)'
=====================================
debian/tests/build-servlet
=====================================
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+CLASSPATH=/usr/share/java/clojure.jar:/usr/share/java/ring-core.jar:/usr/share/java/servlet-api.jar:/usr/share/java/ring-servlet.jar
+
+clojure -cp $CLASSPATH -e '(use '"'"'ring.util.servlet)'
=====================================
debian/tests/control
=====================================
@@ -0,0 +1,21 @@
+Tests: build-core
+Depends: @, clojure
+Restrictions: superficial
+
+Tests: build-servlet
+Depends: @, clojure
+Restrictions: superficial
+
+Tests: build-jetty
+Depends: @, clojure
+Restrictions: superficial, allow-stderr
+
+Tests: unittests-core
+Depends: @, clojure
+
+Tests: unittests-servlet
+Depends: @, clojure
+
+Tests: unittests-jetty
+Depends: @, clojure
+Restrictions: allow-stderr
=====================================
debian/tests/unittests-core
=====================================
@@ -0,0 +1,9 @@
+#!/bin/sh
+set -efu
+
+CLASSPATH=/usr/share/java/clojure.jar:/usr/share/java/ring-codec.jar:/usr/share/java/commons-io.jar:/usr/share/java/commons-fileupload.jar:/usr/share/java/clj-time.jar:/usr/share/java/crypto-random.jar:/usr/share/java/crypto-equality.jar:/usr/share/java/ring-core.jar
+
+cp -a ring-core/test "$AUTOPKGTEST_TMP"
+cd "$AUTOPKGTEST_TMP"
+
+find . -name "*.clj" | xargs clojure -cp $CLASSPATH
=====================================
debian/tests/unittests-jetty
=====================================
@@ -0,0 +1,9 @@
+#!/bin/sh
+set -efu
+
+CLASSPATH=/usr/share/java/clojure.jar:/usr/share/java/ring-core.jar:/usr/share/java/ring-servlet.jar:/usr/share/java/jetty9-server.jar:/usr/share/java/jetty9-util.jar:/usr/share/java/jetty9-http.jar:/usr/share/java/jetty9-io.jar:/usr/share/java/clj-http.jar:/usr/share/java/ring-jetty-adapter.jar
+
+cp -a ring-jetty-adapter/test "$AUTOPKGTEST_TMP"
+cd "$AUTOPKGTEST_TMP"
+
+find . -name "*.clj" | xargs clojure -cp $CLASSPATH
=====================================
debian/tests/unittests-servlet
=====================================
@@ -0,0 +1,9 @@
+#!/bin/sh
+set -efu
+
+CLASSPATH=/usr/share/java/clojure.jar:/usr/share/java/ring-core.jar:/usr/share/java/servlet-api.jar:/usr/share/java/ring-servlet.jar
+
+cp -a ring-servlet/test "$AUTOPKGTEST_TMP"
+cd "$AUTOPKGTEST_TMP"
+
+find . -name "*.clj" | xargs clojure -cp $CLASSPATH
=====================================
debian/watch
=====================================
@@ -1,2 +1,4 @@
-version=3
-https://github.com/ring-clojure/ring/releases .*/archive/([\d.]+)\.tar\.gz
+version=4
+opts="mode=git" \
+https://github.com/ring-clojure/ring.git \
+refs/tags/([\d\.]+)
View it on GitLab: https://salsa.debian.org/clojure-team/ring-clojure/-/compare/82aca27a32b0135e059fbb36aae5e3eafa8da74e...83790629ffaf5b81bbb3662c1c5b0f549b1d11ec
--
View it on GitLab: https://salsa.debian.org/clojure-team/ring-clojure/-/compare/82aca27a32b0135e059fbb36aae5e3eafa8da74e...83790629ffaf5b81bbb3662c1c5b0f549b1d11ec
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/20201222/81fa4d7b/attachment.html>
More information about the pkg-java-commits
mailing list