diff --git a/build-debs b/build-debs new file mode 100755 index 000000000..9ac9b9c41 --- /dev/null +++ b/build-debs @@ -0,0 +1,13 @@ +#!/bin/sh +# Accepts directories to build packages from on the commandline, but defaults +# to building: perl-xCAT-2.0 and xCAT-client-2.0 + +packages="${@:-perl-xCAT-2.0 xCAT-client-2.0}" + +for pkg in $packages; do + mkdir -p debs/$pkg + echo Building .dsc source package for $pkg + cd $pkg + svn-buildpackage --svn-ignore --svn-lintian --svn-move-to=../debs/$pkg + cd - +done diff --git a/debperldepends b/debperldepends old mode 100755 new mode 100644 index d2989c1a2..d58c3aec2 --- a/debperldepends +++ b/debperldepends @@ -7,7 +7,7 @@ find . -name .svn -prune -o -type f \ | xargs grep -hE '^\s*(use|require) ' \ | while read mod; do pkg=$( awk '{ sub(";", "", $2); - sub("::", "-", $2); + gsub("::", "-", $2); print $2 }' <<<"$mod" \ | tr '[:upper:]' '[:lower:]' ) diff --git a/makeclientdeb b/makeclientdeb deleted file mode 100755 index dd2c143aa..000000000 --- a/makeclientdeb +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/sh - -set -e - -# debian doesn't like caps in package names (and we want to trim the .svn dirs) -[ -d xcat-client-2.0 ] || cp -R xCAT-client-2.0 xcat-client-2.0 -cd xcat-client-2.0 -#rm debian/files -find . -name .svn | xargs rm -rf -deps=$(../debperldepends) -sed -e "s/###debian-depends###/$deps/" debian/control -dpkg-buildpackage -b -cd .. -rm -rf xcat-client-2.0 - diff --git a/makedebs b/makedebs deleted file mode 100755 index 5f20f86b8..000000000 --- a/makedebs +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh -./makeperlxcatdeb -./makexcatclientdeb diff --git a/makeperlxcatdeb b/makeperlxcatdeb deleted file mode 100755 index 71743e92b..000000000 --- a/makeperlxcatdeb +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/sh - -# debian doesn't like caps in package names -[ -d perl-xcat-2.0 ] || cp -R perl-xCAT-2.0 perl-xcat-2.0 -cd perl-xcat-2.0 -#rm debian/files -find . -name .svn | xargs rm -rf -deps=$(../debperldepends) -sed -e "s/###debian-depends###/$deps/" debian/control -dpkg-buildpackage -b -cd .. -rm -rf perl-xcat-2.0 - diff --git a/perl-xCAT-2.0/debian/changelog b/perl-xCAT-2.0/debian/changelog index 982fec024..3aeca09fd 100644 --- a/perl-xCAT-2.0/debian/changelog +++ b/perl-xCAT-2.0/debian/changelog @@ -1,6 +1,6 @@ -perl-xcat (2.0-1) testing; urgency=low +perl-xcat (2.0-1) lenny; urgency=low - * Initial release (Closes: #nnnn) + * Initial release - -- Isaac Freeman Fri, 18 Apr 2008 11:42:09 -0400 + -- Isaac Freeman Thu, 08 May 2008 13:14:33 -0400 diff --git a/perl-xCAT-2.0/debian/control b/perl-xCAT-2.0/debian/control index 12b46361b..0a6232227 100644 --- a/perl-xCAT-2.0/debian/control +++ b/perl-xCAT-2.0/debian/control @@ -1,13 +1,13 @@ Source: perl-xcat Section: libs Priority: extra -Maintainer: Isaac Freeman -Build-Depends: debhelper (>= 5) +Maintainer: Isaac Freeman +Build-Depends: debhelper (>= 5), libdbi-perl Standards-Version: 3.7.2 Package: perl-xcat -Architecture: any -Depends: ${perl:Depends}, libio-socket-ssl-perl, libxml-simple-perl, libstorable-perl, libsys-syslog-perl, libsnmp-perl, libdbi-perl +Architecture: all +Depends: ${perl:Depends}, libio-socket-ssl-perl, libxml-simple-perl, libstorable-perl, libsys-syslog-perl, libsnmp-perl, libdbi-perl Description: xCAT perl libraries Provides perl xCAT libraries for core functionality. Required for all xCAT installations. Includes xCAT::Table, xCAT::NodeRange, among others. diff --git a/perl-xCAT-2.0/debian/control.template b/perl-xCAT-2.0/debian/control.template index caab08161..df0bd799f 100644 --- a/perl-xCAT-2.0/debian/control.template +++ b/perl-xCAT-2.0/debian/control.template @@ -1,8 +1,8 @@ Source: perl-xcat Section: libs Priority: extra -Maintainer: Isaac Freeman -Build-Depends: debhelper (>= 5) +Maintainer: Isaac Freeman +Build-Depends: debhelper (>= 5), libdbi-perl Standards-Version: 3.7.2 Package: perl-xcat diff --git a/perl-xCAT-2.0/debian/dirs b/perl-xCAT-2.0/debian/dirs index fb1150dd9..466d92d42 100644 --- a/perl-xCAT-2.0/debian/dirs +++ b/perl-xCAT-2.0/debian/dirs @@ -1,3 +1,2 @@ -usr/lib/perl/xCAT -usr/lib/perl/xCAT/data - +usr/lib/perl5/xCAT +usr/lib/perl5/xCAT/data diff --git a/xCAT-client-2.0/debian/changelog b/xCAT-client-2.0/debian/changelog index feea73ae8..a69a7de7f 100644 --- a/xCAT-client-2.0/debian/changelog +++ b/xCAT-client-2.0/debian/changelog @@ -1,11 +1,5 @@ -xcat-client (2.0-2) testing; urgency=low +xcat-client (2.0-1) lenny; urgency=low - * Testing re-release - - -- Isaac Freeman Mon, 21 Apr 2008 15:20:37 -0400 + * Initial release -xcat-client (2.0-1) testing; urgency=low - - * Initial release (Closes: #nnnn) - - -- Isaac Freeman Tue, 15 Apr 2008 17:12:26 -0400 + -- Isaac Freeman Thu, 08 May 2008 13:16:08 -0400 diff --git a/xCAT-client-2.0/debian/control b/xCAT-client-2.0/debian/control index 7703ede0f..93d83371b 100644 --- a/xCAT-client-2.0/debian/control +++ b/xCAT-client-2.0/debian/control @@ -1,7 +1,7 @@ Source: xcat-client -Section: main/admin +Section: admin Priority: extra -Maintainer: Isaac Freeman +Maintainer: Isaac Freeman Build-Depends: debhelper (>= 5) Standards-Version: 3.7.2 diff --git a/xCAT-client-2.0/debian/control.template b/xCAT-client-2.0/debian/control.template index 07f57a35e..f4ba9b79c 100644 --- a/xCAT-client-2.0/debian/control.template +++ b/xCAT-client-2.0/debian/control.template @@ -1,7 +1,7 @@ Source: xcat-client Section: admin Priority: extra -Maintainer: Isaac Freeman +Maintainer: Isaac Freeman Build-Depends: debhelper (>= 5) Standards-Version: 3.7.2 diff --git a/xCAT-client-2.0/debian/copyright b/xCAT-client-2.0/debian/copyright index f61d34dfe..ec4d5a294 100644 --- a/xCAT-client-2.0/debian/copyright +++ b/xCAT-client-2.0/debian/copyright @@ -1,3 +1,12 @@ +This package was debianized by Isaac Freeman on +Tue May 6 11:40:34 EDT 2008 + +It was downloaded via svn from http://sourceforge.net/projects/xcat/ + +Upstream Author(s): IBM + +Copyright: + Eclipse Public License - v 1.0 THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT. diff --git a/xCAT-client-2.0/debian/files b/xCAT-client-2.0/debian/files new file mode 100644 index 000000000..6cef6ec05 --- /dev/null +++ b/xCAT-client-2.0/debian/files @@ -0,0 +1,2 @@ +xcat-client_2.0-2_i386.deb admin extra +xcat-client_2.0-2_i386.deb admin extra diff --git a/xCAT-client-2.0/debian/rules b/xCAT-client-2.0/debian/rules index df3652c0b..52cb8045a 100755 --- a/xCAT-client-2.0/debian/rules +++ b/xCAT-client-2.0/debian/rules @@ -13,6 +13,9 @@ export DH_COMPAT=5 build: + echo *** debian/rules build + echo -n *** + pwd ./xpod2man clean: @@ -21,6 +24,9 @@ clean: dh_clean -d install: + echo *** debian/rules install + echo -n *** + pwd dh_testdir dh_testroot dh_installdirs @@ -34,6 +40,9 @@ binary-indep: build install # Build architecture-dependent files here. binary-arch: + echo *** debian/rules binary-arch + echo -n *** + pwd dh_testdir dh_testroot dh_installchangelogs @@ -53,7 +62,7 @@ binary-arch: dh_installman # dh_link # dh_strip -# dh_compress + dh_compress # dh_fixperms dh_perl dh_makeshlibs diff --git a/xCAT-client-2.0/debian/xcat-client.links b/xCAT-client-2.0/debian/xcat-client.links index 53c292c9c..1e62e1710 100644 --- a/xCAT-client-2.0/debian/xcat-client.links +++ b/xCAT-client-2.0/debian/xcat-client.links @@ -1,49 +1,49 @@ -xcatclient bin/rpower -xcatclient bin/rscan -bin/xcatclient sbin/makedhcp -bin/xcatclient sbin/makehosts -bin/xcatclient sbin/nodeset -bin/xcatclient sbin/setupiscsidev -bin/xcatclient sbin/makeconservercf -bin/xcatclient bin/rbeacon -bin/xcatclient bin/rvitals -bin/xcatclient bin/nodestat -bin/xcatclient bin/rinv -bin/xcatclient bin/rspreset -bin/xcatclient bin/rsetboot -bin/xcatclient bin/rbootseq -bin/xcatclient bin/reventlog -bin/xcatclient bin/nodels -bin/xcatclient bin/nodech -bin/xcatclient bin/noderm -bin/xcatclient bin/rnetboot -bin/xcatclient bin/getmacs -bin/xcatclient bin/mkvm -bin/xcatclient bin/rmvm -bin/xcatclient bin/lsvm -bin/xcatclient bin/chvm -bin/xcatclient bin/tabgrep -bin/xcatclientnnr bin/lsslp -bin/xcatclientnnr sbin/tabdump -bin/xcatclientnnr sbin/packimage -bin/xcatclientnnr sbin/makedns -bin/xcatclientnnr bin/gettab -bin/xcatclientnnr sbin/nodeadd -bin/xcatclientnnr sbin/makenetworks -bin/xcatclientnnr sbin/copycds -bin/xcatclientnnr bin/regnotif -bin/xcatclientnnr bin/unregnotif -bin/xcatclientnnr bin/monstart -bin/xcatclientnnr bin/monstop -bin/xcatclientnnr bin/monls -bin/xcatclientnnr sbin/monupdate -bin/xcatclientnnr sbin/monaddnode -bin/xcatclientnnr sbin/monrmnode -bin/xcatclientnnr bin/mkdsklsnode -bin/xcatclientnnr bin/mkdsklsimage -bin/xcatDBcmds bin/mkdef -bin/xcatDBcmds bin/chdef -bin/xcatDBcmds bin/lsdef -bin/xcatDBcmds bin/rmdef -bin/xcatDBcmds bin/xcat2nim -bin/xdsh bin/xdcp +usr/bin/xcatclient usr/bin/rpower +usr/bin/xcatclient usr/bin/rscan +usr/bin/xcatclient usr/sbin/makedhcp +usr/bin/xcatclient usr/sbin/makehosts +usr/bin/xcatclient usr/sbin/nodeset +usr/bin/xcatclient usr/sbin/setupiscsidev +usr/bin/xcatclient usr/sbin/makeconservercf +usr/bin/xcatclient usr/bin/rbeacon +usr/bin/xcatclient usr/bin/rvitals +usr/bin/xcatclient usr/bin/nodestat +usr/bin/xcatclient usr/bin/rinv +usr/bin/xcatclient usr/bin/rspreset +usr/bin/xcatclient usr/bin/rsetboot +usr/bin/xcatclient usr/bin/rbootseq +usr/bin/xcatclient usr/bin/reventlog +usr/bin/xcatclient usr/bin/nodels +usr/bin/xcatclient usr/bin/nodech +usr/bin/xcatclient usr/bin/noderm +usr/bin/xcatclient usr/bin/rnetboot +usr/bin/xcatclient usr/bin/getmacs +usr/bin/xcatclient usr/bin/mkvm +usr/bin/xcatclient usr/bin/rmvm +usr/bin/xcatclient usr/bin/lsvm +usr/bin/xcatclient usr/bin/chvm +usr/bin/xcatclient usr/bin/tabgrep +usr/bin/xcatclientnnr usr/bin/lsslp +usr/bin/xcatclientnnr usr/sbin/tabdump +usr/bin/xcatclientnnr usr/sbin/packimage +usr/bin/xcatclientnnr usr/sbin/makedns +usr/bin/xcatclientnnr usr/bin/gettab +usr/bin/xcatclientnnr usr/sbin/nodeadd +usr/bin/xcatclientnnr usr/sbin/makenetworks +usr/bin/xcatclientnnr usr/sbin/copycds +usr/bin/xcatclientnnr usr/bin/regnotif +usr/bin/xcatclientnnr usr/bin/unregnotif +usr/bin/xcatclientnnr usr/bin/monstart +usr/bin/xcatclientnnr usr/bin/monstop +usr/bin/xcatclientnnr usr/bin/monls +usr/bin/xcatclientnnr usr/sbin/monupdate +usr/bin/xcatclientnnr usr/sbin/monaddnode +usr/bin/xcatclientnnr usr/sbin/monrmnode +usr/bin/xcatclientnnr usr/bin/mkdsklsnode +usr/bin/xcatclientnnr usr/bin/mkdsklsimage +usr/bin/xcatDBcmds usr/bin/mkdef +usr/bin/xcatDBcmds usr/bin/chdef +usr/bin/xcatDBcmds usr/bin/lsdef +usr/bin/xcatDBcmds usr/bin/rmdef +usr/bin/xcatDBcmds usr/bin/xcat2nim +usr/bin/xdsh usr/bin/xdcp