Commit graph

40 commits

Author SHA1 Message Date
Steve Beattie
a14d06f8f6 Update repo url after branching 2.6 off of trunk, as well as adjust the
version to indicate that the branch is working towards a 2.6.1 release.
2011-03-10 10:08:24 -08:00
Steve Beattie
a28e39cd06 Prep for 2.6.0 release 2011-02-23 15:55:03 -08:00
John Johansen
52ca88141a Fix previously committed translation patch that didn't correctly add the
new apparmor-parser.pot file
2011-02-22 11:36:14 -08:00
John Johansen
d788969c25 Update apparmor_parser translation files
The apparmor_parser translation files where using the old subdomain_parser
domain, but the parser was binding to apparmor-parser.  Create a new
apparmor-parser.pot file and remove the subdomain_parser.pot file.

Signed-off-by: John Johansen <john.johansen@canonical.com>
2011-02-22 03:48:03 -08:00
Steve Beattie
24a47e2faa Update version to prepare for impending 2.6.0 release. 2011-02-16 10:38:28 -08:00
Kees Cook
723a20ba7d as ACKed on IRC, drop the unused $Id$ tags everywhere 2010-12-20 12:29:10 -08:00
Kees Cook
4b9a2683ed include release version in manpage 2010-11-04 11:32:06 -07:00
Kees Cook
06b4d7db0d Make the manpage release distro agnostic though configurable. 2010-11-03 23:49:41 -07:00
Kees Cook
6717e29909 Here is a patch to standardize on all utils using the "aa-" prefix instead
of a mix of symlinks to non-prefixed comands, and "apparmor_" prefixed
commands.

