From 96cedce91474438269ddc118b942ab73a5461319 Mon Sep 17 00:00:00 2001 From: Petre Rodan Date: Sun, 12 Dec 2004 12:20:32 +0000 Subject: [PATCH] trivial merge with upstream policy --- sec-policy/selinux-gpm/ChangeLog | 8 +++++++- sec-policy/selinux-gpm/files/digest-selinux-gpm-20041110 | 1 - sec-policy/selinux-gpm/files/digest-selinux-gpm-20041128 | 1 + ...ux-gpm-20041110.ebuild => selinux-gpm-20041128.ebuild} | 2 +- 4 files changed, 9 insertions(+), 3 deletions(-) delete mode 100644 sec-policy/selinux-gpm/files/digest-selinux-gpm-20041110 create mode 100644 sec-policy/selinux-gpm/files/digest-selinux-gpm-20041128 rename sec-policy/selinux-gpm/{selinux-gpm-20041110.ebuild => selinux-gpm-20041128.ebuild} (84%) diff --git a/sec-policy/selinux-gpm/ChangeLog b/sec-policy/selinux-gpm/ChangeLog index b2a36a8c238f..2965e113fce2 100644 --- a/sec-policy/selinux-gpm/ChangeLog +++ b/sec-policy/selinux-gpm/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for sec-policy/selinux-gpm # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-gpm/ChangeLog,v 1.4 2004/11/13 19:51:56 kaiowas Exp $ +# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-gpm/ChangeLog,v 1.5 2004/12/12 12:20:32 kaiowas Exp $ + +*selinux-gpm-20041128 (12 Dec 2004) + + 12 Dec 2004; petre rodan + -selinux-gpm-20041110.ebuild, +selinux-gpm-20041128.ebuild: + trivial merge with upstream policy *selinux-gpm-20041110 (13 Nov 2004) diff --git a/sec-policy/selinux-gpm/files/digest-selinux-gpm-20041110 b/sec-policy/selinux-gpm/files/digest-selinux-gpm-20041110 deleted file mode 100644 index c2bcea7ac8f5..000000000000 --- a/sec-policy/selinux-gpm/files/digest-selinux-gpm-20041110 +++ /dev/null @@ -1 +0,0 @@ -MD5 ffe60e86518e5477665e05c748cf6192 selinux-gpm-20041110.tar.bz2 873 diff --git a/sec-policy/selinux-gpm/files/digest-selinux-gpm-20041128 b/sec-policy/selinux-gpm/files/digest-selinux-gpm-20041128 new file mode 100644 index 000000000000..fac62e289aa3 --- /dev/null +++ b/sec-policy/selinux-gpm/files/digest-selinux-gpm-20041128 @@ -0,0 +1 @@ +MD5 f7dbe6a8f2265da3776c38ee722df613 selinux-gpm-20041128.tar.bz2 862 diff --git a/sec-policy/selinux-gpm/selinux-gpm-20041110.ebuild b/sec-policy/selinux-gpm/selinux-gpm-20041128.ebuild similarity index 84% rename from sec-policy/selinux-gpm/selinux-gpm-20041110.ebuild rename to sec-policy/selinux-gpm/selinux-gpm-20041128.ebuild index 7444ef18b9da..575bf11396db 100644 --- a/sec-policy/selinux-gpm/selinux-gpm-20041110.ebuild +++ b/sec-policy/selinux-gpm/selinux-gpm-20041128.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-gpm/selinux-gpm-20041110.ebuild,v 1.1 2004/11/13 19:51:56 kaiowas Exp $ +# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-gpm/selinux-gpm-20041128.ebuild,v 1.1 2004/12/12 12:20:32 kaiowas Exp $ inherit selinux-policy -- 2.26.2