From f7cc894d0278f6a36fab1a9c44eb2d8bdb02d403 Mon Sep 17 00:00:00 2001 From: Sol Jerome Date: Sat, 18 May 2013 16:13:21 -0500 Subject: debian: Clean up python dependencies We no longer support any versions of Debian or Ubuntu with python < 2.6. In addition, the XB-Python-Version tag is deprecated. http://www.debian.org/doc/packaging-manuals/python-policy/ch-module_packages.html#s-specifying_versions Signed-off-by: Sol Jerome --- debian/control | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'debian') diff --git a/debian/control b/debian/control index 6c7278e4e..3d03d7f75 100644 --- a/debian/control +++ b/debian/control @@ -16,13 +16,11 @@ Build-Depends: debhelper (>= 7.0.50~), python-mock-doc Build-Depends-Indep: python-support (>= 0.5.3) Standards-Version: 3.8.0.0 -XS-Python-Version: >= 2.3 Homepage: http://bcfg2.org/ Package: bcfg2 Architecture: all -Depends: ${python:Depends}, ${misc:Depends}, debsums, python-apt, ucf, lsb-base (>= 3.1-9), python-m2crypto | python-ssl | python2.6 | python3.0 | python3.1 | python3.2 -XB-Python-Version: >= 2.3 +Depends: ${python:Depends}, ${misc:Depends}, debsums, python-apt, ucf, lsb-base (>= 3.1-9), python (>= 2.6) Description: Configuration management client Bcfg2 is a configuration management system that generates configuration sets for clients bound by client profiles. @@ -31,8 +29,7 @@ Description: Configuration management client Package: bcfg2-server Architecture: all -Depends: ${python:Depends}, ${misc:Depends}, python-lxml (>= 0.9), libxml2-utils (>= 2.6.23), lsb-base (>= 3.1-9), ucf, bcfg2 (= ${binary:Version}), openssl, python-ssl | python2.6 | python3.0 | python3.1 | python3.2, python-pyinotify | python-gamin, python-daemon -XB-Python-Version: >= 2.4 +Depends: ${python:Depends}, ${misc:Depends}, python-lxml (>= 0.9), libxml2-utils (>= 2.6.23), lsb-base (>= 3.1-9), ucf, bcfg2 (= ${binary:Version}), openssl, python (>= 2.6), python-pyinotify | python-gamin, python-daemon Recommends: graphviz, patch Suggests: python-cheetah, python-genshi (>= 0.4.4), python-profiler, python-sqlalchemy (>= 0.5.0), python-django, mail-transport-agent, bcfg2-doc (= ${binary:Version}) Description: Configuration management server @@ -45,7 +42,6 @@ Package: bcfg2-web Architecture: all Depends: ${python:Depends}, ${misc:Depends}, bcfg2-server (= ${binary:Version}), python-django, Suggests: python-mysqldb, python-psycopg2, python-sqlite, libapache2-mod-wsgi -XB-Python-Version: >= 2.4 Description: Configuration management web interface Bcfg2 is a configuration management system that generates configuration sets for clients bound by client profiles. -- cgit v1.2.3-1-g7c22 From ea71873cc742feaef4c57df4a20e39463c3490f8 Mon Sep 17 00:00:00 2001 From: Sol Jerome Date: Sat, 18 May 2013 16:42:08 -0500 Subject: debian: Bump minimum python build dependency also Signed-off-by: Sol Jerome --- debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/control b/debian/control index 3d03d7f75..01e98f6e0 100644 --- a/debian/control +++ b/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: Arto Jantunen Uploaders: Sami Haahtinen Build-Depends: debhelper (>= 7.0.50~), - python (>= 2.3.5-7), + python (>= 2.6), python-setuptools, python-sphinx (>= 1.0.7+dfsg) | python3-sphinx, python-lxml, -- cgit v1.2.3-1-g7c22 From 20851ccad284ed7e1c4dcf017aa79307bb4d29d0 Mon Sep 17 00:00:00 2001 From: Sol Jerome Date: Sat, 18 May 2013 17:20:55 -0500 Subject: debian: Add python-gamin build dependency Signed-off-by: Sol Jerome --- debian/control | 1 + 1 file changed, 1 insertion(+) (limited to 'debian') diff --git a/debian/control b/debian/control index 01e98f6e0..20cef93c8 100644 --- a/debian/control +++ b/debian/control @@ -10,6 +10,7 @@ Build-Depends: debhelper (>= 7.0.50~), python-lxml, python-daemon, python-cherrypy, + python-gamin, python-pyinotify, python-m2crypto, python-doc, -- cgit v1.2.3-1-g7c22 From 02a3da1e1233b3ebcc1e3aa97431c318c0b4ce3e Mon Sep 17 00:00:00 2001 From: Sol Jerome Date: Sat, 18 May 2013 17:21:12 -0500 Subject: debian: We no longer support older versions of dh This fix was for a version of debhelper which only exists on versions of Ubuntu and Debian which we no longer support. Signed-off-by: Sol Jerome --- debian/rules | 7 ------- 1 file changed, 7 deletions(-) (limited to 'debian') diff --git a/debian/rules b/debian/rules index fcbf6346c..5694e4e37 100755 --- a/debian/rules +++ b/debian/rules @@ -3,13 +3,6 @@ %: dh $@ --with python-support,sphinxdoc -override_dh_auto_install: - # Make the build destination dir consistent between pre-7.3 and 7.3 and - # later debhelper - see http://bcfg2.org/ticket/791 - dh_auto_install - test -d debian/tmp/usr/local && mv debian/tmp/usr/local/* debian/tmp/usr || exit 0 - test -d debian/tmp/usr/local && rmdir debian/tmp/usr/local || exit 0 - override_dh_installinit: # Install bcfg2 initscript without starting it on postinst dh_installinit --package=bcfg2 --no-start -- cgit v1.2.3-1-g7c22