--- ztc-3.1.0.31.orig/Makefile.in +++ ztc-3.1.0.31/Makefile.in @@ -93,6 +93,7 @@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ +GREP = @GREP@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ @@ -116,7 +117,6 @@ VERSION = @VERSION@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ -ac_ct_STRIP = @ac_ct_STRIP@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ @@ -129,19 +129,26 @@ bindir = @bindir@ build_alias = @build_alias@ datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ host_alias = @host_alias@ +htmldir = @htmldir@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ libdir = @libdir@ libexecdir = @libexecdir@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ sysconfdir = @sysconfdir@ --- ztc-3.1.0.31.orig/src/Makefile.in +++ ztc-3.1.0.31/src/Makefile.in @@ -47,7 +47,7 @@ mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = -am__installdirs = "$(DESTDIR)$(ztcbindir)" "$(DESTDIR)$(ztcbindir)" +am__installdirs = "$(DESTDIR)$(ztcbindir)" "$(DESTDIR)$(ztcdatadir)" ztcbinPROGRAMS_INSTALL = $(INSTALL_PROGRAM) PROGRAMS = $(ztcbin_PROGRAMS) am_ZTCLocalAgent_OBJECTS = ZTCLocalAgent.$(OBJEXT) \ @@ -71,8 +71,8 @@ *) f=$$p;; \ esac; am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; -ztcbinDATA_INSTALL = $(INSTALL_DATA) -DATA = $(dist_noinst_DATA) $(ztcbin_DATA) +ztcdataDATA_INSTALL = $(INSTALL_DATA) +DATA = $(dist_noinst_DATA) $(ztcdata_DATA) HEADERS = $(dist_noinst_HEADERS) ETAGS = etags CTAGS = ctags @@ -101,6 +101,7 @@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ +GREP = @GREP@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ @@ -124,7 +125,6 @@ VERSION = @VERSION@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ -ac_ct_STRIP = @ac_ct_STRIP@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ @@ -137,24 +137,31 @@ bindir = @bindir@ build_alias = @build_alias@ datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ host_alias = @host_alias@ +htmldir = @htmldir@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ libdir = @libdir@ libexecdir = @libexecdir@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ -ztcbindir = ${prefix}/intel/ZTCLocalAgent +ztcbindir = $(bindir) ZTCLocalAgent_SOURCES = ZTCLocalAgent.cpp \ PTHICommand.cpp HECILinux.cpp \ Utils.cpp Options.cpp \ @@ -171,7 +178,8 @@ RSC_OBJS = $(RSC_SRCS:.str=.dat) dist_noinst_DATA = $(RSC_SRCS) -ztcbin_DATA = $(RSC_OBJS) +ztcdatadir = $(datadir)/ZTCLocalAgent +ztcdata_DATA = $(RSC_OBJS) all: all-am .SUFFIXES: @@ -259,22 +267,22 @@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` uninstall-info-am: -install-ztcbinDATA: $(ztcbin_DATA) +install-ztcdataDATA: $(ztcdata_DATA) @$(NORMAL_INSTALL) - test -z "$(ztcbindir)" || $(mkdir_p) "$(DESTDIR)$(ztcbindir)" - @list='$(ztcbin_DATA)'; for p in $$list; do \ + test -z "$(ztcdatadir)" || $(mkdir_p) "$(DESTDIR)$(ztcdatadir)" + @list='$(ztcdata_DATA)'; for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ f=$(am__strip_dir) \ - echo " $(ztcbinDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(ztcbindir)/$$f'"; \ - $(ztcbinDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(ztcbindir)/$$f"; \ + echo " $(ztcdataDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(ztcdatadir)/$$f'"; \ + $(ztcdataDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(ztcdatadir)/$$f"; \ done -uninstall-ztcbinDATA: +uninstall-ztcdataDATA: @$(NORMAL_UNINSTALL) - @list='$(ztcbin_DATA)'; for p in $$list; do \ + @list='$(ztcdata_DATA)'; for p in $$list; do \ f=$(am__strip_dir) \ - echo " rm -f '$(DESTDIR)$(ztcbindir)/$$f'"; \ - rm -f "$(DESTDIR)$(ztcbindir)/$$f"; \ + echo " rm -f '$(DESTDIR)$(ztcdatadir)/$$f'"; \ + rm -f "$(DESTDIR)$(ztcdatadir)/$$f"; \ done ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) @@ -356,7 +364,7 @@ check: check-am all-am: Makefile $(PROGRAMS) $(DATA) $(HEADERS) installdirs: - for dir in "$(DESTDIR)$(ztcbindir)" "$(DESTDIR)$(ztcbindir)"; do \ + for dir in "$(DESTDIR)$(ztcbindir)" "$(DESTDIR)$(ztcdatadir)"; do \ test -z "$$dir" || $(mkdir_p) "$$dir"; \ done install: install-am @@ -404,7 +412,7 @@ info-am: -install-data-am: install-ztcbinDATA install-ztcbinPROGRAMS +install-data-am: install-ztcbinPROGRAMS install-ztcdataDATA install-exec-am: @@ -431,8 +439,8 @@ ps-am: -uninstall-am: uninstall-info-am uninstall-ztcbinDATA \ - uninstall-ztcbinPROGRAMS +uninstall-am: uninstall-info-am uninstall-ztcbinPROGRAMS \ + uninstall-ztcdataDATA .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ clean-local clean-ztcbinPROGRAMS ctags distclean \ @@ -440,12 +448,12 @@ dvi-am html html-am info info-am install install-am \ install-data install-data-am install-exec install-exec-am \ install-info install-info-am install-man install-strip \ - install-ztcbinDATA install-ztcbinPROGRAMS installcheck \ + install-ztcbinPROGRAMS install-ztcdataDATA installcheck \ installcheck-am installdirs maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-compile \ mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \ - uninstall-am uninstall-info-am uninstall-ztcbinDATA \ - uninstall-ztcbinPROGRAMS + uninstall-am uninstall-info-am uninstall-ztcbinPROGRAMS \ + uninstall-ztcdataDATA %.dat: %.str --- ztc-3.1.0.31.orig/src/Makefile.am +++ ztc-3.1.0.31/src/Makefile.am @@ -1,5 +1,4 @@ - -ztcbindir=${prefix}/intel/ZTCLocalAgent +ztcbindir=$(bindir) ztcbin_PROGRAMS=ZTCLocalAgent ZTCLocalAgent_SOURCES=ZTCLocalAgent.cpp \ @@ -19,7 +18,8 @@ RSC_OBJS = $(RSC_SRCS:.str=.dat) dist_noinst_DATA=$(RSC_SRCS) -ztcbin_DATA=$(RSC_OBJS) +ztcdatadir=$(datadir)/ZTCLocalAgent +ztcdata_DATA=$(RSC_OBJS) %.dat: %.str $(CPP) -x c++ -I. $< >$@ --- ztc-3.1.0.31.orig/src/ZTCLocalAgent.cpp +++ ztc-3.1.0.31/src/ZTCLocalAgent.cpp @@ -62,8 +62,8 @@ AMT_STATUS status; LOCAL_AGENT_PARAMS param; - StringTableUtils::StringTableInit("StatusStrings.dat",TRUE); - StringTableUtils::StringTableInit("ZTCLocalAgent.dat",FALSE); + StringTableUtils::StringTableInit("/usr/share/ZTCLocalAgent/StatusStrings.dat",TRUE); + StringTableUtils::StringTableInit("/usr/share/ZTCLocalAgent/ZTCLocalAgent.dat",FALSE); status = Parse(argc, argv, ¶m); if (AMT_STATUS_SUCCESS != status ) { --- ztc-3.1.0.31.orig/debian/compat +++ ztc-3.1.0.31/debian/compat @@ -0,0 +1 @@ +5 --- ztc-3.1.0.31.orig/debian/rules +++ ztc-3.1.0.31/debian/rules @@ -0,0 +1,9 @@ +#!/usr/bin/make -f +# makefile for ztc + +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 + +include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/class/autotools.mk +include /usr/share/cdbs/1/rules/simple-patchsys.mk --- ztc-3.1.0.31.orig/debian/changelog +++ ztc-3.1.0.31/debian/changelog @@ -0,0 +1,16 @@ +ztc (3.1.0.31-1ubuntu1) jaunty; urgency=low + + * Add debian/patches/01-build-failures.patch to fix some small build + failures. + - Use INT32 instead of UINT32 in the definition of main() + - #include to get some definitions of str and mem functions. + * Add cdbs-simplepatchsys. + + -- James Westby Tue, 13 Jan 2009 22:34:58 +0000 + +ztc (3.1.0.31-1) gutsy; urgency=low + + * Initial Release. + + -- Kyle McMartin Fri, 05 Oct 2007 16:45:17 -0400 + --- ztc-3.1.0.31.orig/debian/control +++ ztc-3.1.0.31/debian/control @@ -0,0 +1,15 @@ +Source: ztc +Priority: optional +Section: universe/admin +Build-Depends: debhelper (>= 4.1.0), gettext, cdbs +Maintainer: Ubuntu developers +Standards-Version: 3.7.2 + +Package: ztclocalagent +Architecture: any +Section: universe/admin +Depends: ${shlibs:Depends} +Description: sample application demonstrating Zero Touch Configuration + This sample application demonstrates how to set up an Intel(R) AMT + device for Zero Touch Configuration (ZTC) and trigger it to initiate + the configuration process. --- ztc-3.1.0.31.orig/debian/copyright +++ ztc-3.1.0.31/debian/copyright @@ -0,0 +1,34 @@ +This package was debianized by Kyle McMartin +Fri Oct 5 16:44:52 EDT 2007. + +It was downloaded from http://www.openamt.org/ + +Upstream Author: Intel Open Source Technology Centre + +Copyright (C) 2004-2007 Intel Corp. All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are met: + + - Redistributions of source code must retain the above copyright notice, + this list of conditions and the following disclaimer. + + - Redistributions in binary form must reproduce the above copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. + + - Neither the name of Intel Corp. nor the names of its + contributors may be used to endorse or promote products derived from this + software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ``AS IS'' +AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +ARE DISCLAIMED. IN NO EVENT SHALL Intel Corp. OR THE CONTRIBUTORS +BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR +CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF +SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS +INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN +CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) +ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +POSSIBILITY OF SUCH DAMAGE. --- ztc-3.1.0.31.orig/debian/patches/01-build-failures.patch +++ ztc-3.1.0.31/debian/patches/01-build-failures.patch @@ -0,0 +1,34 @@ +diff -Nur -x '*.orig' -x '*~' ztc-3.1.0.31/src/StringTableUtils.cpp ztc-3.1.0.31.new/src/StringTableUtils.cpp +--- ztc-3.1.0.31/src/StringTableUtils.cpp 2007-08-20 15:07:46.000000000 +0100 ++++ ztc-3.1.0.31.new/src/StringTableUtils.cpp 2009-01-13 22:34:50.000000000 +0000 +@@ -33,6 +33,7 @@ + #endif + #include + #include ++#include + #include + + #include "Types.h" +diff -Nur -x '*.orig' -x '*~' ztc-3.1.0.31/src/Utils.cpp ztc-3.1.0.31.new/src/Utils.cpp +--- ztc-3.1.0.31/src/Utils.cpp 2007-08-20 15:07:46.000000000 +0100 ++++ ztc-3.1.0.31.new/src/Utils.cpp 2009-01-13 22:34:39.000000000 +0000 +@@ -39,6 +39,7 @@ + #include + #include + #include ++#include + #include + + #include "Utils.h" +diff -Nur -x '*.orig' -x '*~' ztc-3.1.0.31/src/ZTCLocalAgent.cpp ztc-3.1.0.31.new/src/ZTCLocalAgent.cpp +--- ztc-3.1.0.31/src/ZTCLocalAgent.cpp 2009-01-13 22:33:24.000000000 +0000 ++++ ztc-3.1.0.31.new/src/ZTCLocalAgent.cpp 2009-01-13 22:34:27.000000000 +0000 +@@ -57,7 +57,7 @@ + /* + * This is a main entry point + */ +-int main(UINT32 argc, CHAR *argv[]) ++int main(INT32 argc, CHAR *argv[]) + { + + AMT_STATUS status;