client/debian/DEBIAN-HOWTO | 22 +++++----
client/debian/apt-spacewalk/debian/apt-spacewalk.install | 5 +-
client/debian/apt-spacewalk/debian/changelog | 6 +-
client/debian/apt-spacewalk/debian/control | 9 ++-
client/debian/apt-spacewalk/debian/docs | 2
client/debian/apt-spacewalk/debian/pycompat | 1
client/debian/apt-spacewalk/debian/rules | 34 ---------------
client/debian/apt-spacewalk/debian/source/format | 1
client/debian/apt-spacewalk/debian/watch | 2
9 files changed, 27 insertions(+), 55 deletions(-)
New commits:
commit 4ab919cb99461f70e8c80326cc3f2c470157041c
Author: Simon Lukasik <slukasik(a)redhat.com>
Date: Thu Mar 17 18:49:35 2011 +0100
Updating build information for apt-spacewalk
diff --git a/client/debian/DEBIAN-HOWTO b/client/debian/DEBIAN-HOWTO
index 7da962e..b06619c 100644
--- a/client/debian/DEBIAN-HOWTO
+++ b/client/debian/DEBIAN-HOWTO
@@ -22,13 +22,17 @@ apt-spacewalk
apt-spacewalk - instructions are little different:
-cd client/debian/apt-spacewalk
-tar zcvf /tmp/apt-spacewalk_1.0.0.orig.tar.gz spacewalk.py
-cd ..
-cp -a apt-spacewalk /tmp/apt-spacewalk-1.0.0
-cd /tmp/apt-spacewalk-1.0.0
-#build source package
-debuild -i -S
-#or build binary package
-debuild -b
+1) Create an upstream tarball
+ cd client/debian/apt-spacewalk/src
+ tito build --tgz
+2) Prepare your build dir elsewhere
+ tar xzf apt-spacewalk-$version.tar.gz
+ cd apt-spacewalk-$version/
+ cp -r client/debian/apt-spacewalk/debian ./
+3) Adjust the settings in debian/ directory
+3) Build the package
+ #build source package
+ debuild -i -S
+ #or build binary package
+ debuild -b
diff --git a/client/debian/apt-spacewalk/debian/apt-spacewalk.install
b/client/debian/apt-spacewalk/debian/apt-spacewalk.install
index 6819a30..26df578 100644
--- a/client/debian/apt-spacewalk/debian/apt-spacewalk.install
+++ b/client/debian/apt-spacewalk/debian/apt-spacewalk.install
@@ -1 +1,4 @@
-spacewalk.py /usr/lib/apt/methods/
+post_invoke.py /usr/lib/apt-spacewalk/
+pre_invoke.py /usr/lib/apt-spacewalk/
+spacewalk /usr/lib/apt/methods/
+50spacewalk /etc/apt/apt.conf.d/
diff --git a/client/debian/apt-spacewalk/debian/changelog
b/client/debian/apt-spacewalk/debian/changelog
index 8235644..13f92c8 100644
--- a/client/debian/apt-spacewalk/debian/changelog
+++ b/client/debian/apt-spacewalk/debian/changelog
@@ -1,6 +1,6 @@
-apt-spacewalk (1.0.0-1) unstable; urgency=low
+apt-spacewalk (1.0.1-1) unstable; urgency=low
- * Initial release Package was created.
+ * Updated to the upstream version
- -- Miroslav Suchý <miroslav(a)suchy.cz> Mon, 20 Sep 2010 10:38:44 +0200
+ -- Simon Lukasik <xlukas08(a)stud.fit.vutbr.cz> Thu, 17 Mar 2010 18:43:00 +0200
diff --git a/client/debian/apt-spacewalk/debian/control
b/client/debian/apt-spacewalk/debian/control
index 96b6a22..2a98c04 100644
--- a/client/debian/apt-spacewalk/debian/control
+++ b/client/debian/apt-spacewalk/debian/control
@@ -1,15 +1,16 @@
Source: apt-spacewalk
Section: python
Priority: extra
-Maintainer: Miroslav Suchý <miroslav(a)suchy.cz>
-Build-Depends: python, debhelper (>= 7.0.50~)
-Build-Depends-Indep: python-support (>= 0.8)
+Maintainer: Simon Lukasik <xlukas08(a)stud.fit.vutbr.cz>
+Build-Depends: debhelper (>= 7.0.50~)
Standards-Version: 3.9.1
Homepage:
https://fedorahosted.org/spacewalk
Package: apt-spacewalk
Architecture: all
-Depends: ${python:Depends}, ${misc:Depends}, rhn-client-tools
+Depends: ${python:Depends}, apt, python-apt, rhn-client-tools
Provides: ${python:Provides}
+Recommends: rhnsd
+Suggests: rhncfg, rhnpush, osad
Description: Spacewalk transport for apt-get.
This is used to connect to Spacewalk servers.
diff --git a/client/debian/apt-spacewalk/debian/docs
b/client/debian/apt-spacewalk/debian/docs
deleted file mode 100644
index a48c3b0..0000000
--- a/client/debian/apt-spacewalk/debian/docs
+++ /dev/null
@@ -1,2 +0,0 @@
-ChangeLog
-copyright
diff --git a/client/debian/apt-spacewalk/debian/pycompat
b/client/debian/apt-spacewalk/debian/pycompat
deleted file mode 100644
index 0cfbf08..0000000
--- a/client/debian/apt-spacewalk/debian/pycompat
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/client/debian/apt-spacewalk/debian/rules
b/client/debian/apt-spacewalk/debian/rules
index e652103..56a5536 100755
--- a/client/debian/apt-spacewalk/debian/rules
+++ b/client/debian/apt-spacewalk/debian/rules
@@ -9,38 +9,8 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
-install: build
- dh_testdir
- dh_testroot
- dh_prep
- dh_installdirs -A $(CURDIR)/usr/lib/apt/methods/
- dh_install
-
-build: build-stamp
-
-build-stamp:
- dh_testdir
- touch build-stamp
-
clean:
rm -rf build
-
-binary: binary-indep binary-arch
-
-# 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_installdebconf
- dh_installdeb
- dh_python
- dh_gencontrol
- dh_md5sums
- dh_builddeb
-
-.PHONY: build clean binary-indep binary-arch binary install
+%:
+ dh $@
diff --git a/client/debian/apt-spacewalk/debian/source/format
b/client/debian/apt-spacewalk/debian/source/format
deleted file mode 100644
index 163aaf8..0000000
--- a/client/debian/apt-spacewalk/debian/source/format
+++ /dev/null
@@ -1 +0,0 @@
-3.0 (quilt)
diff --git a/client/debian/apt-spacewalk/debian/watch
b/client/debian/apt-spacewalk/debian/watch
deleted file mode 100644
index c76ceee..0000000
--- a/client/debian/apt-spacewalk/debian/watch
+++ /dev/null
@@ -1,2 +0,0 @@
-version=3
-https://fedorahosted.org/releases/s/p/spacewalk/rhnlib-(.*)\.tar\.gz