From 70c796b7eeb66fb322a201c67645e0b3a81b930e Mon Sep 17 00:00:00 2001
From: Loyalsoldier <10487845+Loyalsoldier@users.noreply.github.com>
Date: Tue, 21 Sep 2021 06:59:21 +0800
Subject: [PATCH] Fix: debian package (#1279)

---
 .github/workflows/deb.yml | 12 +++---------
 release/debian/changelog  |  2 +-
 release/debian/control    |  4 ++--
 release/debian/rules      |  6 +-----
 4 files changed, 7 insertions(+), 17 deletions(-)

diff --git a/.github/workflows/deb.yml b/.github/workflows/deb.yml
index b871ecff8..2267a3187 100644
--- a/.github/workflows/deb.yml
+++ b/.github/workflows/deb.yml
@@ -21,18 +21,16 @@ jobs:
   package:
     if: github.repository == 'v2fly/v2ray-core'
     runs-on: ubuntu-latest
-    container: debian:sid
+    container: golang:1.17-bullseye
 
     steps:
-      - name: Install git
+      - name: Update & install dependencies
         run: |
           apt-get update
           apt-get install -y git wget
 
       - name: Checkout codebase
         uses: actions/checkout@v2
-        with:
-          submodules: "recursive"
 
       - name: Download geo files
         run: |
@@ -42,11 +40,7 @@ jobs:
 
       - name: Install build dependencies
         run: |
-          apt-get install -y build-essential dh-golang golang-1.17 reprepro
-
-      - name: Set environment variable
-        run: |
-          echo "PATH=/usr/lib/go-1.17/bin:${PATH}" >> $GITHUB_ENV
+          apt-get install -y build-essential dh-golang reprepro
 
       - name: Build
         run: |
diff --git a/release/debian/changelog b/release/debian/changelog
index 069a2cad9..94f1cf1b7 100644
--- a/release/debian/changelog
+++ b/release/debian/changelog
@@ -1,4 +1,4 @@
-v2ray-core (4.42.2-1) unstable; urgency=medium
+v2ray-core (4.42.2-2) unstable; urgency=medium
 
   * Support Windows ARM64
   * TLS: support client certificate authentication
diff --git a/release/debian/control b/release/debian/control
index bd5196b01..ad2d321e2 100644
--- a/release/debian/control
+++ b/release/debian/control
@@ -4,7 +4,6 @@ Priority: optional
 Maintainer: ymshenyu <ymshenyu@gmail.com>
 Build-Depends:  debhelper-compat (= 12),
                 dh-golang,
-                golang-1.17
 Standards-Version: 4.5.0
 Homepage: https://github.com/v2fly/v2ray-core
 #Vcs-Browser: https://salsa.debian.org/debian/v2ray-core
@@ -16,7 +15,8 @@ Package: v2ray
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Recommends: v2ray-domain-list-community,
-            v2ray-geoip
+            v2ray-geoip,
+            v2ray-geoip-only-cn-private
 Description: Library platform for building proxies in golang
  Project V2Ray is a set of network tools that help you to build your
  own computer network. It secures your network connections and thus
diff --git a/release/debian/rules b/release/debian/rules
index c6ea577af..019d9f26f 100755
--- a/release/debian/rules
+++ b/release/debian/rules
@@ -5,16 +5,12 @@ include /usr/share/dpkg/default.mk
 BUILDDIR=_build
 
 %:
-	dh $@ --builddirectory=$(BUILDDIR) --buildsystem=golang --with=golang
+	dh $@ --builddirectory=$(BUILDDIR) --buildsystem=golang
 
 execute_after_dh_auto_configure:
 	go mod vendor
 	cp -r vendor/* _build/src
 
-override_dh_auto_clean:
-	dh_auto_clean
-	rm -rf vendor
-
 override_dh_auto_build:
 	DH_GOPKG="github.com/v2fly/v2ray-core/v4/main" dh_auto_build -- -ldflags "-s -w"
 	cd $(BUILDDIR); mv bin/main bin/v2ray