This also refactors the manpage generation slightly since we no longer
need special cases for the manpages, and drops aa-eventd from the default
list of tools to install (it also lacks a manpage).
2010-11-03 17:03:52 -07:00
Steve Beattie
db30c2bc19 This patch fixes the common/Make.rules file to not do bzr versioninfo
on every make invocation; instead it defines a command as a variable
that then is evaluated into shell variables when needed.
2010-10-18 12:12:37 -07:00
Steve Beattie
f6b043b434 Bump version up to prevent confusion at the request of jjohansen. 2010-10-18 11:18:03 -07:00
Steve Beattie
5849c7ab78 This patch removes a bunch of crufty old stuff, including some
subversion deritrus, the slackware tarball build support as well as
the aborted attempt to make auto building debian packages.
2010-10-07 15:42:36 -07:00
Steve Beattie
19fa8a3ed9 This patch takes the revision info from the stamp file if things are
being built outside of a working bzr tree.
2010-10-07 15:39:55 -07:00
Steve Beattie
875a06b9d7 This corrects a couple of build issues on openSUSE, as the version
of rpm there no longer defines %{_host_vendor}.
2010-10-07 15:38:31 -07:00
Steve Beattie
c90b199488 This patch moves the overall version definition of the software out of
the common/Make.rules file into common/Version so that libapparmor's
configure.in can make use of it, meaning there's one less thing to
adjust when updating the version. It also bumps the trunk version
from 2.5 to 2.5.90 in (perhaps excessively long) preparation for the
2.6.0 release, and to indicate that it's newer than the 2.5.x branch.
2010-10-07 15:37:30 -07:00
Steve Beattie
b19f77d5c7 This patch adds toplevel support for creating release and snapshot
tarballs and converts some of the common/Make.rules targets to get
version information from bzr. As part of this, the tarball generation
creates a .stamp_rev file in the common directory which contains both
the name of the bzr repo exported from as well as the revision.
2010-10-07 15:25:21 -07:00
Kees Cook
624aee531a Fix many compile-time warnings.
Start replacing RPM with lsb-release.
Drop old references to CVE.
Remove unused code.
2010-07-26 09:22:45 -07:00
John Johansen
6c23d48649 Bump versioning to AppArmor 2.5 2010-03-10 23:07:29 -08:00
John Johansen
7592c80db5 Update build version tags to 2.5~pre 2010-02-11 15:36:16 -08:00
John Johansen
335b088dd0 Bump version to 2.4 2010-02-04 14:41:36 -08:00
John Johansen
b3a1923a8f update to 2.3.1 2008-09-12 10:40:04 +00:00
John Johansen
4016ae5fb3 bump version to 2.3 2008-04-07 18:37:57 +00:00
Steve Beattie
a7b52e44e3 Vaguely make the toplevel target 'make tarball' work. It's good (if
slow) for getting a clean export of the source. But too many of the
packages make some assumptions that they're in a checked out svn tree
that a lot of the auto-rpm building infrastructure breaks. Use at your
own risk.
2007-08-16 22:11:01 +00:00
Steve Beattie
f1e851d8e4 Bump the version of apparmor to 2.1. 2007-08-16 17:18:46 +00:00
Steve Beattie
77db9ae104 Make _clean get rid of the gzipped manpages, too. 2007-04-26 21:20:02 +00:00
Steve Beattie
feb167c51a Move some common manpage cleanup to common/Make.rules (and clean up
pod2html tmpfiles). Also mark manpages to be ignored by svn.
2007-04-03 20:12:16 +00:00
Steve Beattie
9ef2941687 Subject: Move make targets from docs/ to common/Make.rules
This patch moves the make rules used to generate man pages and their
html counterparts from the docs package to the common/ directory, so
that all packages can make use of them. It also makes the immunix.css
stylesheet available via the common/ dir, renaming it to apparmor.css.
2007-04-03 18:51:56 +00:00
Andreas Gruenbacher
004af43f9f Bumt the version to 2.0.2. Move active/ profiles to extra/ pending review and regeneration with the latest syntax. 2007-03-30 22:32:48 +00:00
Steve Beattie
89158886fe Bleah, we weren't including the made specfile (with the embedded svn
repository version) into the 'dist' tarballs.
2007-03-26 19:30:14 +00:00
Steve Beattie
08e94e2969 Finally got the right set of in-place variable replacements that strips
off trailing slashes on the build directory, which horribly confused
rpm's check for unpackaged files.
2007-01-11 21:55:08 +00:00
Steve Beattie
4f16824434 This patch makes it so that translations added to po/ directories are
automatically added to the set of languages to be built and installed
unless they are explicitly added to the set of disabled translations.
This eliminates the need to manually add a lang to the Makefile when a
new translation is submitted (svn add will still be necessary).
2006-11-15 09:22:15 +00:00
Steve Beattie
fecc909858 Hmm, I think the common directory version should always be HEAD. 2006-11-10 10:05:48 +00:00
Steve Beattie
1b0b287970 Make the specific version be the version exported. 2006-11-10 10:02:59 +00:00
Steve Beattie
af33afe8f7 Convert the rest of the packages to symlinking in the common directory
so that 'make dist' will work.
2006-11-04 21:34:47 +00:00
Steve Beattie
7d29ce4a2e Bump revision to 2.0.1 (in part for opensuse 10.2 release) 2006-11-03 22:07:47 +00:00
Steve Beattie
3949b95110 Baby step to making 'make dist' actually work. this will mean common/
will be a symlink in the directory.
2006-11-03 10:19:42 +00:00
Steve Beattie
59f30353a1 This patch adds a 'make dist' target to all the apparmor packages, which
creates a tarball i(and specfile) similar to 'make tarball' except that
it uses svn export to pull the latest committed version rather than the
currently contents of the tree (as make tarball does). This is to make
pristine checkins to SUSE's autobuild system and the openSUSE
buildservice easier.
2006-10-31 14:08:34 +00:00
Steve Beattie
415de7ba8e Add a configurable setting for the location of ldconfig; convert
libapparmor to using ldconfig to generate its so-version library
symlink.
2006-10-16 21:08:58 +00:00
Steve Beattie
13e1f836b0 Set svn:keywords on the common make rules. 2006-04-12 20:19:42 +00:00
Steve Beattie
8fbbf6c9af Test import of the common/ subtree. Internal svn repo version 6381. 2006-04-11 21:19:46 +00:00