remove wrong ubuntu branding thanks to Paul <PLRCA2@gmail.com> in bug 153784

Package-Manager: portage-2.1.2_rc1-r2

diff --git a/net-print/gnome-cups-manager/ChangeLog b/net-print/gnome-cups-manager/ChangeLog
index 293e39127fadeeea130ed1efed46d72be2321eee..2e7c3f7a1aa0a50905f0e7361a16ac59b44ea3cb 100644 (file)
--- 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/Manifest b/net-print/gnome-cups-manager/Manifest
index 0a03b774d51de5e046a254e50f97b25c04934401..969474800bbe7b57c5cad8dfbc92e680512fed4a 100644 (file)
--- a/net-print/gnome-cups-manager/Manifest
+++ b/net-print/gnome-cups-manager/Manifest
@@ -9,18 +9,18 @@ EBUILD gnome-cups-manager-0.30.ebuild 894 RMD160 775974bdb9b8424f86642af105e8577
 MD5 cf99fca3122a87ef1f6a2414f7c2e2a8 gnome-cups-manager-0.30.ebuild 894
 RMD160 775974bdb9b8424f86642af105e85775f5d9625a gnome-cups-manager-0.30.ebuild 894
 SHA256 9cd3afa2fc2163d76750d671ed3d3f1d847311c07cb4c0e02ffbfe19ca1e4d1c gnome-cups-manager-0.30.ebuild 894
-EBUILD gnome-cups-manager-0.31-r1.ebuild 1688 RMD160 6a0931c825bda0aa0adda2e6b1926118c7996c09 SHA1 1f13c99d604d64934d75e67a79abac6f6aada2e7 SHA256 978f55f961fe51876f2939bc1164d96b2fc2008f8c4e87f2b6ae5aae8bf9b21a
-MD5 f95d89f821bb3bb755aa3962e029158f gnome-cups-manager-0.31-r1.ebuild 1688
-RMD160 6a0931c825bda0aa0adda2e6b1926118c7996c09 gnome-cups-manager-0.31-r1.ebuild 1688
-SHA256 978f55f961fe51876f2939bc1164d96b2fc2008f8c4e87f2b6ae5aae8bf9b21a gnome-cups-manager-0.31-r1.ebuild 1688
+EBUILD gnome-cups-manager-0.31-r1.ebuild 1827 RMD160 e4255c4cdfa118f2962d579ca6f0a48c9bc6131b SHA1 3814463a53a180166d03d5c5641a07ba8ecbf7a2 SHA256 8cacf6fcbe8527aca8171bb9bb03f3ca2bc0cd2581163788bb312f8577ffac06
+MD5 e27ab07977f4005a695911ac5fb82425 gnome-cups-manager-0.31-r1.ebuild 1827
+RMD160 e4255c4cdfa118f2962d579ca6f0a48c9bc6131b gnome-cups-manager-0.31-r1.ebuild 1827
+SHA256 8cacf6fcbe8527aca8171bb9bb03f3ca2bc0cd2581163788bb312f8577ffac06 gnome-cups-manager-0.31-r1.ebuild 1827
 EBUILD gnome-cups-manager-0.31.ebuild 1307 RMD160 ddbba332f1c432ab3c326b9ecd08208675450bc1 SHA1 f0b324e89a8a7ac5c712589d30114f95cb3296eb SHA256 f351ff3902d3658f80fc890cb384bdf2275a384b74fd7c545c9298ea5253f596
 MD5 48137bfc45f2b2e91b682e1184e5975e gnome-cups-manager-0.31.ebuild 1307
 RMD160 ddbba332f1c432ab3c326b9ecd08208675450bc1 gnome-cups-manager-0.31.ebuild 1307
 SHA256 f351ff3902d3658f80fc890cb384bdf2275a384b74fd7c545c9298ea5253f596 gnome-cups-manager-0.31.ebuild 1307
-MISC ChangeLog 7562 RMD160 67e21e8812e361a1e3854aaf01cd4ed72e846218 SHA1 82e7ffce5300d8322f302ea65e8a2439782b89b6 SHA256 24bafbe30da7af1264f4a73cb69186dd912a65b033d19a2ae9b15c97cec01df9
-MD5 8334c7daa770d5bd0b9927f2c662859e ChangeLog 7562
-RMD160 67e21e8812e361a1e3854aaf01cd4ed72e846218 ChangeLog 7562
-SHA256 24bafbe30da7af1264f4a73cb69186dd912a65b033d19a2ae9b15c97cec01df9 ChangeLog 7562
+MISC ChangeLog 7731 RMD160 68361b8629c5c4d53cf3f8a17528a6ef02fefdb1 SHA1 c018acd2901e28e9925cde7ef194eab7e8640cd5 SHA256 5830463a70cadd700cf2712ce875d9bf09d0485177134f82af4ccc0137002e39
+MD5 dc3a03cdb6644c86a0726ea5f534fca7 ChangeLog 7731
+RMD160 68361b8629c5c4d53cf3f8a17528a6ef02fefdb1 ChangeLog 7731
+SHA256 5830463a70cadd700cf2712ce875d9bf09d0485177134f82af4ccc0137002e39 ChangeLog 7731
 MISC metadata.xml 180 RMD160 082aa46c6fe033d8548d5351c7073d98a11e952b SHA1 f006fd73fec1f95de0831e1d942d6078620fe43f SHA256 21576b6f9d195cfd7a7f38ef661ffad9e39e979c1c98c9af12ce85398fc133a9
 MD5 574309004015c52c39e2f4e8122c18a3 metadata.xml 180
 RMD160 082aa46c6fe033d8548d5351c7073d98a11e952b metadata.xml 180

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 813e5d108b2bbe52c1e1690af026438e32b57302..7e790c5545f470d62f840b69617b2fe559b1a86d 100644 (file)
--- 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