[Git][java-team/naga][master] 13 commits: UPdating years in d/copyright

Pierre Gruet (@pgt) gitlab at salsa.debian.org
Sun Oct 16 14:37:22 BST 2022



Pierre Gruet pushed to branch master at Debian Java Maintainers / naga


Commits:
ce4b74ed by Pierre Gruet at 2022-10-16T13:46:43+02:00
UPdating years in d/copyright

- - - - -
b282a629 by Pierre Gruet at 2022-10-16T13:47:48+02:00
Depending on debhelper-compat 13, dropping old d/compat file

- - - - -
2f3abcc8 by Pierre Gruet at 2022-10-16T13:49:21+02:00
Rules-Requires-Root: no

- - - - -
723163f7 by Pierre Gruet at 2022-10-16T13:50:53+02:00
Marking the -java package as Multi-Arch: foreign

- - - - -
22262da0 by Pierre Gruet at 2022-10-16T13:51:17+02:00
Raising Standards version to 4.6.1

- - - - -
4ea33326 by Pierre Gruet at 2022-10-16T13:55:46+02:00
B-D on default-jdk-headless is enough

- - - - -
567e0d95 by Pierre Gruet at 2022-10-16T13:59:54+02:00
Updating changelog

- - - - -
7f3d8b71 by Pierre Gruet at 2022-10-16T14:16:51+02:00
Refreshing homepage URI

- - - - -
8dce3d51 by Pierre Gruet at 2022-10-16T14:19:22+02:00
Adding a d/watch file to document the archived upstream web page

- - - - -
e0d32d47 by Pierre Gruet at 2022-10-16T14:21:39+02:00
Adding a header to the build number incrementation patch

- - - - -
f7470506 by Pierre Gruet at 2022-10-16T14:39:58+02:00
Installing Maven artifacts using maven_repo_helper

- - - - -
bbf32b8b by Pierre Gruet at 2022-10-16T14:40:38+02:00
Updating changelog

- - - - -
2aaf1edb by Pierre Gruet at 2022-10-16T14:40:49+02:00
Upload to unstable

- - - - -


10 changed files:

- debian/changelog
- − debian/compat
- debian/control
- debian/copyright
- − debian/libnaga-java.jlibs
- + debian/libnaga-java.poms
- debian/patches/dont-increment-build-number.patch
- + debian/pom.xml.in
- debian/rules
- + debian/watch


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,19 @@
+naga (3.0+svn80-5) unstable; urgency=medium
+
+  * Team upload
+  * Depending on debhelper-compat 13, dropping old d/compat file
+  * Updating years in d/copyright
+  * Raising Standards version to 4.6.1:
+    - Rules-Requires-Root: no
+  * Installing Maven artifacts using maven_repo_helper
+  * Marking the -java package as Multi-Arch: foreign
+  * Build-depending on default-jdk-headless as headed classes are not needed
+  * Refreshing homepage URI
+  * Adding a d/watch file to document the archived upstream web page
+  * Adding a header to the build number incrementation patch
+
+ -- Pierre Gruet <pgt at debian.org>  Sun, 16 Oct 2022 14:40:40 +0200
+
 naga (3.0+svn80-4) unstable; urgency=medium
 
   * Team upload.


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


=====================================
debian/control
=====================================
@@ -7,16 +7,19 @@ Uploaders:
  Ximin Luo <infinity0 at debian.org>
 Build-Depends:
  ant,
- debhelper (>= 11),
- default-jdk,
- javahelper
-Standards-Version: 4.4.0
+ debhelper-compat (= 13),
+ default-jdk-headless,
+ javahelper,
+ maven-repo-helper
+Standards-Version: 4.6.1
 Vcs-Browser: https://salsa.debian.org/java-team/naga
 Vcs-Git: https://salsa.debian.org/java-team/naga.git
-Homepage: https://code.google.com/p/naga/
+Homepage: https://code.google.com/archive/p/naga/
+Rules-Requires-Root: no
 
 Package: libnaga-java
 Architecture: all
+Multi-Arch: foreign
 Depends: ${misc:Depends}, ${java:Depends}
 Description: Simplified Java NIO asynchronous sockets
  Naga aims to be a very small NIO library that provides a handful of java


=====================================
debian/copyright
=====================================
@@ -1,9 +1,9 @@
 Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: Naga
-Source: https://code.google.com/p/naga/
+Source: https://code.google.com/archive/p/naga/
 
 Files: *
-Copyright: 2008-2011 Christoffer Lerno
+Copyright: 2008-2012 Christoffer Lerno
 License: Expat
 
 Files: debian/*


=====================================
debian/libnaga-java.jlibs deleted
=====================================
@@ -1 +0,0 @@
-_DIST/naga-3_0.jar


=====================================
debian/libnaga-java.poms
=====================================
@@ -0,0 +1,28 @@
+# 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/pom.xml --java-lib --artifact=_DIST/naga-3*.jar


=====================================
debian/patches/dont-increment-build-number.patch
=====================================
@@ -1,3 +1,7 @@
+Description: don't rely on some increasing build number
+Forwarded: not-needed
+Last-Update: 2022-10-16
+
 --- a/build.xml
 +++ b/build.xml
 @@ -63,7 +63,6 @@


=====================================
debian/pom.xml.in
=====================================
@@ -0,0 +1,21 @@
+<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/maven-v4_0_0.xsd">
+
+  <modelVersion>4.0.0</modelVersion>
+
+  <groupId>com.google.code</groupId>
+  <artifactId>naga</artifactId>
+  <version>@version@</version>
+ 
+  <packaging>jar</packaging>
+  <name>naga</name>
+  <description>Simplified Java NIO asynchronous sockets</description>
+  <url>https://code.google.com/archive/p/naga/</url>
+
+  <licenses>
+    <license>
+      <name>Expat</name>
+    </license>
+  </licenses>
+</project>


=====================================
debian/rules
=====================================
@@ -1,7 +1,14 @@
 #!/usr/bin/make -f
 
+include /usr/share/dpkg/pkg-info.mk
+
 %:
-	dh $@ --with javahelper
+	dh $@ --with javahelper,maven_repo_helper
 
 override_dh_auto_clean:
 	rm -rf _BUILD _DIST
+	-rm debian/pom.xml
+
+execute_before_mh_install:
+	# Putting the version number into our provided pom.xml file.
+	sed 's/@version@/$(DEB_VERSION_UPSTREAM)/' debian/pom.xml.in > debian/pom.xml


=====================================
debian/watch
=====================================
@@ -0,0 +1,5 @@
+version=4
+
+# The page for this code is now archived.
+opts=dversionmangle=s/.*/0.No-Track/ \
+https://people.debian.org/~eriberto/ FakeWatchNoUpstreamTrackingForThisPackage-(\d\S+)\.gz



View it on GitLab: https://salsa.debian.org/java-team/naga/-/compare/e69c15d6906057fe9d61db4336418479db16800a...2aaf1edbbca8561f2529d9ea96f0c8667a0a1457

-- 
View it on GitLab: https://salsa.debian.org/java-team/naga/-/compare/e69c15d6906057fe9d61db4336418479db16800a...2aaf1edbbca8561f2529d9ea96f0c8667a0a1457
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/20221016/92c6c44d/attachment.htm>


More information about the pkg-java-commits mailing list