From 90cffab06b191a9700673917d701b81644b0c445 Mon Sep 17 00:00:00 2001 From: Marco Strigl Date: Fri, 7 Feb 2020 09:47:59 +0000 Subject: [PATCH] Accepting request 752964 from home:nickbrown:osc_debian_files Instead of storing the debian packaging as a tarball that's hard to version, generate and mange, store them separately. There is no net change, the files re exactly as they appeared in the tarball. This will make future improvements to the likes of the rules/control files easier, and hopefully kept in sync with the rpm spec. (I hope to move the debian package to python3 at some point). OBS-URL: https://build.opensuse.org/request/show/752964 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/osc?expand=0&rev=317 --- debian.compat | 1 + debian.control | 15 ++++++ debian.copyright | 17 +++++++ debian.dirs | 3 ++ debian.docs | 2 + debian.osc.dirs | 5 ++ debian.osc.install | 3 ++ debian.osc.links | 1 + debian.rules | 116 +++++++++++++++++++++++++++++++++++++++++++++ debian.tar.gz | 3 -- 10 files changed, 163 insertions(+), 3 deletions(-) create mode 100644 debian.compat create mode 100644 debian.control create mode 100644 debian.copyright create mode 100644 debian.dirs create mode 100644 debian.docs create mode 100644 debian.osc.dirs create mode 100644 debian.osc.install create mode 100644 debian.osc.links create mode 100644 debian.rules delete mode 100644 debian.tar.gz diff --git a/debian.compat b/debian.compat new file mode 100644 index 0000000..45a4fb7 --- /dev/null +++ b/debian.compat @@ -0,0 +1 @@ +8 diff --git a/debian.control b/debian.control new file mode 100644 index 0000000..8c685fd --- /dev/null +++ b/debian.control @@ -0,0 +1,15 @@ +Source: osc +Priority: extra +Maintainer: Adrian Schroeter , Rene Engelhard +Build-Depends: debhelper (>= 4.0.0), python-dev +Standards-Version: 3.7.1 +Section: devel + +Package: osc +Section: devel +Architecture: all +Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, python (>=2.5) | python-celementtree, python-m2crypto, python-rpm, build | obs-build +Recommends: python-progressbar +Suggests: python-keyring, sudo +Description: Open Build Service Commander + Commandline client for the Open Build Service. diff --git a/debian.copyright b/debian.copyright new file mode 100644 index 0000000..ab41165 --- /dev/null +++ b/debian.copyright @@ -0,0 +1,17 @@ +This package was debianized by J.H.M. Dassen (Ray) on +Fri, 12 May 2006 14:12:04 +0200. + +It was downloaded from www.opensuse.org + +Upstream Author: Peter Poeml + +Copyright Holder: Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. + +License: + +# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. +# This file and all modifications and additions to the pristine +# package are under the same license as the package itself. + +osc itself is GPL, for the full text of the GPL see /usr/share/common-licenses/GPL + diff --git a/debian.dirs b/debian.dirs new file mode 100644 index 0000000..1d53b63 --- /dev/null +++ b/debian.dirs @@ -0,0 +1,3 @@ +usr/bin +usr/sbin +usr/share/man diff --git a/debian.docs b/debian.docs new file mode 100644 index 0000000..724e084 --- /dev/null +++ b/debian.docs @@ -0,0 +1,2 @@ +README +TODO diff --git a/debian.osc.dirs b/debian.osc.dirs new file mode 100644 index 0000000..0b27127 --- /dev/null +++ b/debian.osc.dirs @@ -0,0 +1,5 @@ +usr/lib +usr/lib/osc +usr/include +etc/bash_completion.d +etc/profile.d diff --git a/debian.osc.install b/debian.osc.install new file mode 100644 index 0000000..ec92776 --- /dev/null +++ b/debian.osc.install @@ -0,0 +1,3 @@ +usr/lib/osc/complete +etc/profile.d/osc.csh +etc/bash_completion.d/osc.sh diff --git a/debian.osc.links b/debian.osc.links new file mode 100644 index 0000000..2792f5d --- /dev/null +++ b/debian.osc.links @@ -0,0 +1 @@ +usr/bin/osc-wrapper.py usr/bin/osc diff --git a/debian.rules b/debian.rules new file mode 100644 index 0000000..038e3e6 --- /dev/null +++ b/debian.rules @@ -0,0 +1,116 @@ +#!/usr/bin/make -f +# -*- makefile -*- +# Sample debian/rules that uses debhelper. +# This file was originally written by Joey Hess and Craig Small. +# As a special exception, when this file is copied by dh-make into a +# dh-make output file, you may use that output file without restriction. +# This special exception was added by Craig Small in version 0.37 of dh-make. + +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 + + + + +CFLAGS = -Wall -g + +ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) + CFLAGS += -O0 +else + CFLAGS += -O2 +endif + +# shared library versions, option 1 +version=2.0.5 +major=2 +# option 2, assuming the library is created as src/.libs/libfoo.so.2.0.5 or so +#version=`ls src/.libs/lib*.so.* | \ +# awk '{if (match($$0,/[0-9]+\.[0-9]+\.[0-9]+$$/)) print substr($$0,RSTART)}'` +#major=`ls src/.libs/lib*.so.* | \ +# awk '{if (match($$0,/\.so\.[0-9]+$$/)) print substr($$0,RSTART+4)}'` + +configure: configure-stamp +configure-stamp: + dh_testdir + # Add here commands to configure the package. + + touch configure-stamp + + +build: build-stamp +build-stamp: configure-stamp + dh_testdir + + # Add here commands to compile the package. + #$(MAKE) + python setup.py build + + touch build-stamp + +clean: + dh_testdir + dh_testroot + rm -f build-stamp configure-stamp + + # Add here commands to clean up after the build process. + -$(MAKE) clean + rm -rf build + + dh_clean + +install: build + dh_testdir + dh_testroot + dh_clean -k + dh_installdirs + + # Add here commands to install the package into debian/tmp + #$(MAKE) install DESTDIR=$(CURDIR)/debian/tmp + #python setup.py install --install-layout=deb + # --prefix=$(CURDIR)/debian/tmp/usr + # try also without --install-layout=deb for older distros + python setup.py install --root=debian/tmp --no-compile --install-layout=deb || \ + python setup.py install --root=debian/tmp --no-compile + install -Dm0644 dist/complete.csh debian/tmp/etc/profile.d/osc.csh + install -Dm0644 dist/complete.sh debian/tmp/etc/bash_completion.d/osc.sh + install -Dm0755 dist/osc.complete debian/tmp/usr/lib/osc/complete + + +# Build architecture-independent files here. +binary-indep: build install +# We have nothing to do by default. + +# Build architecture-dependent files here. +binary-arch: build install + dh_testdir + dh_testroot + dh_installchangelogs + dh_installdocs + dh_installexamples + dh_auto_install + dh_install +# dh_installmenu +# dh_installdebconf +# dh_installlogrotate +# dh_installemacsen +# dh_installpam +# dh_installmime +# dh_installinit +# dh_installcron +# dh_installinfo + dh_installman + dh_link + dh_strip + dh_compress + dh_fixperms +# dh_perl +# dh_python +# dh_makeshlibs + dh_installdeb + dh_shlibdeps + dh_gencontrol + dh_md5sums + dh_builddeb + +binary: binary-indep binary-arch +.PHONY: build clean binary-indep binary-arch binary install configure diff --git a/debian.tar.gz b/debian.tar.gz deleted file mode 100644 index 0c42706..0000000 --- a/debian.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:14f061d4c11db825452064043bafec42b8c5fe8c4a76b8df46e866211f32058d -size 2232