[Git][java-team/jutils][master] 8 commits: Wrap and sort

Emmanuel Bourg gitlab at salsa.debian.org
Sun Jun 7 13:24:23 BST 2020 


Emmanuel Bourg pushed to branch master at Debian Java Maintainers / jutils


Commits:
8cc00a76 by Emmanuel Bourg at 2020-06-07T11:26:13+02:00
Wrap and sort

- - - - -
5d06bc62 by Emmanuel Bourg at 2020-06-07T11:27:31+02:00
Standards-Version updated to 4.5.0

- - - - -
36137ed8 by Emmanuel Bourg at 2020-06-07T11:28:11+02:00
Switch to debhelper level 12

- - - - -
136b0402 by Emmanuel Bourg at 2020-06-07T11:28:19+02:00
Use salsa.debian.org Vcs-* URLs

- - - - -
e21ab674 by Emmanuel Bourg at 2020-06-07T11:49:01+02:00
Removed the -doc package

- - - - -
c3b00742 by Emmanuel Bourg at 2020-06-07T11:54:23+02:00
Install the Maven artifacts

- - - - -
293933c1 by Emmanuel Bourg at 2020-06-07T12:26:29+02:00
Added a watch file

- - - - -
fd5d32fe by Emmanuel Bourg at 2020-06-07T12:26:33+02:00
Upload to unstable

- - - - -


10 changed files:

- debian/changelog
- − debian/compat
- debian/control
- debian/copyright
- − debian/libjutils-java-doc.javadoc
- − debian/libjutils-java.jlibs
- + debian/libjutils-java.poms
- + debian/pom.xml
- debian/rules
- + debian/watch


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,15 @@
+jutils (20100502+dfsg-5) unstable; urgency=medium
+
+  * Team upload
+  * Install the Maven artifacts
+  * Added a watch file
+  * Removed the -doc package
+  * Standards-Version updated to 4.5.0
+  * Switch to debhelper level 12
+  * Use salsa.debian.org Vcs-* URLs
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Sun, 07 Jun 2020 11:54:29 +0200
+
 jutils (20100502+dfsg-4) unstable; urgency=medium
 
   * Update Source: in debian/copyright


=====================================
debian/compat deleted
=====================================
@@ -1 +0,0 @@
-10


=====================================
debian/control
=====================================
@@ -3,30 +3,20 @@ Section: java
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: tony mancill <tmancill at debian.org>
-Build-Depends: debhelper (>= 10), javahelper (>= 0.29), ant
-Build-Depends-Indep: default-jdk, default-jdk-doc
-Standards-Version: 4.0.0
-Vcs-Git: https://anonscm.debian.org/git/pkg-java/jutils.git/
-Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/jutils.git/
+Build-Depends:
+ ant,
+ debhelper-compat (= 12),
+ default-jdk,
+ maven-repo-helper
+Standards-Version: 4.5.0
+Vcs-Git: https://salsa.debian.org/java-team/jutils.git
+Vcs-Browser: https://salsa.debian.org/java-team/jutils
 Homepage: https://java.net/projects/jutils
 
 Package: libjutils-java
 Architecture: all
-Depends: ${java:Depends}, ${misc:Depends}
-Description: Common utilities for Java Game Technology Group projects
- The JUtils Project hosts an implementation of a set of APIs utilized
- by other Java Game Technology Group projects (eg. JInput, JOAl,
- JOGL).
-
-Package: libjutils-java-doc
-Architecture: all
-Section: doc
 Depends: ${misc:Depends}
-Suggests: libjutils-java
-Recommends: default-jdk-doc
-Description: Common utilities for Java Game Technology Group projects (javadoc)
+Description: Common utilities for Java Game Technology Group projects
  The JUtils Project hosts an implementation of a set of APIs utilized
  by other Java Game Technology Group projects (eg. JInput, JOAl,
  JOGL).
- .
- This is the API documentation for jutils


=====================================
debian/copyright
=====================================
@@ -28,7 +28,7 @@ License: BSD-4-Clause
  ANY IMPLIED WARRANT OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE OR
  NON-INFRINGEMEN, ARE HEREBY EXCLUDED.  SUN MICROSYSTEMS, INC. ("SUN") AND
  ITS LICENSORS SHALL NOT BE LIABLE FOR ANY DAMAGES SUFFERED BY LICENSEE AS
- A RESULT OF USING, MODIFYING OR DESTRIBUTING THIS SOFTWARE OR ITS 
+ A RESULT OF USING, MODIFYING OR DESTRIBUTING THIS SOFTWARE OR ITS
  DERIVATIVES.  IN NO EVENT WILL SUN OR ITS LICENSORS BE LIABLE FOR ANY LOST
  REVENUE, PROFIT OR DATA, OR FOR DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL,
  INCIDENTAL OR PUNITIVE DAMAGES.  HOWEVER CAUSED AND REGARDLESS OF THE THEORY


=====================================
debian/libjutils-java-doc.javadoc deleted
=====================================
@@ -1 +0,0 @@
-apidocs


