[Reproducible-commits] [koji] 02/05: Split into separate packages
Ximin Luo
infinity0 at debian.org
Fri Dec 4 10:24:20 UTC 2015
This is an automated email from the git hooks/post-receive script.
infinity0 pushed a commit to branch master
in repository koji.
commit 906b549f09630a53ee7f0e534314b6dc83a81928
Author: Ximin Luo <infinity0 at debian.org>
Date: Thu Dec 3 13:09:36 2015 +0100
Split into separate packages
- Don't need to use pybuild
---
debian/control | 92 +++++++++++++++++++++-----
debian/koji-client.install | 3 +
debian/{koji.manpages => koji-client.manpages} | 0
debian/koji-common.install | 1 +
debian/koji-servers.install | 16 +++++
debian/rules | 21 +++---
6 files changed, 109 insertions(+), 24 deletions(-)
diff --git a/debian/control b/debian/control
index ff57d19..e69d9fe 100644
--- a/debian/control
+++ b/debian/control
@@ -1,37 +1,33 @@
Source: koji
-Section: devel
Maintainer: Reproducible Builds Maintainers <reproducible-builds at lists.alioth.debian.org>
Uploaders: Marek Marczykowski-Górecki <marmarek at invisiblethingslab.com>,
Ximin Luo <infinity0 at debian.org>
+Section: devel
Priority: extra
Standards-Version: 3.9.6
Build-Depends:
debhelper (>= 9.0),
dh-python,
dh-systemd,
- createrepo,
help2man,
pkg-config,
python-all,
- python-cheetah,
- python-libxml2,
- python-libvirt,
- python-kerberos,
python-openssl,
- python-qpid,
- python-rpm,
- python-simplejson,
- python-urlgrabber,
+ rpm,
systemd,
- yum
+ yum,
Homepage: https://fedorahosted.org/koji/
Vcs-Git: https://anonscm.debian.org/git/reproducible/koji.git
Vcs-Browser: https://anonscm.debian.org/cgit/reproducible/koji.git
-Package: koji
+Package: koji-common
Architecture: all
-Depends: python, ${misc:Depends}, ${python:Depends}
-Description: RPM-based build system
+Section: python
+Depends: ${misc:Depends}, ${python:Depends},
+#python-krbV,
+ python-openssl,
+ python-rpm,
+Description: RPM-based build system - common library
The Fedora Project uses Koji for their build system, as do several other
projects.
.
@@ -46,4 +42,70 @@ Description: RPM-based build system
- Thin, portable command line client
- Users can create local buildroots
- Buildroot contents are tracked in the database
- - Versioned data
+ - Versioned data
+ .
+ This package contains the common Python library used by other components.
+
+Package: koji-client
+Architecture: all
+Depends: python, ${misc:Depends}, ${python:Depends}, koji-common (= ${binary:Version}),
+ python-urlgrabber,
+ yum,
+Description: RPM-based build system - client
+ The Fedora Project uses Koji for their build system, as do several other
+ projects.
+ .
+ Koji's goal is to provide a flexible, secure, and reproducible way to build
+ software.
+ .
+ Key features:
+ .
+ - New buildroot for each build
+ - Robust XML-RPC APIs for easy integration with other tools
+ - Web interface with SSL and Kerberos authentication
+ - Thin, portable command line client
+ - Users can create local buildroots
+ - Buildroot contents are tracked in the database
+ - Versioned data
+ .
+ This package contains the koji client that queries remote build systems as
+ well as perform actions such as adding users and initiating build requests.
+
+Package: koji-servers
+Architecture: all
+Depends: python, ${misc:Depends}, ${python:Depends}, koji-common (= ${binary:Version}),
+ createrepo,
+ python-cheetah,
+#python-krbV,
+ python-libvirt,
+ python-libxml2,
+ python-qpid,
+ python-rpm,
+ python-simplejson,
+ python-urlgrabber,
+ yum,
+Description: RPM-based build system - server components
+ The Fedora Project uses Koji for their build system, as do several other
+ projects.
+ .
+ Koji's goal is to provide a flexible, secure, and reproducible way to build
+ software.
+ .
+ Key features:
+ .
+ - New buildroot for each build
+ - Robust XML-RPC APIs for easy integration with other tools
+ - Web interface with SSL and Kerberos authentication
+ - Thin, portable command line client
+ - Users can create local buildroots
+ - Buildroot contents are tracked in the database
+ - Versioned data
+ .
+ This package contains the server components of the koji build system.
+ .
+ - koji-hub, the center of all Koji operations. It is an XML-RPC server
+ running under mod_wsgi in Apache.
+ - kojid is the build daemon that runs on each of the build machines.
+ - koji-web is a set of scripts that run in mod_wsgi and use the Cheetah
+ templating engine to provide a web interface to Koji.
+ - kojira is a daemon that keeps the build root repodata updated.
diff --git a/debian/koji-client.install b/debian/koji-client.install
new file mode 100644
index 0000000..3795150
--- /dev/null
+++ b/debian/koji-client.install
@@ -0,0 +1,3 @@
+/etc/koji.conf
+/etc/koji.conf.d/
+/usr/bin/koji
diff --git a/debian/koji.manpages b/debian/koji-client.manpages
similarity index 100%
rename from debian/koji.manpages
rename to debian/koji-client.manpages
diff --git a/debian/koji-common.install b/debian/koji-common.install
new file mode 100644
index 0000000..b6a53b1
--- /dev/null
+++ b/debian/koji-common.install
@@ -0,0 +1 @@
+/usr/lib/python2.7/site-packages/koji
diff --git a/debian/koji-servers.install b/debian/koji-servers.install
new file mode 100644
index 0000000..cd8d52d
--- /dev/null
+++ b/debian/koji-servers.install
@@ -0,0 +1,16 @@
+/lib/systemd/system/
+/usr/lib/koji-hub-plugins/
+/usr/libexec
+/usr/sbin
+/etc/kojivmd/
+/etc/httpd/
+/etc/kojira/
+/etc/koji-hub/
+/etc/koji-shadow/
+/etc/mock/koji/
+/etc/kojid/
+/etc/kojiweb/
+/etc/koji-gc/
+/usr/share/kojivmd/
+/usr/share/koji-hub/
+/usr/share/koji-web/
diff --git a/debian/rules b/debian/rules
index 41e1c70..d9c1141 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,14 +1,7 @@
#!/usr/bin/make -f
-export PYBUILD_NAME=koji
-export PYBUILD_SYSTEM=custom
-export DH_VERBOSE=1
-
%:
- dh $@ --with python2 --buildsystem=pybuild
-
-override_dh_auto_install:
- dh_auto_install -S makefile
+ dh $@ --with python2
override_dh_auto_build:
dh_auto_build
@@ -16,5 +9,15 @@ override_dh_auto_build:
override_dh_auto_clean:
rm -f debian/koji.1
- rm -f vm/kojikamid
dh_auto_clean
+
+override_dh_install:
+ dh_install --fail-missing
+
+override_dh_python2:
+ dh_python2 -p koji-common
+ dh_python2 -p koji-client
+ dh_python2 -p koji-servers /usr/lib/koji-hub-plugins/
+ dh_python2 -p koji-servers /usr/share/koji-hub/
+ dh_python2 -p koji-servers /usr/share/koji-web/
+ dh_python2 -p koji-servers /usr/share/koji-web/lib/kojiweb/
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/reproducible/koji.git
More information about the Reproducible-commits
mailing list