trivial merge with upstream policy

diff --git a/sec-policy/selinux-gpm/ChangeLog b/sec-policy/selinux-gpm/ChangeLog
index b2a36a8c238ff30834f9a6b38e9c0e26c08575bd..2965e113fce2fbfb1453a04ad3f8b0afe5b2068e 100644 (file)
--- 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 <kaiowas@gentoo.org>
+  -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 (file)
index c2bcea7..0000000
--- 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 (file)
index 0000000..fac62e2
--- /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 7444ef18b9daf98ac711d01647a11656c0f1f100..575bf11396dbd767a1a166affb8cad492e7acc9a 100644 (file)
--- 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