=====================================
debian/libjutils-java.jlibs deleted
=====================================
@@ -1 +0,0 @@
-bin/jutils.jar


=====================================
debian/libjutils-java.poms
=====================================
@@ -0,0 +1 @@
+debian/pom.xml --java-lib --artifact=bin/jutils.jar


=====================================
debian/pom.xml
=====================================
@@ -0,0 +1,99 @@
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+	<modelVersion>4.0.0</modelVersion>
+	<groupId>net.java.jutils</groupId>
+	<artifactId>jutils</artifactId>
+	<packaging>jar</packaging>
+	<name>Common utilities for the Game Technology Group</name>
+	<version>1.0.0</version>
+	<description>Common utilities for the Game Technology Group</description>
+	<url>http://java.net/projects/jutils</url>
+	<licenses>
+		<license>
+			<name>BSD</name>
+			<url>http://www.opensource.org/licenses/bsd-license.php</url>
+			<distribution>repo</distribution>
+		</license>
+	</licenses>
+	<developers>
+		<developer>
+			<id>Members</id>
+			<url>http://java.net/projects/jutils/members</url>
+		</developer>
+	</developers>
+	<scm>
+		<url>http://java.net/projects/jutils/sources/svn/show</url>
+		<connection>https://svn.java.net/svn/jutils~svn </connection>
+	</scm>
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-compiler-plugin</artifactId>
+				<configuration>
+					<source>1.4</source>
+					<target>1.4</target>
+					<encoding>UTF-8</encoding>
+				</configuration>
+			</plugin>
+			<plugin>
+				<artifactId>maven-resources-plugin</artifactId>
+				<configuration>
+					<encoding>UTF-8</encoding>
+				</configuration>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-source-plugin</artifactId>
+				<executions>
+					<execution>
+						<id>attach-sources</id>
+						<goals>
+							<goal>jar</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-javadoc-plugin</artifactId>
+				<executions>
+					<execution>
+						<id>attach-javadocs</id>
+						<goals>
+							<goal>jar</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+		</plugins>
+	</build>
+	<profiles>
+		<profile>
+			<id>release-sign-artifacts</id>
+			<activation>
+				<property>
+					<name>performRelease</name>
+					<value>true</value>
+				</property>
+			</activation>
+			<build>
+				<plugins>
+					<plugin>
+						<groupId>org.apache.maven.plugins</groupId>
+						<artifactId>maven-gpg-plugin</artifactId>
+						<version>1.1</version>
+						<executions>
+							<execution>
+								<id>sign-artifacts</id>
+								<phase>verify</phase>
+								<goals>
+									<goal>sign</goal>
+								</goals>
+							</execution>
+						</executions>
+					</plugin>
+				</plugins>
+			</build>
+		</profile>
+	</profiles>
+</project>
\ No newline at end of file


=====================================
debian/rules
=====================================
@@ -1,27 +1,4 @@
 #!/usr/bin/make -f
 
-NAME    := jutils
-VERSION := $(shell dpkg-parsechangelog| sed -n '/^Version/{s/Version: \(.*\)-[0-9]*$$/\1/;s/+dfsg//p}')
-CVSDATE := $(shell echo $(VERSION)|sed -n 's/\(....\)\(..\)\(..\)/\1-\2-\3/p')
-TMPDIR  := tmp-orig-tar
-TAR     := ../$(NAME)_$(VERSION)+dfsg.orig.tar.gz
-
-export JAVA_HOME=/usr/lib/jvm/default-java
-
 %:
-	dh $@ --with javahelper
-
-override_dh_auto_build:
-	ant all
-	ant javadoc
-
-override_dh_auto_clean:
-	dh_auto_clean
-
-get-orig-source:
-	-rm $(TAR)
-	cvs -d :pserver:guest at cvs.dev.java.net:/cvs export -D $(CVSDATE) -d $(TMPDIR) $(NAME)
-	echo "The following files will not be included in Debian tarball:"
-	cd $(TMPDIR) && find . \( -name '*.class' -o -name '*.jar' \) -print
-	cd $(TMPDIR) && ZIP=--best tar --exclude-vcs --exclude *.jar --exclude *.class -zcf $(TAR) .
-	rm -rf $(TMPDIR)
+	dh $@ --with maven-repo-helper


=====================================
debian/watch
=====================================
@@ -0,0 +1,3 @@
+version=4
+opts="dversionmangle=s/\+dfsg//;s/20100502/1.0.0/" \
+https://repo1.maven.org/maven2/net/java/jutils/jutils/(\d.*)/ jutils-(\d.*)-sources.jar



View it on GitLab: https://salsa.debian.org/java-team/jutils/-/compare/8fd907eee46304ae04b06cb28c6f89296e68f924...fd5d32fe666483a80cb79ef941c6bce7645490c2

-- 
View it on GitLab: https://salsa.debian.org/java-team/jutils/-/compare/8fd907eee46304ae04b06cb28c6f89296e68f924...fd5d32fe666483a80cb79ef941c6bce7645490c2
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/20200607/266e8063/attachment.html>

More information about the pkg-java-commits mailing list