diff -pruN 0.0~git20210331.41bb18b-1/debian/changelog 0.0~git20210331.41bb18b-2/debian/changelog
--- 0.0~git20210331.41bb18b-1/debian/changelog	2023-07-29 16:11:55.000000000 +0000
+++ 0.0~git20210331.41bb18b-2/debian/changelog	2025-08-04 00:16:11.000000000 +0000
@@ -1,3 +1,11 @@
+golang-github-golang-groupcache (0.0~git20210331.41bb18b-2) unstable; urgency=medium
+
+  * Team upload.
+  * Migrate to golang-github-golang-protobuf-1-5-dev, Closes: #1110161
+  * gitlab-ci.yml: Use both team pipelines
+
+ -- Reinhard Tartler <siretart@tauware.de>  Sun, 03 Aug 2025 20:16:11 -0400
+
 golang-github-golang-groupcache (0.0~git20210331.41bb18b-1) unstable; urgency=medium
 
   * Team upload
diff -pruN 0.0~git20210331.41bb18b-1/debian/control 0.0~git20210331.41bb18b-2/debian/control
--- 0.0~git20210331.41bb18b-1/debian/control	2023-07-29 16:06:28.000000000 +0000
+++ 0.0~git20210331.41bb18b-2/debian/control	2025-08-04 00:16:11.000000000 +0000
@@ -6,7 +6,7 @@ Uploaders: Tim Potter <tpot@hpe.com>,
 Build-Depends: debhelper-compat (= 13),
                dh-golang,
                golang-any,
-               golang-github-golang-protobuf-1-3-dev,
+               golang-github-golang-protobuf-1-5-dev,
 Standards-Version: 4.6.2
 Homepage: https://github.com/golang/groupcache
 Vcs-Browser: https://salsa.debian.org/go-team/packages/golang-github-golang-groupcache
@@ -18,7 +18,7 @@ Testsuite: autopkgtest-pkg-go
 Package: golang-github-golang-groupcache-dev
 Architecture: all
 Multi-Arch: foreign
-Depends: golang-github-golang-protobuf-1-3-dev | golang-github-golang-protobuf-1-5-dev,
+Depends: golang-github-golang-protobuf-1-5-dev,
          ${misc:Depends},
 Description: caching and cache-filling library, a replacement for memcached
  Groupcache is a caching and cache-filling library, intended as a
diff -pruN 0.0~git20210331.41bb18b-1/debian/gitlab-ci.yml 0.0~git20210331.41bb18b-2/debian/gitlab-ci.yml
--- 0.0~git20210331.41bb18b-1/debian/gitlab-ci.yml	2023-07-29 16:06:28.000000000 +0000
+++ 0.0~git20210331.41bb18b-2/debian/gitlab-ci.yml	2025-08-04 00:16:11.000000000 +0000
@@ -1,6 +1,47 @@
-# auto-generated, DO NOT MODIFY.
-# The authoritative copy of this file lives at:
+# DO NOT MODIFY
+# This file was automatically generated from the authoritative copy at:
 # https://salsa.debian.org/go-team/infra/pkg-go-tools/blob/master/config/gitlabciyml.go
 ---
+stages:
+  - test
+  - package
+
 include:
-  - https://salsa.debian.org/go-team/infra/pkg-go-tools/-/raw/master/pipeline/test-archive.yml
+  - project: go-team/infra/pkg-go-tools
+    ref: master
+    file: pipeline/test-archive.yml
+    # Run the Go team CI only in the go-team project that has access to GitLab
+    # CI runners tagged 'go-ci'
+    rules:
+      - if: $CI_PROJECT_ROOT_NAMESPACE  == "go-team"
+
+Salsa CI:
+  stage: package
+  trigger:
+    include:
+      - project: salsa-ci-team/pipeline
+        ref: master
+        file: recipes/debian.yml
+    strategy: depend
+  rules:
+    # Do not create a pipeline for tags unless SALSA_CI_ENABLE_PIPELINE_ON_TAGS is set
+    - if: $CI_COMMIT_TAG != null && $SALSA_CI_ENABLE_PIPELINE_ON_TAGS !~ /^(1|yes|true)$/
+      when: never
+    # Avoid duplicated pipelines, do not run detached pipelines
+    - if: '$CI_PIPELINE_SOURCE == "merge_request_event"'
+      when: never
+    # Run Salsa CI only if the Play button is pressed on the pipeline
+    - if: $CI_PIPELINE_SOURCE == "push"
+      when: manual
+  variables:
+    SALSA_CI_DISABLE_REPROTEST: 1 # Disable to save CI runner resources
+
+# If Salsa CI is not running at
+# https://salsa.debian.org/%{project_path}/-/pipelines, ensure that
+# https://salsa.debian.org/%{project_path}/-/settings/ci_cd has in field "CI/CD
+# configuration file" the same filename as this file.
+#
+# If Salsa CI is running, but first job is stuck because the project doesn't
+# have any runners online assigned to it, ensure that
+# https://salsa.debian.org/%{project_path}/-/settings/ci_cd has under "Runners"
+# the setting for "Enable instance runners for this project" enabled.