Replace USER_AGENT_GTK_DISTRIBUTOR_NAME with USER_AGENT_BRANDING

debian/changelog

@@ -7,6 +7,9 @@ webkit2gtk (2.29.1-1) UNRELEASED; urgency=medium
   * debian/patches/dont-fallback-to-libwpe.patch,
     debian/patches/user-agent-branding.patch:
     + Drop these patches, they are now included upstream.
+  * debian/rules:
+    + Replace USER_AGENT_GTK_DISTRIBUTOR_NAME with the new
+      USER_AGENT_BRANDING build option in Ubuntu.
 
  -- Alberto Garcia <berto@igalia.com>  Mon, 18 May 2020 14:00:33 +0200
 

debian/rules

@@ -80,8 +80,7 @@ endif
 
 # openjpeg2 is not in Ubuntu main yet https://launchpad.net/bugs/711061
 ifeq ($(shell dpkg-vendor --derives-from Ubuntu && echo yes),yes)
-	EXTRA_CMAKE_ARGUMENTS += -DUSE_OPENJPEG=OFF
-	CPPFLAGS += -DUSER_AGENT_GTK_DISTRIBUTOR_NAME='"Ubuntu"'
+	EXTRA_CMAKE_ARGUMENTS += -DUSE_OPENJPEG=OFF -DUSER_AGENT_BRANDING="Ubuntu"
 endif
 
 # gstreamer1.0-libav is not in Ubuntu "main"