[Git][java-team/libokhttp-java][master] 7 commits: Fixing the clean target

[Pierre Gruet (@pgt)]

Pierre Gruet pushed to branch master at Debian Java Maintainers / libokhttp-java


Commits:
d9ca7b08 by Pierre Gruet at 2023-10-24T22:30:28+02:00
Fixing the clean target

- - - - -
730a8b33 by Pierre Gruet at 2023-10-24T22:58:34+02:00
Building the logging-interceptor artifact, which is needed by other projects

- - - - -
695e8365 by Pierre Gruet at 2023-10-24T22:59:14+02:00
Raising Standards version to 4.6.2 (R-R-R: no)

- - - - -
32164ae8 by Pierre Gruet at 2023-10-24T23:03:09+02:00
Fixing d/watch, raising its version to 4

- - - - -
73c1e817 by Pierre Gruet at 2023-10-24T23:04:17+02:00
Marking the patches as Forwarded: not-needed

- - - - -
d4c3cc0a by Pierre Gruet at 2023-10-24T23:05:33+02:00
Updating changelog

- - - - -
5b0b6b8f by Pierre Gruet at 2023-10-24T23:05:45+02:00
Upload to unstable

- - - - -


8 changed files:

- debian/changelog
- debian/control
- debian/libokhttp-java.poms
- debian/patches/no-Conscrypt.patch
- debian/patches/no-android.patch
- debian/patches/no-javac-with-errorprone.patch
- debian/rules
- debian/watch


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,16 @@
+libokhttp-java (3.13.1-4) unstable; urgency=medium
+
+  * Team upload
+  * Building the logging-interceptor artifact, which is needed by other
+    projects
+  * Fixing the clean target (Closes: #1048295)
+  * Raising Standards version to 4.6.2:
+    - Setting Rules-Requires-Root: no
+  * Fixing d/watch, raising its version to 4
+  * Marking the patches as Forwarded: not-needed
+
+ -- Pierre Gruet <pgt at debian.org>  Tue, 24 Oct 2023 23:05:35 +0200
+
 libokhttp-java (3.13.1-3) unstable; urgency=medium
 
   * Enable okhttp-urlconnection and okhttp-tls module.


=====================================
debian/control
=====================================
@@ -13,10 +13,11 @@ Build-Depends:
  libbcprov-java,
  libokio-java (>= 1.14.0),
  maven-debian-helper (>= 2.1)
-Standards-Version: 4.6.0
+Standards-Version: 4.6.2
 Vcs-Git: https://salsa.debian.org/java-team/libokhttp-java.git
 Vcs-Browser: https://salsa.debian.org/java-team/libokhttp-java
 Homepage: https://github.com/square/okhttp
+Rules-Requires-Root: no
 
 Package: libokhttp-java
 Architecture: all


=====================================
debian/libokhttp-java.poms
=====================================
@@ -32,7 +32,7 @@ okhttp-android-support/pom.xml --ignore
 okhttp-apache/pom.xml --ignore
 okhttp-testing-support/pom.xml --ignore
 okhttp-urlconnection/pom.xml
-okhttp-logging-interceptor/pom.xml --ignore
+okhttp-logging-interceptor/pom.xml
 okhttp-tls/pom.xml
 okhttp-dnsoverhttps/pom.xml --ignore
 okhttp-sse/pom.xml --ignore


=====================================
debian/patches/no-Conscrypt.patch
=====================================
@@ -1,6 +1,7 @@
 From: Markus Koschany <apo at debian.org>
 Date: Sun, 10 Feb 2019 11:03:45 +0100
 Subject: no Conscrypt
+Forwarded: not-needed
 
 ---
  .../internal/platform/ConscryptPlatform.java       | 122 ---------------------


=====================================
debian/patches/no-android.patch
=====================================
@@ -1,6 +1,7 @@
 From: Markus Koschany <apo at debian.org>
 Date: Sun, 10 Feb 2019 11:04:58 +0100
 Subject: no android
+Forwarded: not-needed
 
 Disable Android support.
 ---


=====================================
debian/patches/no-javac-with-errorprone.patch
=====================================
@@ -1,6 +1,7 @@
 From: Markus Koschany <apo at debian.org>
 Date: Sun, 10 Feb 2019 11:03:28 +0100
 Subject: no-javac-with-errorprone
+Forwarded: not-needed
 
 ---
  pom.xml | 2 +-


=====================================
debian/rules
=====================================
@@ -5,6 +5,11 @@ include /usr/share/dpkg/pkg-info.mk
 %:
 	dh $@ --with javahelper
 
+override_dh_clean:
+	# Removing out generated Version.java file in okhttp3
+	-rm $(CURDIR)/okhttp/src/main/java/okhttp3/internal/Version.java
+	dh_clean
+
 override_dh_auto_build:
 	# Workaround for not automatically generated Version.java file
 	sed -e \


=====================================
debian/watch
=====================================
@@ -1,2 +1,4 @@
-version=3
-https://github.com/square/okhttp/tags .*/(?:.*?)([\d\.]+)\.tar\.gz
+version=4
+
+opts="filenamemangle=s%(?:.*?)?v?@ANY_VERSION@(@ARCHIVE_EXT@)%@PACKAGE$-$1$2%" \
+ https://github.com/square/okhttp/tags (?:.*?/)parent- at ANY_VERSION@@ARCHIVE_EXT@



View it on GitLab: https://salsa.debian.org/java-team/libokhttp-java/-/compare/403322b00a5ad19da09274200e2c205985c8ed72...5b0b6b8ff7ed5fc1a0b12967c29a1cf0ae122ccc

-- 
View it on GitLab: https://salsa.debian.org/java-team/libokhttp-java/-/compare/403322b00a5ad19da09274200e2c205985c8ed72...5b0b6b8ff7ed5fc1a0b12967c29a1cf0ae122ccc
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/20231025/2a937e1f/attachment.htm>