[Git][debian-gis-team/qmapshack][master] 2 commits: Revert "Disable Salsa CI, doesn't support multiple upstream tarballs."

[Bas Couwenberg (@sebastic)]

Bas Couwenberg pushed to branch master at Debian GIS Project / qmapshack


Commits:
6644f836 by Bas Couwenberg at 2026-08-21T18:50:22+02:00
Revert "Disable Salsa CI, doesn't support multiple upstream tarballs."

This reverts commit f334c17c8c03c570639c61c470032a0232e38ca6.

- - - - -
426ee79d by Bas Couwenberg at 2026-08-21T18:51:09+02:00
Move component configuration to default section.

- - - - -


3 changed files:

- + debian/.gitlab-ci.yml
- debian/changelog
- debian/gbp.conf


Changes:

=====================================
debian/.gitlab-ci.yml
=====================================
@@ -0,0 +1,19 @@
+---
+include:
+  - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/recipes/debian.yml
+
+variables:
+  SALSA_CI_DISABLE_DEBREBUILD: 1
+  SALSA_CI_ENABLE_BUILD_PACKAGE_PROFILES: 1
+  SALSA_CI_ENABLE_VALIDATE_PACKAGE_CLEAN_UP: 1
+
+blhc:
+  allow_failure: true
+
+test-build-profiles:
+  extends: .test-build-package-profiles
+  parallel:
+    matrix:
+      - BUILD_PROFILES:
+        - nocheck
+        - nodoc


=====================================
debian/changelog
=====================================
@@ -1,9 +1,3 @@
-qmapshack (1.21.0+ds-2) UNRELEASED; urgency=medium
-
-  * Disable Salsa CI, doesn't support multiple upstream tarballs.
-
- -- Bas Couwenberg <sebastic at debian.org>  Fri, 21 Aug 2026 17:55:32 +0200
-
 qmapshack (1.21.0+ds-1) unstable; urgency=medium
 
   * New upstream release.


=====================================
debian/gbp.conf
=====================================
@@ -15,8 +15,8 @@ upstream-tag = upstream/%(version)s
 # Always use pristine-tar.
 pristine-tar = True
 
+# Multiple Upstream Tarballs
+component = dependencies
+
 [buildpackage]
 pbuilder-options = --source-only-changes
-
-[import-orig]
-component = dependencies



View it on GitLab: https://salsa.debian.org/debian-gis-team/qmapshack/-/compare/f334c17c8c03c570639c61c470032a0232e38ca6...426ee79d74d7a53bbaccc0789cb2b9e3360649a1

-- 
View it on GitLab: https://salsa.debian.org/debian-gis-team/qmapshack/-/compare/f334c17c8c03c570639c61c470032a0232e38ca6...426ee79d74d7a53bbaccc0789cb2b9e3360649a1
You're receiving this email because of your account on salsa.debian.org. Manage all notifications: https://salsa.debian.org/-/profile/notifications | Help: https://salsa.debian.org/help


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-grass-devel/attachments/20260821/e49fab9f/attachment-0001.htm>