!3 fix bug #187858

Merge pull request !3 from 苏芳/openkylin/yangtze

debian/changelog

@@ -1,3 +1,9 @@
+cups (2.4.2-ok4) yangtze; urgency=medium
+
+  * fix bug #187858 【openKylin软件包源码扫描】cups 源码含有ubuntu信息
+
+ -- sufang <sufang@kylinos.cn>  Mon, 25 Sep 2023 15:41:13 +0800
+
 cups (2.4.2-ok3) yangtze; urgency=medium
 
   * Apply patchs.

debian/rules

@@ -3,7 +3,6 @@
 # temporarily deactivate tests
 export LOCAL_DEB_BUILD_OPTIONS = nocheck
 
-derives_from_ubuntu := $(shell (dpkg-vendor --derives-from Ubuntu && echo "yes") || echo "no")
 derives_from_openkylin := $(shell (dpkg-vendor --derives-from openKylin && echo "yes") || echo "no")
 
 # Enabling PIE globally doesn't work, but ./configure already enables PIE
@@ -11,10 +10,6 @@ derives_from_openkylin := $(shell (dpkg-vendor --derives-from openKylin && echo
 # temporarily deactivate tests
 export DEB_BUILD_MAINT_OPTIONS = hardening=+all,-pie
 
-ifeq ($(shell dpkg-vendor --is Ubuntu && echo yes) $(DEB_HOST_ARCH), yes i386)
-   skip_packages = -Ncups -Ncups-core-drivers
-endif
-
 ifeq ($(shell dpkg-vendor --is openKylin && echo yes) $(DEB_HOST_ARCH), yes i386)
    skip_packages = -Ncups -Ncups-core-drivers
 endif
@@ -34,11 +29,7 @@ else
 CONFIG_LIBUSB=--enable-libusb
 endif
 
-ifeq ($(derives_from_ubuntu),yes)
-CUPS_CONFIGURE_DISTRO_OPTIONS=--disable-browsing
-else
 CUPS_CONFIGURE_DISTRO_OPTIONS=
-endif
 
 override_dh_auto_configure:
 	# Rebuild ./configure to get build system patches working