summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJim Ramsay <lack@gentoo.org>2007-02-09 17:31:44 +0000
committerJim Ramsay <lack@gentoo.org>2007-02-09 17:31:44 +0000
commit56da625c8a806de47c781d5109cc754b1a8bc4b7 (patch)
tree7303d3537a9be7aa65864c830fd60d45075e8f0c /rox-base/pager
parentChanged .desktop and /usr/bin/wrapper names to avoid collisions (diff)
downloadgentoo-2-56da625c8a806de47c781d5109cc754b1a8bc4b7.tar.gz
gentoo-2-56da625c8a806de47c781d5109cc754b1a8bc4b7.tar.bz2
gentoo-2-56da625c8a806de47c781d5109cc754b1a8bc4b7.zip
Fixed filename collision with x11-wm/afterstep (Bug 165956)
(Portage version: 2.1.2-r8)
Diffstat (limited to 'rox-base/pager')
-rw-r--r--rox-base/pager/ChangeLog11
-rw-r--r--rox-base/pager/files/digest-pager-1.0.1-r1 (renamed from rox-base/pager/files/digest-pager-1.0.1)0
-rw-r--r--rox-base/pager/files/digest-pager-1.1-r1 (renamed from rox-base/pager/files/digest-pager-1.1)0
-rw-r--r--rox-base/pager/pager-1.0.1-r1.ebuild (renamed from rox-base/pager/pager-1.0.1.ebuild)5
-rw-r--r--rox-base/pager/pager-1.1-r1.ebuild (renamed from rox-base/pager/pager-1.1.ebuild)5
5 files changed, 15 insertions, 6 deletions
diff --git a/rox-base/pager/ChangeLog b/rox-base/pager/ChangeLog
index 43cdaae1636b..03b51e2ad37a 100644
--- a/rox-base/pager/ChangeLog
+++ b/rox-base/pager/ChangeLog
@@ -1,6 +1,13 @@
# ChangeLog for rox-base/pager
-# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/rox-base/pager/ChangeLog,v 1.11 2006/11/27 19:10:49 lack Exp $
+# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/rox-base/pager/ChangeLog,v 1.12 2007/02/09 17:31:44 lack Exp $
+
+*pager-1.1-r1 (09 Feb 2007)
+*pager-1.0.1-r1 (09 Feb 2007)
+
+ 09 Feb 2007; Jim Ramsay <lack@gentoo.org> -pager-1.0.1.ebuild,
+ +pager-1.0.1-r1.ebuild, -pager-1.1.ebuild, +pager-1.1-r1.ebuild:
+ Fixed filename collision with x11-wm/afterstep (Bug 165956)
*pager-1.1 (27 Nov 2006)
diff --git a/rox-base/pager/files/digest-pager-1.0.1 b/rox-base/pager/files/digest-pager-1.0.1-r1
index 90030a1d7ee4..90030a1d7ee4 100644
--- a/rox-base/pager/files/digest-pager-1.0.1
+++ b/rox-base/pager/files/digest-pager-1.0.1-r1
diff --git a/rox-base/pager/files/digest-pager-1.1 b/rox-base/pager/files/digest-pager-1.1-r1
index f4cd25562610..f4cd25562610 100644
--- a/rox-base/pager/files/digest-pager-1.1
+++ b/rox-base/pager/files/digest-pager-1.1-r1
diff --git a/rox-base/pager/pager-1.0.1.ebuild b/rox-base/pager/pager-1.0.1-r1.ebuild
index 28dac0b0c861..bacfe65f4369 100644
--- a/rox-base/pager/pager-1.0.1.ebuild
+++ b/rox-base/pager/pager-1.0.1-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/rox-base/pager/pager-1.0.1.ebuild,v 1.8 2006/11/20 18:11:40 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/rox-base/pager/pager-1.0.1-r1.ebuild,v 1.1 2007/02/09 17:31:44 lack Exp $
inherit rox eutils
@@ -20,6 +20,7 @@ DEPEND="${RDEPEND}
>=dev-util/pkgconfig-0.20"
APPNAME=Pager
+APPNAME_COLLISION=True
src_unpack() {
unpack ${A}
diff --git a/rox-base/pager/pager-1.1.ebuild b/rox-base/pager/pager-1.1-r1.ebuild
index 8b346e894105..d75225fc9d05 100644
--- a/rox-base/pager/pager-1.1.ebuild
+++ b/rox-base/pager/pager-1.1-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/rox-base/pager/pager-1.1.ebuild,v 1.2 2006/11/27 19:12:09 lack Exp $
+# $Header: /var/cvsroot/gentoo-x86/rox-base/pager/pager-1.1-r1.ebuild,v 1.1 2007/02/09 17:31:44 lack Exp $
ROX_CLIB_VER=2.1.7
inherit rox eutils
@@ -20,4 +20,5 @@ DEPEND="${RDEPEND}
>=dev-util/pkgconfig-0.20"
APPNAME=Pager
+APPNAME_COLLISION=True