Skip to content

Commit

Permalink
Merge pull request #391 from nickbroon/debian_packaging_for_gbp_service
Browse files Browse the repository at this point in the history
Debian packaging for gbp service
  • Loading branch information
adrianschroeter authored Jul 2, 2024
2 parents 37000ba + c14138e commit 4ca33d1
Show file tree
Hide file tree
Showing 6 changed files with 38 additions and 16 deletions.
4 changes: 3 additions & 1 deletion GNUmakefile
Original file line number Diff line number Diff line change
Expand Up @@ -172,9 +172,11 @@ tar_scm: tar_scm.py
@echo "Creating $@ which uses $(PYTHON) ..."
sed 's,^\#!/usr/bin/.*,#!$(PYTHON),' $< > $@

COMPILED_PYTHON = true

.PHONY: install

install: dirs tar_scm service compile
install: dirs tar_scm service $(if $(findstring $(COMPILED_PYTHON),true),compile)
install -m 0755 tar_scm $(DESTDIR)$(mylibdir)/tar_scm
install -m 0644 tar_scm.rc $(DESTDIR)$(mycfgdir)/tar_scm
# Recreate links, otherwise reinstalling would fail
Expand Down
19 changes: 19 additions & 0 deletions debian/changelog
Original file line number Diff line number Diff line change
@@ -1,3 +1,22 @@
obs-service-tar-scm (0.10.43) unstable; urgency=medium

[ Adrian Schröter ]
* Allow to use "tar" service also standalone.
* fix tar without obsinfo also in git managed packages

[ Nicholas Brown ]
* enable the GBP service
* Fix Lintian error about missing python3 dep
* Debian X-Python version no longer needed
* Debian compat from 8 to 10
* Fix priority-extra-is-replaced-by-priority-optional
* Fix description-synopsis-starts-with-article
* Update debian debhelper dependency
* update dist/debian.dsc to match debian packaging
* disable compile python in debian package

-- Nick Brown <[email protected]> Thu, 29 Feb 2024 15:51:56 +0000

obs-service-tar-scm (0.10.41) unstable; urgency=medium

* update to upstream version 0.10.41
Expand Down
2 changes: 1 addition & 1 deletion debian/compat
Original file line number Diff line number Diff line change
@@ -1 +1 @@
8
10
11 changes: 5 additions & 6 deletions debian/control
Original file line number Diff line number Diff line change
@@ -1,17 +1,16 @@
Source: obs-service-tar-scm
Section: devel
Priority: extra
Priority: optional
Maintainer: Daniel Gollub <[email protected]>
Build-Depends: debhelper (>= 7.0.0), python3, python3-dateutil, dh-python
Build-Depends: debhelper (>= 8.0.0), python3, python3-dateutil, dh-python
Standards-Version: 3.9.3
Homepage: https://github.com/openSUSE/obs-service-tar_scm
X-Python-Version: >= 2.6

Package: obs-service-tar-scm
Architecture: all
Provides: obs-service-obs-scm, obs-service-tar
Depends: ${misc:Depends}, ${python3:Depends}, bzr, git, subversion, cpio, python3-dateutil, python3-yaml, locales-all
Provides: obs-service-obs-scm, obs-service-tar, obs-service-gbp
Depends: ${misc:Depends}, ${python3:Depends}, python3, bzr, git, subversion, cpio, python3-dateutil, python3-yaml, locales-all
Recommends: mercurial, git-buildpackage, git-lfs
Description: An OBS source service: fetches SCM tarballs
Description: OBS source service: fetches SCM tarballs
This is a source service for openSUSE Build Service.
It supports downloading from svn, git, hg and bzr repositories.
8 changes: 5 additions & 3 deletions debian/rules
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,11 @@ DESTDIR=debian/obs-service-tar-scm
%:
dh $@ --with python3

override_dh_auto_build: ;
# Skip the Makefile and just rely on the python debhelper
override_dh_auto_build:

override_dh_auto_test: ;
# Skip tests as slow and don't detect python on debian
override_dh_auto_test:

override_dh_auto_install:
$(MAKE) DESTDIR=`pwd`/$(DESTDIR) PREFIX=/usr install
dh_auto_install -- COMPILED_PYTHON=false WITH_GBP=1 install
10 changes: 5 additions & 5 deletions dist/debian.dsc
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
Format: 1.0
Source: obs-service-tar-scm
Version: 0.10.36
Provides: obs-service-obs_scm, obs-service-tar
Version: 0.10.43
Provides: obs-service-obs_scm, obs-service-tar, obs-service-gbp
Binary: obs-service-tar_scm
Maintainer: Adrian Schroeter <[email protected]>
Architecture: all
Standards-Version: 3.7.2
Standards-Version: 3.9.3
Build-Depends: debhelper (>= 8.0.0), python3, python3-dateutil, dh-python, python3-yaml

Package: obs-service-tar-scm
Architecture: all
Provides: obs-service-obs-scm, obs-service-tar
Depends: ${misc:Depends}, ${python3:Depends}, bzr, git, subversion, cpio, python3-dateutil, python3-yaml
Recommends: mercurial
Depends: ${misc:Depends}, ${python3:Depends}, python3, bzr, git, subversion, cpio, python3-dateutil, python3-yaml
Recommends: mercurial, git-buildpackage, git-lfs
Description: An OBS source service: fetches SCM tarballs
This is a source service for openSUSE Build Service.
It supports downloading from svn, git, hg and bzr repositories.
Expand Down

0 comments on commit 4ca33d1

Please sign in to comment.