[Git][clojure-team/medley-clojure][master] 12 commits: d/watch: switch to git mode
Jérôme Charaoui (@lavamind)
gitlab at salsa.debian.org
Thu Feb 2 18:12:28 GMT 2023
Jérôme Charaoui pushed to branch master at Debian Clojure Maintainers / medley-clojure
Commits:
589f5a59 by Jérôme Charaoui at 2023-02-02T11:45:34-05:00
d/watch: switch to git mode
- - - - -
1d0e50bc by Jérôme Charaoui at 2023-02-02T11:58:43-05:00
Update d/changelog
- - - - -
8a40e109 by Jérôme Charaoui at 2023-02-02T11:59:20-05:00
switch to leiningen build system
- - - - -
237ceeed by Jérôme Charaoui at 2023-02-02T12:41:58-05:00
d/control: bump debhelper compat to 13
- - - - -
87719315 by Jérôme Charaoui at 2023-02-02T12:42:04-05:00
d/control: bump Standards-Version, no changes needed
- - - - -
59a4932d by Jérôme Charaoui at 2023-02-02T12:42:04-05:00
d/control: add Rules-Requires-Root: no
- - - - -
ac64b0b3 by Jérôme Charaoui at 2023-02-02T12:42:05-05:00
d/copyright: add myself to debian/* copyright
- - - - -
94233096 by Jérôme Charaoui at 2023-02-02T12:42:05-05:00
d/patches: add patch to fix clojure 1.11 warnings
- - - - -
3febda54 by Jérôme Charaoui at 2023-02-02T12:59:48-05:00
d/tests: add autopkgtests
- - - - -
c67ec8b6 by Jérôme Charaoui at 2023-02-02T12:59:51-05:00
run wrap-and-sort -bastk
- - - - -
55845a43 by Jérôme Charaoui at 2023-02-02T12:59:53-05:00
d/control: flag rhino with nocheck
Gbp-Dch: ignore
- - - - -
81d565e6 by Jérôme Charaoui at 2023-02-02T12:59:53-05:00
Update changelog for 1.0.0-2 release
- - - - -
18 changed files:
- debian/changelog
- − debian/compat
- debian/control
- debian/copyright
- − debian/footer.html
- − debian/header.html
- debian/libmedley-clojure.docs
- − debian/libmedley-clojure.jlibs
- debian/libmedley-clojure.poms
- + debian/patches/0001-Lein-Local.patch
- + debian/patches/0002-Exclude-abs-to-fix-Clojure-1.11-warnings.patch
- + debian/patches/series
- − debian/pom.xml
- debian/rules
- + debian/tests/build
- + debian/tests/control
- + debian/tests/upstream
- debian/watch
Changes:
=====================================
debian/changelog
=====================================
@@ -1,9 +1,22 @@
-medley-clojure (1.0.0-2) UNRELEASED; urgency=normal
+medley-clojure (1.0.0-2) unstable; urgency=medium
+
+ * Team upload.
[ Louis-Philippe Véronneau ]
* d/control: Migrate to the Clojure Team.
- -- Louis-Philippe Véronneau <pollo at debian.org> Sat, 08 Jan 2022 17:53:42 -0500
+ [ Jérôme Charaoui ]
+ * switch to leiningen build system
+ * d/watch: switch to git mode
+ * d/control: bump debhelper compat to 13
+ * d/control: bump Standards-Version, no changes needed
+ * d/control: add Rules-Requires-Root: no
+ * d/copyright: add myself to debian/* copyright
+ * d/patches: add patch to fix clojure 1.11 warnings
+ * d/tests: add autopkgtests
+ * run wrap-and-sort -bastk
+
+ -- Jérôme Charaoui <jerome at riseup.net> Thu, 02 Feb 2023 12:40:59 -0500
medley-clojure (1.0.0-1) unstable; urgency=medium
=====================================
debian/compat deleted
=====================================
@@ -1 +0,0 @@
-10
=====================================
debian/control
=====================================
@@ -2,25 +2,28 @@ Source: medley-clojure
Section: java
Priority: optional
Maintainer: Debian Clojure Maintainers <team+clojure at tracker.debian.org>
-Uploaders: Apollon Oikonomopoulos <apoikos at debian.org>
+Uploaders:
+ Apollon Oikonomopoulos <apoikos at debian.org>,
Build-Depends:
- debhelper (>= 10),
+ debhelper-compat (= 13),
+ default-jdk,
javahelper (>= 0.32),
+ leiningen,
+ librhino-java <!nocheck>,
maven-repo-helper (>= 1.7),
- clojure (>= 1.7),
- libtext-markdown-perl | markdown,
- default-jdk
-Standards-Version: 4.0.0
+Standards-Version: 4.6.2
Vcs-Git: https://salsa.debian.org/clojure-team/medley-clojure.git
Vcs-Browser: https://salsa.debian.org/clojure-team/medley-clojure
Homepage: https://github.com/weavejester/medley
+Rules-Requires-Root: no
Package: libmedley-clojure
Architecture: all
Depends:
${java:Depends},
- ${misc:Depends}
-Recommends: ${java:Recommends}
+ ${misc:Depends},
+Recommends:
+ ${java:Recommends},
Description: Clojure/ClojureScript utility library
Medley is a lightweight Clojure/ClojureScript library of useful,
mostly pure functions that are "missing" from clojure.core.
=====================================
debian/copyright
=====================================
@@ -227,7 +227,8 @@ License: EPL-1
a jury trial in any resulting litigation.
Files: debian/*
-Copyright: 2017 Apollon Oikonomopoulos <apoikos at debian.org>
+Copyright: 2023 Jérôme Charaoui <jerome at riseup.net>,
+ 2017 Apollon Oikonomopoulos <apoikos at debian.org>
License: GPL-2+
This package is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
=====================================
debian/footer.html deleted
=====================================
@@ -1,2 +0,0 @@
-</body>
-</html>
=====================================
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>
=====================================
debian/libmedley-clojure.docs
=====================================
@@ -1 +1 @@
-*.md
+README.md
=====================================
debian/libmedley-clojure.jlibs deleted
=====================================
@@ -1 +0,0 @@
-medley.jar
=====================================
debian/libmedley-clojure.poms
=====================================
@@ -1 +1 @@
-debian/pom.xml --usj-name=medley
+debian/pom.xml --java-lib --artifact=target/medley.jar --usj-name=medley
=====================================
debian/patches/0001-Lein-Local.patch
=====================================
@@ -0,0 +1,43 @@
+From: =?utf-8?b?SsOpcsO0bWUgQ2hhcmFvdWk=?= <jerome at riseup.net>
+Date: Thu, 2 Feb 2023 11:49:39 -0500
+Subject: Lein Local
+
+Patch project.clj to build locally using leiningen.
+
+Also removes criterium which isn't packaged in Debian.
+
+Forwarded: not-needed
+---
+ project.clj | 14 +++++---------
+ 1 file changed, 5 insertions(+), 9 deletions(-)
+
+diff --git a/project.clj b/project.clj
+index ea93d91..4157c85 100644
+--- a/project.clj
++++ b/project.clj
+@@ -3,10 +3,7 @@
+ :url "https://github.com/weavejester/medley"
+ :license {:name "Eclipse Public License"
+ :url "http://www.eclipse.org/legal/epl-v10.html"}
+- :dependencies [[org.clojure/clojure "1.7.0"]]
+- :plugins [[lein-codox "0.10.3"]
+- [lein-cljsbuild "1.1.2"]
+- [lein-doo "0.1.6"]]
++ :dependencies [[org.clojure/clojure "1.x"]]
+ :codox
+ {:output-path "codox"
+ :metadata {:doc/format :markdown}
+@@ -25,9 +22,8 @@
+ "test-clj" ["with-profile" "default:+1.8:+1.9" "test"]
+ "test-all" ["do" ["test-clj"] ["test-cljs"]]}
+ :profiles
+- {:provided {:dependencies [[org.clojure/clojurescript "1.7.228"]]}
+- :test {:dependencies [[org.mozilla/rhino "1.7.7"]]}
+- :dev {:dependencies [[criterium "0.4.3"]]
+- :jvm-opts ^:replace {}}
++ {:test {:dependencies [[org.mozilla/rhino "debian"]]}
++ :dev {:jvm-opts ^:replace {}}
+ :1.8 {:dependencies [[org.clojure/clojure "1.8.0"]]}
+- :1.9 {:dependencies [[org.clojure/clojure "1.9.0-alpha15"]]}})
++ :1.9 {:dependencies [[org.clojure/clojure "1.9.0-alpha15"]]}}
++ :local-repo "debian/maven-repo")
=====================================
debian/patches/0002-Exclude-abs-to-fix-Clojure-1.11-warnings.patch
=====================================
@@ -0,0 +1,25 @@
+From: =?utf-8?b?SsOpcsO0bWUgQ2hhcmFvdWk=?= <jerome at riseup.net>
+Date: Thu, 2 Feb 2023 12:30:36 -0500
+Subject: Exclude abs to fix Clojure 1.11 warnings
+
+Adapt patch from upstream to silence new warnings since clojure 1.11
+entered Debian.
+
+Origin: upstream, https://github.com/weavejester/medley/commit/00d6117660ead2d78506d4f4068b9309490fa09b
+---
+ src/medley/core.cljc | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/medley/core.cljc b/src/medley/core.cljc
+index 8849d0a..1a74fc7 100644
+--- a/src/medley/core.cljc
++++ b/src/medley/core.cljc
+@@ -1,7 +1,7 @@
+ (ns medley.core
+ "A small collection of useful, mostly pure functions that might not look out
+ of place in the clojure.core namespace."
+- (:refer-clojure :exclude [boolean? ex-cause ex-message uuid uuid? random-uuid]))
++ (:refer-clojure :exclude [abs boolean? ex-cause ex-message uuid uuid? random-uuid]))
+
+ (defn find-first
+ "Finds the first item in a collection that matches a predicate."
=====================================
debian/patches/series
=====================================
@@ -0,0 +1,2 @@
+0001-Lein-Local.patch
+0002-Exclude-abs-to-fix-Clojure-1.11-warnings.patch
=====================================
debian/pom.xml deleted
=====================================
@@ -1,93 +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>medley</groupId>
- <artifactId>medley</artifactId>
- <packaging>jar</packaging>
- <version>1.0.0</version>
- <name>medley</name>
- <description>A lightweight library of useful, mostly pure functions</description>
- <url>https://github.com/weavejester/medley</url>
- <licenses>
- <license>
- <name>Eclipse Public License</name>
- <url>http://www.eclipse.org/legal/epl-v10.html</url>
- </license>
- </licenses>
- <scm>
- <tag>86be4d1626ea24736d15a1d58bdaa64f49808fde
-</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.7.0</version>
- </dependency>
- <dependency>
- <groupId>org.clojure</groupId>
- <artifactId>clojurescript</artifactId>
- <version>1.7.228</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>criterium</groupId>
- <artifactId>criterium</artifactId>
- <version>0.4.3</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.mozilla</groupId>
- <artifactId>rhino</artifactId>
- <version>1.7.7</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/rules
=====================================
@@ -1,31 +1,31 @@
#!/usr/bin/make -f
+include /usr/share/dpkg/pkg-info.mk
include /usr/share/javahelper/java-vars.mk
-MDWN_DOCS = $(patsubst %.md,%.html,$(wildcard $(CURDIR)/*.md))
-
-PRODUCED_JAR=medley.jar
-export CLASSPATH=/usr/share/java/clojure.jar
+export LEIN_HOME=$(CURDIR)/.lein
+export LEIN_OFFLINE=true
+NAME=medley
%:
- dh $@ --with javahelper --with jh_maven_repo_helper
-
-override_jh_build: $(MDWN_DOCS)
- jar cf $(PRODUCED_JAR) -C src .
- mkdir -p $(CURDIR)/doc/html && mv $(CURDIR)/*.html $(CURDIR)/doc/html
+ dh $@ --with javahelper --with maven_repo_helper
-override_jh_clean:
- jh_clean
- rm -f $(CURDIR)/$(PRODUCED_JAR)
- rm -rf $(CURDIR)/doc/html
+override_dh_auto_configure:
+ cd debian && ln -sf /usr/share/maven-repo .
-%.html:%.md
- cat debian/header.html > $@
- sed -i'' -e 's#@TITLE@#$(shell head -n 1 $< | sed 's/^#*\s*//')#g' $@
- markdown $< >> $@
- cat debian/footer.html >> $@
+override_dh_auto_build:
+ lein pom debian/pom.xml
+ lein jar
+ # symlinks so we don't need a version in debian/*.poms
+ cd target && ln -sf $(NAME)-$(DEB_VERSION_UPSTREAM).jar $(NAME).jar
override_dh_auto_test:
- dh_auto_test
- (cd test && find . -name "*.cljc" | \
- xargs clojure -cp $(CURDIR)/$(PRODUCED_JAR):$(CLASSPATH))
+ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
+ lein test
+endif
+
+override_dh_clean:
+ rm -f debian/maven-repo
+ rm -Rf target
+ rm -f debian/pom.xml
+ dh_clean
=====================================
debian/tests/build
=====================================
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+CLASSPATH=/usr/share/java/clojure.jar:/usr/share/java/medley.jar
+
+clojure -cp $CLASSPATH -e '(use '"'"'medley.core)'
=====================================
debian/tests/control
=====================================
@@ -0,0 +1,11 @@
+Tests: build
+Depends:
+ clojure,
+ @,
+Restrictions: superficial, allow-stderr
+
+Tests: upstream
+Depends:
+ clojure,
+ libbultitude-clojure,
+ @,
=====================================
debian/tests/upstream
=====================================
@@ -0,0 +1,15 @@
+#!/bin/sh
+set -efu
+
+CLASSPATH=/usr/share/java/clojure.jar:/usr/share/java/bultitude.jar:/usr/share/java/medley.jar:test
+
+cp -a test "$AUTOPKGTEST_TMP"
+cd "$AUTOPKGTEST_TMP"
+
+clojure \
+ -cp $CLASSPATH \
+ -e "(require '[clojure.test])" \
+ -e "(require '[bultitude.core :as b])" \
+ -e '(def all-tests (b/namespaces-on-classpath :classpath "test"))' \
+ -e "(map #(require %) all-tests)" \
+ -e '(System/exit (if (clojure.test/successful? (clojure.test/run-all-tests #"medley\.\S+-test")) 0 1))'
=====================================
debian/watch
=====================================
@@ -1,2 +1,4 @@
-version=3
-https://github.com/weavejester/medley/releases .*/archive/([\d.]+).tar.gz
+version=4
+opts="mode=git" \
+https://github.com/weavejester/medley.git \
+refs/tags/@ANY_VERSION@
View it on GitLab: https://salsa.debian.org/clojure-team/medley-clojure/-/compare/84d049a316e4fc0f995052bcb13b39b49c068188...81d565e64496f7e4d720c6c268fcb207c00516c0
--
View it on GitLab: https://salsa.debian.org/clojure-team/medley-clojure/-/compare/84d049a316e4fc0f995052bcb13b39b49c068188...81d565e64496f7e4d720c6c268fcb207c00516c0
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/20230202/f3197b05/attachment.htm>
More information about the pkg-java-commits
mailing list