Version in base suite: 2503+dfsg-1

Base version: dolphin-emu_2503+dfsg-1
Target version: dolphin-emu_2503+dfsg-1+deb13u1
Base file: /srv/ftp-master.debian.org/ftp/pool/main/d/dolphin-emu/dolphin-emu_2503+dfsg-1.dsc
Target file: /srv/ftp-master.debian.org/policy/pool/main/d/dolphin-emu/dolphin-emu_2503+dfsg-1+deb13u1.dsc

 changelog                        |    8 ++++++++
 gbp.conf                         |    1 +
 patches/locale_search_path.patch |   34 ++++++++++++++++++++++++++++++++++
 patches/series                   |    1 +
 rules                            |    2 +-
 5 files changed, 45 insertions(+), 1 deletion(-)

diff -Nru dolphin-emu-2503+dfsg/debian/changelog dolphin-emu-2503+dfsg/debian/changelog
--- dolphin-emu-2503+dfsg/debian/changelog	2025-04-07 20:42:34.000000000 +0000
+++ dolphin-emu-2503+dfsg/debian/changelog	2025-08-21 12:00:17.000000000 +0000
@@ -1,3 +1,11 @@
+dolphin-emu (2503+dfsg-1+deb13u1) trixie; urgency=medium
+
+  * Remove the dfsg repack suffix from DOLPHIN_WC_DESCRIBE (closes: #1094989).
+  * Look for locale files in the correct directory (closes: #1108687).
+  * Switch debian-branch to trixie.
+
+ -- Jordi Mallach <jordi@debian.org>  Thu, 21 Aug 2025 14:00:17 +0200
+
 dolphin-emu (2503+dfsg-1) unstable; urgency=medium
 
   * New upstream release.
diff -Nru dolphin-emu-2503+dfsg/debian/gbp.conf dolphin-emu-2503+dfsg/debian/gbp.conf
--- dolphin-emu-2503+dfsg/debian/gbp.conf	2025-04-07 20:36:28.000000000 +0000
+++ dolphin-emu-2503+dfsg/debian/gbp.conf	2025-08-21 11:59:53.000000000 +0000
@@ -1,2 +1,3 @@
 [DEFAULT]
+debian-branch = trixie
 pristine-tar = True
diff -Nru dolphin-emu-2503+dfsg/debian/patches/locale_search_path.patch dolphin-emu-2503+dfsg/debian/patches/locale_search_path.patch
--- dolphin-emu-2503+dfsg/debian/patches/locale_search_path.patch	1970-01-01 00:00:00.000000000 +0000
+++ dolphin-emu-2503+dfsg/debian/patches/locale_search_path.patch	2025-08-21 11:59:08.000000000 +0000
@@ -0,0 +1,34 @@
+Author: Jordi Mallach <jordi@debian.org>
+Description: define DATA_ROOT_DIR and use it to look for locale files
+ If DATA_DIR was modified at build time, locale files won't be picked
+ up, as they are installed into the localedir, not the full datadir
+ (which is correct). Instead, modify the lookup path.
+Forwarded: yes
+
+Index: dolphin-emu/CMakeLists.txt
+===================================================================
+--- dolphin-emu.orig/CMakeLists.txt
++++ dolphin-emu/CMakeLists.txt
+@@ -178,7 +178,9 @@ set_property(GLOBAL PROPERTY USE_FOLDERS
+ 
+ # Set up paths
+ set(datadir ${CMAKE_INSTALL_FULL_DATADIR}/dolphin-emu CACHE PATH "datadir")
++set(datarootdir ${CMAKE_INSTALL_FULL_DATAROOTDIR} CACHE PATH "datarootdir")
+ add_definitions(-DDATA_DIR="${datadir}/")
++add_definitions(-DDATA_ROOT_DIR="${datarootdir}/")
+ 
+ if(CMAKE_SYSROOT)
+   # If we should use a sysroot, tell pkg-config to search for packages in there, not on the host
+Index: dolphin-emu/Source/Core/DolphinQt/Translation.cpp
+===================================================================
+--- dolphin-emu.orig/Source/Core/DolphinQt/Translation.cpp
++++ dolphin-emu/Source/Core/DolphinQt/Translation.cpp
+@@ -284,7 +284,7 @@ static bool TryInstallTranslator(const Q
+ #elif defined LINUX_LOCAL_DEV
+         fmt::format("{}/../Source/Core/DolphinQt/{}/dolphin-emu.mo", File::GetExeDirectory(), lang)
+ #else
+-        fmt::format("{}/../locale/{}/LC_MESSAGES/dolphin-emu.mo", DATA_DIR, lang)
++        fmt::format("{}/locale/{}/LC_MESSAGES/dolphin-emu.mo", DATA_ROOT_DIR, lang)
+ #endif
+         ;
+ 
diff -Nru dolphin-emu-2503+dfsg/debian/patches/series dolphin-emu-2503+dfsg/debian/patches/series
--- dolphin-emu-2503+dfsg/debian/patches/series	2025-04-07 20:38:25.000000000 +0000
+++ dolphin-emu-2503+dfsg/debian/patches/series	2025-08-21 11:59:08.000000000 +0000
@@ -5,3 +5,4 @@
 mgba_videosize.patch
 use_system_tinygltf.patch
 fix_minizip_include.patch
+locale_search_path.patch
diff -Nru dolphin-emu-2503+dfsg/debian/rules dolphin-emu-2503+dfsg/debian/rules
--- dolphin-emu-2503+dfsg/debian/rules	2025-04-07 20:42:34.000000000 +0000
+++ dolphin-emu-2503+dfsg/debian/rules	2025-08-21 11:57:46.000000000 +0000
@@ -22,7 +22,7 @@
 	-DENABLE_TESTS=1 \
 	-DGTEST_DIR=/usr/src/gtest \
 	-DDOLPHIN_WC_BRANCH=master \
-	-DDOLPHIN_WC_DESCRIBE=2503+dfsg \
+	-DDOLPHIN_WC_DESCRIBE=2503 \
 	-DDOLPHIN_WC_REVISION=9763c0a1e2b9db0c3861d25bc2f5a0ace6a15ee3
 
 %: