diff --git a/docs/Makefile b/docs/Makefile index 0bac9056d..d4e88e3a4 100644 --- a/docs/Makefile +++ b/docs/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile 6225 2006-02-04 00:25:12Z steve $ +# $Id$ # ---------------------------------------------------------------------- # Copyright (c) 2004, 2005 NOVELL (All rights reserved) # @@ -49,11 +49,7 @@ MANPAGES = change_hat.2 \ apparmor_parser.8 apparmor_status.8 mod_apparmor.8 OLD_MANPAGES = subdomain.d.5 subdomain.vim.5 \ subdomain.7 subdomain_parser.8 -DOCUMENTS = licenses/COPYING \ - licenses/Immunix_Commercial_License.html \ - licenses/Immunix_Commercial_License.txt \ - *.pdf \ - immunix.css +DOCUMENTS = immunix.css PAPERS=$(wildcard papers/*) HTMLMANPAGES=$(foreach manpage, ${MANPAGES}, ${manpage}.html) diff --git a/docs/apparmor-docs.spec.in b/docs/apparmor-docs.spec.in index b14eb4a57..112098d73 100644 --- a/docs/apparmor-docs.spec.in +++ b/docs/apparmor-docs.spec.in @@ -1,4 +1,4 @@ -# $Id: apparmor-docs.spec.in 6269 2006-02-16 20:29:51Z dominic $ +# $Id$ # ---------------------------------------------------------------------- # Copyright (c) 2004, 2005 NOVELL (All rights reserved) # @@ -26,7 +26,7 @@ Summary: Novell AppArmor Host Application Security Suite Documentation package Name: apparmor-docs Version: @@immunix_version@@ -Release: 3.4 +Release: 4 Group: Applications/System Source0: %{name}-%{version}-@@repo_version@@.tar.gz License: Other License(s), see package @@ -44,10 +44,6 @@ This package is part of a suite of tools that used to be named SubDomain. %prep %setup -q -for file in gpl.txt lesser.txt -do - cp -a licenses/${file} . -done %build [ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT @@ -66,14 +62,14 @@ make install_manpages DESTDIR=$RPM_BUILD_ROOT MANDIR=%{_mandir} %{_mandir}/man5/* %{_mandir}/man7/* %{_mandir}/man8/* -%doc book.apparmor.admin-online.pdf -%doc gpl.txt -%doc lesser.txt # html versions of the manpages %doc *.[0-9].*html %doc immunix.css %changelog +* Tue Apr 11 2006 Steve Beattie +- push to novell forge svn (resets repo number alas) +- eliminate unnecessary licenses and binary documents * Thu Feb 16 2006 Dominic Reynolds 2.0-3.4 - Updated manual from doc group - includes new naming changes. * Mon Jan 30 2006 Steve Beattie 2.0-3.2 diff --git a/docs/apparmor.d.pod b/docs/apparmor.d.pod index 5936dd3ce..bef3bf7dc 100644 --- a/docs/apparmor.d.pod +++ b/docs/apparmor.d.pod @@ -1,4 +1,4 @@ -# $Id: apparmor.d.pod 6225 2006-02-04 00:25:12Z steve $ +# $Id$ # This publication is intellectual property of Novell Inc. Its contents # can be duplicated, either in part or in whole, provided that a copyright # label is visibly located on each copy. diff --git a/docs/apparmor.pod b/docs/apparmor.pod index fe2f0c5f7..9b985fff9 100644 --- a/docs/apparmor.pod +++ b/docs/apparmor.pod @@ -1,4 +1,4 @@ -# $Id: apparmor.pod 6226 2006-02-04 00:29:34Z steve $ +# $Id$ # This publication is intellectual property of Novell Inc. Its contents # can be duplicated, either in part or in whole, provided that a copyright # label is visibly located on each copy. diff --git a/docs/apparmor.vim.pod b/docs/apparmor.vim.pod index d36bde690..366a9e19f 100644 --- a/docs/apparmor.vim.pod +++ b/docs/apparmor.vim.pod @@ -1,4 +1,4 @@ -# $Id: apparmor.vim.pod 6225 2006-02-04 00:25:12Z steve $ +# $Id$ # This publication is intellectual property of Novell Inc. Its contents # can be duplicated, either in part or in whole, provided that a copyright # label is visibly located on each copy. diff --git a/docs/apparmor_parser.pod b/docs/apparmor_parser.pod index ff5124bda..64cee389d 100644 --- a/docs/apparmor_parser.pod +++ b/docs/apparmor_parser.pod @@ -1,4 +1,4 @@ -# $Id: apparmor_parser.pod 6225 2006-02-04 00:25:12Z steve $ +# $Id$ # This publication is intellectual property of Novell Inc. Its contents # can be duplicated, either in part or in whole, provided that a copyright # label is visibly located on each copy. diff --git a/docs/apparmor_status.pod b/docs/apparmor_status.pod index ce1e84772..5ad3a4587 100644 --- a/docs/apparmor_status.pod +++ b/docs/apparmor_status.pod @@ -1,4 +1,4 @@ -# $Id: apparmor_status.pod 6225 2006-02-04 00:25:12Z steve $ +# $Id$ # This publication is intellectual property of Novell Inc. Its contents # can be duplicated, either in part or in whole, provided that a copyright # label is visibly located on each copy. diff --git a/docs/autodep.pod b/docs/autodep.pod index 450af9d11..a71e3dcd4 100644 --- a/docs/autodep.pod +++ b/docs/autodep.pod @@ -1,4 +1,4 @@ -# $Id: autodep.pod 6203 2006-02-02 22:03:41Z steve $ +# $Id$ # This publication is intellectual property of Novell Inc. Its contents # can be duplicated, either in part or in whole, provided that a copyright # label is visibly located on each copy. diff --git a/docs/change_hat.pod b/docs/change_hat.pod index a08dd6dba..41098f40b 100644 --- a/docs/change_hat.pod +++ b/docs/change_hat.pod @@ -1,4 +1,4 @@ -# $Id: change_hat.pod 6203 2006-02-02 22:03:41Z steve $ +# $Id$ # This publication is intellectual property of Novell Inc. Its contents # can be duplicated, either in part or in whole, provided that a copyright # label is visibly located on each copy. diff --git a/docs/complain.pod b/docs/complain.pod index bf8a8cb35..34fab4358 100644 --- a/docs/complain.pod +++ b/docs/complain.pod @@ -1,4 +1,4 @@ -# $Id: complain.pod 6203 2006-02-02 22:03:41Z steve $ +# $Id$ # This publication is intellectual property of Novell Inc. Its contents # can be duplicated, either in part or in whole, provided that a copyright # label is visibly located on each copy. diff --git a/docs/enforce.pod b/docs/enforce.pod index 3cff6e831..c5f584398 100644 --- a/docs/enforce.pod +++ b/docs/enforce.pod @@ -1,4 +1,4 @@ -# $Id: enforce.pod 6203 2006-02-02 22:03:41Z steve $ +# $Id$ # This publication is intellectual property of Novell Inc. Its contents # can be duplicated, either in part or in whole, provided that a copyright # label is visibly located on each copy. diff --git a/docs/genprof.pod b/docs/genprof.pod index f37ce4a2d..c8c658d4b 100644 --- a/docs/genprof.pod +++ b/docs/genprof.pod @@ -1,4 +1,4 @@ -# $Id: genprof.pod 6203 2006-02-02 22:03:41Z steve $ +# $Id$ # This publication is intellectual property of Novell Inc. Its contents # can be duplicated, either in part or in whole, provided that a copyright # label is visibly located on each copy. diff --git a/docs/immunix.pod b/docs/immunix.pod index d4c894a29..6048b028f 100644 --- a/docs/immunix.pod +++ b/docs/immunix.pod @@ -1,4 +1,4 @@ -# $Id: immunix.pod 5820 2005-11-30 19:51:33Z sarnold $ +# $Id$ # This publication is intellectual property of Novell Inc. Its contents # can be duplicated, either in part or in whole, provided that a copyright # label is visibly located on each copy. diff --git a/docs/logprof.conf.pod b/docs/logprof.conf.pod index 6bab11ad0..4dc432df1 100644 --- a/docs/logprof.conf.pod +++ b/docs/logprof.conf.pod @@ -1,4 +1,4 @@ -# $Id: logprof.conf.pod 6203 2006-02-02 22:03:41Z steve $ +# $Id$ # This publication is intellectual property of Novell Inc. Its contents # can be duplicated, either in part or in whole, provided that a copyright # label is visibly located on each copy. diff --git a/docs/logprof.pod b/docs/logprof.pod index d69013baf..4173f5abe 100644 --- a/docs/logprof.pod +++ b/docs/logprof.pod @@ -1,4 +1,4 @@ -# $Id: logprof.pod 6203 2006-02-02 22:03:41Z steve $ +# $Id$ # This publication is intellectual property of Novell Inc. Its contents # can be duplicated, either in part or in whole, provided that a copyright # label is visibly located on each copy. diff --git a/docs/mod_apparmor.pod b/docs/mod_apparmor.pod index 29a62cd4f..c691635a2 100644 --- a/docs/mod_apparmor.pod +++ b/docs/mod_apparmor.pod @@ -1,4 +1,4 @@ -# $Id: mod_apparmor.pod 6225 2006-02-04 00:25:12Z steve $ +# $Id$ # This publication is intellectual property of Novell Inc. Its contents # can be duplicated, either in part or in whole, provided that a copyright # label is visibly located on each copy. diff --git a/docs/raceguard.pod b/docs/raceguard.pod index b17bfb75d..ff48c23a5 100644 --- a/docs/raceguard.pod +++ b/docs/raceguard.pod @@ -1,4 +1,4 @@ -# $Id: raceguard.pod 5820 2005-11-30 19:51:33Z sarnold $ +# $Id$ # This publication is intellectual property of Novell Inc. Its contents # can be duplicated, either in part or in whole, provided that a copyright # label is visibly located on each copy. diff --git a/docs/subdomain.conf.pod b/docs/subdomain.conf.pod index 6e44cc08d..f2ad497f4 100644 --- a/docs/subdomain.conf.pod +++ b/docs/subdomain.conf.pod @@ -1,4 +1,4 @@ -# $Id: subdomain.conf.pod 6203 2006-02-02 22:03:41Z steve $ +# $Id$ # This publication is intellectual property of Novell Inc. Its contents # can be duplicated, either in part or in whole, provided that a copyright # label is visibly located on each copy. diff --git a/docs/unconfined.pod b/docs/unconfined.pod index 871ad114e..b08d6d95f 100644 --- a/docs/unconfined.pod +++ b/docs/unconfined.pod @@ -1,4 +1,4 @@ -# $Id: unconfined.pod 6203 2006-02-02 22:03:41Z steve $ +# $Id$ # This publication is intellectual property of Novell Inc. Its contents # can be duplicated, either in part or in whole, provided that a copyright # label is visibly located on each copy.