summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Schweizer <genstef@gentoo.org>2006-11-02 07:07:43 +0000
committerStefan Schweizer <genstef@gentoo.org>2006-11-02 07:07:43 +0000
commit6068a2165070a80ef69693db152beaa286b46b1d (patch)
treecbed4f6a79772aa094bd0cbc8016452b31c2f0b2 /net-print/gnome-cups-manager
parentUpdate snapshots. (diff)
downloadgentoo-2-6068a2165070a80ef69693db152beaa286b46b1d.tar.gz
gentoo-2-6068a2165070a80ef69693db152beaa286b46b1d.tar.bz2
gentoo-2-6068a2165070a80ef69693db152beaa286b46b1d.zip
remove wrong ubuntu branding thanks to Paul <PLRCA2@gmail.com> in bug 153784
(Portage version: 2.1.2_rc1-r2)
Diffstat (limited to 'net-print/gnome-cups-manager')
-rw-r--r--net-print/gnome-cups-manager/ChangeLog6
-rw-r--r--net-print/gnome-cups-manager/gnome-cups-manager-0.31-r1.ebuild10
2 files changed, 12 insertions, 4 deletions
diff --git a/net-print/gnome-cups-manager/ChangeLog b/net-print/gnome-cups-manager/ChangeLog
index 293e39127fad..2e7c3f7a1aa0 100644
--- a/net-print/gnome-cups-manager/ChangeLog
+++ b/net-print/gnome-cups-manager/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for net-print/gnome-cups-manager
# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/gnome-cups-manager/ChangeLog,v 1.55 2006/10/03 23:18:29 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/gnome-cups-manager/ChangeLog,v 1.56 2006/11/02 07:07:43 genstef Exp $
+
+ 02 Nov 2006; Stefan Schweizer <genstef@gentoo.org>
+ gnome-cups-manager-0.31-r1.ebuild:
+ remove wrong ubuntu branding thanks to Paul <PLRCA2@gmail.com> in bug 153784
03 Oct 2006; Aron Griffis <agriffis@gentoo.org>
gnome-cups-manager-0.31-r1.ebuild:
diff --git a/net-print/gnome-cups-manager/gnome-cups-manager-0.31-r1.ebuild b/net-print/gnome-cups-manager/gnome-cups-manager-0.31-r1.ebuild
index 813e5d108b2b..7e790c5545f4 100644
--- a/net-print/gnome-cups-manager/gnome-cups-manager-0.31-r1.ebuild
+++ b/net-print/gnome-cups-manager/gnome-cups-manager-0.31-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/gnome-cups-manager/gnome-cups-manager-0.31-r1.ebuild,v 1.3 2006/10/03 23:18:29 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/gnome-cups-manager/gnome-cups-manager-0.31-r1.ebuild,v 1.4 2006/11/02 07:07:43 genstef Exp $
inherit eutils gnome2 flag-o-matic
@@ -45,11 +45,15 @@ DOCS="ChangeLog NEWS README"
src_unpack() {
gnome2_src_unpack
- cd ${S}
+ # exclude ubuntu branding
+ mkdir ${WORKDIR}/ubuntu
+ cd ${WORKDIR}/ubuntu
+ cp -r ${S}/{po,ChangeLog,gnome-cups-manager} .
epatch ${WORKDIR}/gnome-cups-manager_0.31-1.1ubuntu14.diff
# gksudo does not always work
sed -i "s:gksudo:gksu:" debian/patches/change-su-command.patch
- epatch debian/patches/*
+ cd ${S}
+ epatch ${WORKDIR}/ubuntu/debian/patches/*
# bug 141929
use amd64 && replace-flags -O* -O0