diff options
| author |   Alexandre Rostovtsev <tetromino@gentoo.org> | 2013-03-31 04:18:09 +0000 |
|---|---|---|
| committer | Alexandre Rostovtsev <tetromino@gentoo.org> | 2013-03-31 04:18:09 +0000 |
| commit | 011d79fc05f61d7136b5ddcd4a412a3775e26699 (patch) | |
| tree | 77a0aad22866921faa4a0a05523c2022b77a8d96 /dev-util/meld | |
| parent | Version bump, see http://www.winehq.org/announce/1.5.27 for the announcement. (diff) | |
| download | historical-011d79fc05f61d7136b5ddcd4a412a3775e26699.tar.gz historical-011d79fc05f61d7136b5ddcd4a412a3775e26699.tar.bz2 historical-011d79fc05f61d7136b5ddcd4a412a3775e26699.zip | |
Fix .desktop file sed.
Package-Manager: portage-2.2.0_alpha170/cvs/Linux x86_64
Manifest-Sign-Key: 0xCF0ADD61
Diffstat (limited to 'dev-util/meld')
| -rw-r--r-- | dev-util/meld/ChangeLog | 5 | ||||
| -rw-r--r-- | dev-util/meld/Manifest | 14 | ||||
| -rw-r--r-- | dev-util/meld/meld-1.7.1.ebuild | 7 |
3 files changed, 16 insertions, 10 deletions
diff --git a/dev-util/meld/ChangeLog b/dev-util/meld/ChangeLog index 1aa42c060c6d..492ae2e6041e 100644 --- a/dev-util/meld/ChangeLog +++ b/dev-util/meld/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for dev-util/meld # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/meld/ChangeLog,v 1.162 2013/03/30 21:27:48 eva Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/meld/ChangeLog,v 1.163 2013/03/31 04:18:04 tetromino Exp $ + + 31 Mar 2013; Alexandre Rostovtsev <tetromino@gentoo.org> meld-1.7.1.ebuild: + Fix .desktop file sed. *meld-1.7.1 (30 Mar 2013) diff --git a/dev-util/meld/Manifest b/dev-util/meld/Manifest index ad1a681880af..85f284514a04 100644 --- a/dev-util/meld/Manifest +++ b/dev-util/meld/Manifest @@ -6,13 +6,17 @@ DIST meld-1.7.0.tar.xz 358648 SHA256 d355dba06a39e38ffee93a6b205888db648a0308bc8 DIST meld-1.7.1.tar.xz 374060 SHA256 c5dc21d32405a520cc7969f4de9e2ea356cb0e950fc5a20a9053230313ff3a40 SHA512 0d30a14eb3a5c9dd6c8ad6d622e2610a49f019f0e031d5f3e8635f034701fd275003e0b0a92e5fad0813f5b925826ff2c317fb9485a354dd6ff282a9439edf7b WHIRLPOOL 066a5e5e8b0ea63a75c0a3bf813b7de2e062e2a97b5865400a7ccddc8b9d8cb089fa3e7139d494d30acdd1abcf303c4195dbff60f9ac406b509dc6cd2edd2580 EBUILD meld-1.6.0.ebuild 2170 SHA256 bc9f3432ea8e3fbd70e5bc85dd2a92537eb947531c791c79377cb4d6c1f73608 SHA512 3b47b28ecd938e275179b410fb05e1662c054142623a39b4d77d8d918e0408d9694440d7673fcd5f323e22bb1a75fe515e7e02d2e5a1cec21a4acd5d5a38469f WHIRLPOOL 0ba136fc28122740179166ef2911c17012e2845c50a21ca33aa3bb69f891ba538c1cbc2457344406cc7abaa9c660a83476254a2efdee8b167525604dea15310a EBUILD meld-1.7.0.ebuild 2402 SHA256 ea03e6995fcde3fa37134bcae8ab8f3b960b2f6daa50e27c1d271e5f21da6a0e SHA512 49d29055a6fdd68d4e8ccadede81abe7c1ce1ba84a5a76ade3decf5a8b601e1beaa7869b37a518f27155cef874f467bbc8b3cd7879eefdca685f8135a8814ce8 WHIRLPOOL e2072ed29a4c87030fb3fe8edb5341ce22da106aea0d5d8354c419100891ef5034fed965b35d189fb50e061f9e7bc6c3010a7c110849e627e31f6c592eb3bb0f -EBUILD meld-1.7.1.ebuild 2122 SHA256 af75de9f794a1b7af9ad7f924e8af37520abdfb63c370c31d846f6785da925ac SHA512 db58f9e9d586fefff87600700318eb8c9fad7ccda07ef03511708a65380e3186c23985772b94aa57e0e0b0338d26e36f07cb3f37d64c7a54100379c0c99f9439 WHIRLPOOL 95ae2d731e5cac2f30c53d3bad3699af1dd695e96fb87118ee2c77e579bbdc239ac410b6fe022f846a3bc968ca01c843bdb843e5ac2ebfe3f7356b5227c4bb23 -MISC ChangeLog 20795 SHA256 2f6ab4cb0109c37a8656484168cd45186a041d0df171f0209eb0817b064769b0 SHA512 bf0b58d55b69fa4adb0015554f0af7e773257c75b91aeb13943bc814066e063fec0cf499a0752c2060c7b78ab2cceaa686a30f1f0cf4ef978cc7dc142662ac4a WHIRLPOOL 3b380230f1db405a5326711f4fba1c820042a728933c73d983050d5ebd194de94de5b83f30f58a78cc1607375de2ee10f1c95a86195650ff5ebc90e5fc62b918 +EBUILD meld-1.7.1.ebuild 2088 SHA256 ce46e1541936b75e9d09db7f91271d3ce6ce7d432b0180f1e110469211a410f6 SHA512 d2ac96ab5823518a1a18d03367711a8e227224fd9a2eef9aa585336771af79fe5ff8b5397bd557c2fb611e47e8ecc599efdeecb252a1df765fc53be5edebb197 WHIRLPOOL c1eee17ca941948fe9feec41e3573c43fe062f9d8fa331d798ca0bbfa1e81b6070b32a8a9a65715fa82c9e8fe7c706454512f8168f7bdeb18890dd5a1c7dad7e +MISC ChangeLog 20905 SHA256 fc1072d40a5a28bfbca7124eb85c4f9a52cf8bc7af72a8470efd22a7f24bcc12 SHA512 27a81bb779abf294d3a5bd529e8b4fc05ab538b9d575a9a49952a55b831f9859d84eac3fad6b722d9c3b01836849216640d6b47ebc8d767391c3a7f279cca83a WHIRLPOOL 94c23cc4ef1995cdd82aa8211e62361c751328470f8a61861d85423932f46e02f562f685e2379779142c8a7842b1c8c41dbafdf3bd1af9f68153dd1cbcbe164a MISC metadata.xml 283 SHA256 0fbb5afcdbbb0980cb65746202badd7e7712ab658562b787d989a859db9eb46c SHA512 3ba747ef8e1cacacef316e87a7bc2f01fd011b6ae307482c7a6d9dc4b648e2f041fa7ead915feb8cee1157f03dfc4f543624e352d81c17c481624852751ecb7c WHIRLPOOL 018ea24d01bf24185ed27de07b5aa143437625d0aa2bbd05bdd313854b7f865151d8d24bd1e87ecb5da441795d21d3783a0a3893f0baa5a0dbab0ab0ff5e74bd -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (GNU/Linux) -iEYEAREIAAYFAlFXWNUACgkQ1fmVwcYIWAbi5QCfYSiMCYSqYgqiZPBfdJvipO0G -eEgAnAkXXyIhdkZwhg8/oRBhhaPL8itF -=UtAW +iQEcBAEBCAAGBQJRV7j9AAoJEJ0WA1zPCt1hfWYH/Ro+U+PZpCE2KUomrUWhhCoV +cx4LWiSPC+FlGNpwNz0oj3H2DiBw0ehVmqTvqh2JIsoo9jv4YdEfJRjQDY5kcQXg +hjzq5jHDSsUm+UQHuslxPMwMJfpfbBRpgscMHzzh+jX1VpnRzbhaiKK5z70+7OTW +wFLoaXZi2Yj5gbTWd1hUwHaFKiirQFx0QovmeA4F8ldp59VkGPfvYE/CHkACaH99 +V+dZfIl/IKIJCYkncCiYg1nht7g8bseJcFe/p7QMLl22bKrn/fghT0H3WqMaYYe4 +ZaSth3NwuNjjBY51hyIA2A9cV0Uqule/qS5ZRrNhaJYCZ2SIVDeik2kJR+BbFDk= +=AAs4 -----END PGP SIGNATURE----- diff --git a/dev-util/meld/meld-1.7.1.ebuild b/dev-util/meld/meld-1.7.1.ebuild index 17f1eaad656c..8a367cfdaf15 100644 --- a/dev-util/meld/meld-1.7.1.ebuild +++ b/dev-util/meld/meld-1.7.1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/meld/meld-1.7.1.ebuild,v 1.1 2013/03/30 21:27:48 eva Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/meld/meld-1.7.1.ebuild,v 1.2 2013/03/31 04:18:04 tetromino Exp $ EAPI="5" GCONF_DEBUG="no" @@ -62,9 +62,8 @@ src_prepare() { -i po/Makefile || die "sed 6 failed" fi - # Fix .desktop entry, upstream bug #686978 - sed -e '/Encoding/d' \ - -e 's/(MimeType.*)/\1/' \ + # Fix .desktop entry + sed -e 's/\(MimeType.*\)/\1;/' \ -i data/meld.desktop.in || die gnome2_src_prepare |