diff options
| author | Alexey 'alexxy' Shvetsov <alexxy@gentoo.ru> | 2008-09-28 22:47:58 +0400 |
|---|---|---|
| committer | Alexey 'alexxy' Shvetsov <alexxy@gentoo.ru> | 2008-09-28 22:47:58 +0400 |
| commit | 785fc721dff0f254282dd30b8be7ef11eac88b40 (patch) | |
| tree | 01df4abfa15c1bea1d02f86a89ed26f8aaaccd71 | |
| parent | b78e26303651a3ff276fd15b8c6b5e31212c4743 (diff) | |
| download | kde-785fc721dff0f254282dd30b8be7ef11eac88b40.tar.gz kde-785fc721dff0f254282dd30b8be7ef11eac88b40.tar.bz2 kde-785fc721dff0f254282dd30b8be7ef11eac88b40.zip | |
update manifest
| -rw-r--r-- | kde-base/kdebase-startkde/Manifest | 19 |
1 files changed, 2 insertions, 17 deletions
diff --git a/kde-base/kdebase-startkde/Manifest b/kde-base/kdebase-startkde/Manifest index d68f0e2bf7b..a9509f7edbd 100644 --- a/kde-base/kdebase-startkde/Manifest +++ b/kde-base/kdebase-startkde/Manifest @@ -1,24 +1,9 @@ AUX agent-shutdown.sh 323 RMD160 9a0451c1e58e688c022ecd2b37f08cac433b187d SHA1 1abb7a1503a80d95e4db34fa7fe58accce6e8109 SHA256 6a2d645ef38d3db9d36166fac699848d07eb166f71a646d7f1466efeb394eb11 AUX agent-startup.sh 955 RMD160 bbe8abb4734bb7364edc45265b10ae2a2887db66 SHA1 f7dfd044b6f09e5ad0f04842e51c7f9e62fad718 SHA256 c63fd6233b1711ede4fbb5b30460c5b1ddee840f0f5123db953ee3ab298da8f9 -<<<<<<< HEAD:kde-base/kdebase-startkde/Manifest -<<<<<<< HEAD:kde-base/kdebase-startkde/Manifest -<<<<<<< HEAD:kde-base/kdebase-startkde/Manifest -AUX gentoo-startkde4.patch 1631 RMD160 1e10f6184cd0daa5249bf4aa4396cf0d9537c121 SHA1 e6658fd41f3bfae229e6f39c97ad3b301b8b41df SHA256 631c9db91219bd6e716b2d9e514e24bb8f39a69521ccf48894913850adfa855a +AUX gentoo-startkde4.patch 2183 RMD160 2a60c1ca52d5a578bbe610b1912c76a37895da64 SHA1 bd78a9d592992adff4b0abbc4203a99375a617d8 SHA256 a1a7365b3d8b0a0438e8eca2d630ad037a89176fe8ee3e8d8b460efb9afc2bd5 DIST kdebase-workspace-4.1.1.tar.bz2 47473442 RMD160 d6736a4c4f7be1e3d3c74911781f1454675910c8 SHA1 5ffc3ab2cf6a79fb577bda362783219b3859388a SHA256 47637b68405e75f13281bc88c94b7502c3d7b0097bf0a057625c76cc6e7233dd DIST kdebase-workspace-4.1.67.tar.bz2 48344468 RMD160 20b1b3c1ff336b9ab5bfb4d96c3744bdd06675fa SHA1 eed4b30575289289c095ac817aa6c61152865306 SHA256 2cadd7ddc8d7b5ffbeceeafcc918ac5531c6a30e2d617814b7a1a6ca4d448672 EBUILD kdebase-startkde-4.1.1.ebuild 3215 RMD160 afb96690be67d63442ab516b2c21012ae65594df SHA1 f57cbcc0543122be53aab3f9029cc3ecdc792a5c SHA256 f1c7d7739f0736914f61611edcfaeac0a5834984488feb390521f5c4a659e616 -EBUILD kdebase-startkde-4.1.67.ebuild 3215 RMD160 afb96690be67d63442ab516b2c21012ae65594df SHA1 f57cbcc0543122be53aab3f9029cc3ecdc792a5c SHA256 f1c7d7739f0736914f61611edcfaeac0a5834984488feb390521f5c4a659e616 +EBUILD kdebase-startkde-4.1.67.ebuild 3777 RMD160 61fcde9a5cd5d59b7fe91feb2ad9401c572d99cf SHA1 20fef3aea74dfd542e293762827f47b7a09b46c3 SHA256 ca7284f14c4072ff318d901426cbfda3d1b71de8c96dd2cc73c06dd825107898 MISC ChangeLog 1630 RMD160 49b523969bab8709963269a3eeddc51d09d1422f SHA1 a477e5f4236908565859e04021eb6056cc7f7f4a SHA256 a723230c15f95012f526122c3f8b8d0b820ea3ba908558baa5c029ab2f15e4cf -======= -AUX gentoo-startkde4.patch 1569 RMD160 52c3a8b948b3a651e6c46de5f0ea5509f6f57c35 SHA1 07b0fa7b370a13494bc095b418fab8ec3f8226a5 SHA256 023aafe5c257ff544ca13417fa3e2cb2fca3dbfd141c79f09a064c035bbd4ef7 -======= -AUX gentoo-startkde4.patch 1556 RMD160 d540f89a7677322e891782d7573ddbd1cf9ad367 SHA1 d47d0041138dae724e8e5161424d83b5ea35e225 SHA256 1c55320c6c3cdb498a8423d4f4a9d541290f37fe4bd05f972748bd961ea8c11f ->>>>>>> cb1b53b... Improvements to the startkde script - thanks to Matthias Dahl for some of the improved sed commands.:kde-base/kdebase-startkde/Manifest -======= -AUX gentoo-startkde4.patch 2183 RMD160 2a60c1ca52d5a578bbe610b1912c76a37895da64 SHA1 bd78a9d592992adff4b0abbc4203a99375a617d8 SHA256 a1a7365b3d8b0a0438e8eca2d630ad037a89176fe8ee3e8d8b460efb9afc2bd5 ->>>>>>> fb29934... Use same fix on kdebase-startkde as in master branch:kde-base/kdebase-startkde/Manifest -DIST kdebase-workspace-4.1.2.tar.bz2 47500082 RMD160 7491748580f3f40e4646a28af8f64caccc919bdd SHA1 46a2c14edfca05deb271a047bed292f7d71b8c5b SHA256 4d3273c7e1bb767136e9f4e8eb8717489d4d36eaa0fbd7d391515760d28cb804 -EBUILD kdebase-startkde-4.1.2.ebuild 3777 RMD160 61fcde9a5cd5d59b7fe91feb2ad9401c572d99cf SHA1 20fef3aea74dfd542e293762827f47b7a09b46c3 SHA256 ca7284f14c4072ff318d901426cbfda3d1b71de8c96dd2cc73c06dd825107898 -MISC ChangeLog 1823 RMD160 1f79f934354ec67a3423a224e5a708ff7177e6f1 SHA1 7128522d12f2c815c71ac320a8250b9897353daf SHA256 4e37be141177d7b9d5df496203a7624178faabfa76276bd6e9a4d4e4452b38cc ->>>>>>> 09723ee... Update patch for kdebase-startkde.:kde-base/kdebase-startkde/Manifest MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a |