Merge ~mateus-morais/ubuntu/+source/dotnet8:dotnet-debug-symbols into ubuntu/+source/dotnet8:ubuntu/devel

[Mateus Rodrigues de Morais]

This merge proposal adds:

- .NET managed debug symbols (.PBDs) as binary packages named *-dbg-8.0, to follow the convention recommended in the upstream documentation [1].

- Moves RID-specific runtime targeting packs to the dotnet-sdk-8.0 package, also as recommended by the upstream documentation (LP: #2046458) [2].

PPA for review: https://launchpad.net/~mateus-morais/+archive/ubuntu/dotnet8-debug-symbols

[1] https://learn.microsoft.com/en-us/dotnet/core/distribution-packaging#debug-packages
[2] https://learn.microsoft.com/en-us/dotnet/core/distribution-packaging#recommended-packages

[Julian Andres Klode (juliank)]

review: Approve

diff --git a/debian/aspnetcore-runtime-dbg-8.0.install.in b/debian/aspnetcore-runtime-dbg-8.0.install.in
new file mode 100644
index 0000000..d30661f
--- /dev/null
+++ b/debian/aspnetcore-runtime-dbg-8.0.install.in
@@ -0,0 +1 @@
+artifacts/debug-symbols/shared/Microsoft.AspNetCore.App/@major@.0.* @basedir@/shared/Microsoft.AspNetCore.App
diff --git a/debian/aspnetcore-targeting-pack-8.0.install.in b/debian/aspnetcore-targeting-pack-8.0.install.in
index adbdc26..0923d96 100644
--- a/debian/aspnetcore-targeting-pack-8.0.install.in
+++ b/debian/aspnetcore-targeting-pack-8.0.install.in
@@ -1,2 +1 @@
 @basedir@/packs/Microsoft.AspNetCore.App.Ref
-@basedir@/packs/Microsoft.AspNetCore.App.Runtime.@rid@-@arch@
diff --git a/debian/changelog b/debian/changelog
index bad0aa7..d0825ff 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+dotnet8 (8.0.101-8.0.1-0ubuntu2) noble; urgency=medium
+
+  * Added new binary packages for debug symbols.
+  * Moved RID-specific targeting packs to dotnet-sdk-8.0 binary package
+    per Microsoft documentation. (LP: #2046458)
+
+ -- Mateus Rodrigues de Morais <[e-mail]>  Wed, 17 Jan 2024 17:30:29 -0300
+
 dotnet8 (8.0.101-8.0.1-0ubuntu1) noble; urgency=medium
 
   * New upstream release
diff --git a/debian/control b/debian/control
index e718baf..1546eb3 100644
--- a/debian/control
+++ b/debian/control
@@ -184,3 +184,21 @@ Description: Internal - targeting pack for Microsoft.NETCore.App 8.0
  This package provides a targeting pack for Microsoft.NETCore.App 8.0
  that allows developers to compile against and target Microsoft.NETCore.App 8.0
  applications using the .NET SDK. This not meant for general use.
+
+Package: aspnetcore-runtime-dbg-8.0
+Architecture: amd64 arm64
+Depends: aspnetcore-runtime-8.0, ${misc:Depends}, ${shlibs:Depends}
+Description: ASP.NET Runtime debug symbols.
+ This package provides the PDB debug symbols for Microsoft.AspNetCore.App 8.0.
+
+Package: dotnet-runtime-dbg-8.0
+Architecture: amd64 arm64
+Depends: dotnet-runtime-8.0, ${misc:Depends}, ${shlibs:Depends}
+Description: .NET Runtime debug symbols.
+ This package provides the PDB debug symbols for Microsoft.NETCore.App 8.0.
+
+Package: dotnet-sdk-dbg-8.0
+Architecture: amd64 arm64
+Depends: dotnet-sdk-8.0, ${misc:Depends}, ${shlibs:Depends}
+Description: .NET SDK debug symbols.
+ This package provides the PDB debug symbols for the .NET 8.0 SDK.
diff --git a/debian/dotnet-runtime-dbg-8.0.install.in b/debian/dotnet-runtime-dbg-8.0.install.in
new file mode 100644
index 0000000..db3660b
--- /dev/null
+++ b/debian/dotnet-runtime-dbg-8.0.install.in
@@ -0,0 +1 @@
+artifacts/debug-symbols/shared/Microsoft.NETCore.App/@major@.0.* @basedir@/shared/Microsoft.NETCore.App
diff --git a/debian/dotnet-sdk-8.0.install.in b/debian/dotnet-sdk-8.0.install.in
index aebc001..3d12adc 100644
--- a/debian/dotnet-sdk-8.0.install.in
+++ b/debian/dotnet-sdk-8.0.install.in
@@ -1,3 +1,5 @@
 @basedir@/metadata
 @basedir@/sdk-manifests/@major@.0.*
 @basedir@/sdk/@major@.0.*
+@basedir@/packs/Microsoft.NETCore.App.Runtime.@rid@-@arch@
+@basedir@/packs/Microsoft.AspNetCore.App.Runtime.@rid@-@arch@
diff --git a/debian/dotnet-sdk-dbg-8.0.install.in b/debian/dotnet-sdk-dbg-8.0.install.in
new file mode 100644
index 0000000..3244f46
--- /dev/null
+++ b/debian/dotnet-sdk-dbg-8.0.install.in
@@ -0,0 +1,2 @@
+artifacts/debug-symbols/sdk/@major@.0.* @basedir@/sdk
+artifacts/debug-symbols/packs @basedir@
diff --git a/debian/dotnet-targeting-pack-8.0.install.in b/debian/dotnet-targeting-pack-8.0.install.in
index 00ad479..42e9d2b 100644
--- a/debian/dotnet-targeting-pack-8.0.install.in
+++ b/debian/dotnet-targeting-pack-8.0.install.in
@@ -1,2 +1 @@
 @basedir@/packs/Microsoft.NETCore.App.Ref
-@basedir@/packs/Microsoft.NETCore.App.Runtime.@rid@-@arch@
diff --git a/debian/rules b/debian/rules
index 142df90..9601df6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -104,6 +104,9 @@ override_dh_gencontrol:
 	dh_gencontrol -pdotnet-targeting-pack-8.0 -- -v$(_FULL_RUNTIME_VERSION)
 	dh_gencontrol -pdotnet-templates-8.0 -- -v$(_FULL_SDK_VERSION)
 	dh_gencontrol -pnetstandard-targeting-pack-2.1-8.0 -- -v$(_FULL_SDK_VERSION)
+	dh_gencontrol -paspnetcore-runtime-dbg-8.0 -- -v$(_FULL_RUNTIME_VERSION)
+	dh_gencontrol -pdotnet-runtime-dbg-8.0 -- -v$(_FULL_RUNTIME_VERSION)
+	dh_gencontrol -pdotnet-sdk-dbg-8.0 -- -v$(_FULL_SDK_VERSION)
 
 override_dh_install:
 
@@ -111,6 +114,9 @@ override_dh_install:
 	install -dm 0755 $(DESTDIR)/$(DOTNETETCDIR)
 	ls artifacts/$(_RUNTIME_ARCH)/Release
 	tar xf artifacts/$(_RUNTIME_ARCH)/Release/dotnet-sdk-*-$(_RUNTIME_ID)-$(_RUNTIME_ARCH).tar.gz -C $(DESTDIR)/$(DOTNETLIBDIR)
+	# Extract debug symbols to their own directory for easy handling
+	mkdir -p artifacts/debug-symbols
+	tar xf artifacts/$(_RUNTIME_ARCH)/Release/dotnet-symbols-sdk-*-$(_RUNTIME_ID)-$(_RUNTIME_ARCH).tar.gz -C artifacts/debug-symbols
 
 	# See https://github.com/dotnet/source-build/issues/2579
 	find $(DESTDIR)/$(DOTNETLIBDIR) -type f -name 'testhost.x86' -delete