diff options
| author |   Stefan Schweizer <genstef@gentoo.org> | 2006-11-16 21:45:42 +0000 |
|---|---|---|
| committer | Stefan Schweizer <genstef@gentoo.org> | 2006-11-16 21:45:42 +0000 |
| commit | 1ed024417f911b6d84c87663bc030834fda85483 (patch) | |
| tree | f7ed5d5f4b291f7b84631c8bb6fc7f5ec75733b6 /net-print | |
| parent | Removed RESTRICT declaration since tests have been disabled upstream (diff) | |
| download | gentoo-2-1ed024417f911b6d84c87663bc030834fda85483.tar.gz gentoo-2-1ed024417f911b6d84c87663bc030834fda85483.tar.bz2 gentoo-2-1ed024417f911b6d84c87663bc030834fda85483.zip | |
Fix bug 147972 by removing the non working parts of the patch thanks to Greg Watson (linuxkrn)
(Portage version: 2.1.2_rc1-r7)
Diffstat (limited to 'net-print')
| -rw-r--r-- | net-print/gnome-cups-manager/ChangeLog | 7 | ||||
| -rw-r--r-- | net-print/gnome-cups-manager/gnome-cups-manager-0.31-r1.ebuild | 7 |
2 files changed, 12 insertions, 2 deletions
diff --git a/net-print/gnome-cups-manager/ChangeLog b/net-print/gnome-cups-manager/ChangeLog index 2e7c3f7a1aa0..08e7d63b08a0 100644 --- a/net-print/gnome-cups-manager/ChangeLog +++ b/net-print/gnome-cups-manager/ChangeLog @@ -1,6 +1,11 @@ # 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.56 2006/11/02 07:07:43 genstef Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-print/gnome-cups-manager/ChangeLog,v 1.57 2006/11/16 21:45:42 genstef Exp $ + + 16 Nov 2006; Stefan Schweizer <genstef@gentoo.org> + gnome-cups-manager-0.31-r1.ebuild: + Fix bug 147972 by removing the non working parts of the patch thanks to Greg + Watson (linuxkrn) 02 Nov 2006; Stefan Schweizer <genstef@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 8c8b9b14585e..82d8b7ee2b30 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.5 2006/11/12 04:54:16 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-print/gnome-cups-manager/gnome-cups-manager-0.31-r1.ebuild,v 1.6 2006/11/16 21:45:42 genstef Exp $ inherit eutils gnome2 flag-o-matic @@ -49,6 +49,11 @@ src_unpack() { mkdir ${WORKDIR}/ubuntu cd ${WORKDIR}/ubuntu cp -r ${S}/{po,ChangeLog,gnome-cups-manager} . + # Remove the ubuntu functions that require external + # scripts fixing bug 147972 (removes LAN browsing detection) + sed -i \ + -e '/^---.*ui_browse_share_ctl.patch/,/^---/{/^---.*ui_browse_share_ctl.patch/!d;}' \ + ${WORKDIR}/gnome-cups-manager_0.31-1.1ubuntu14.diff 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 |