Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
60,059 Commits 9 Branches 0 Tags 473 MiB
f64ef4a3fd
Commit Graph

743 Commits

Author SHA1 Message Date
Jérôme Duval
4107ac9cda Cleanup of remains of subversion in the build system 2012-10-30 22:36:32 +01:00
Jérôme Duval
0d6a077db2 Development: don't link to libs with minor version numbers 
This change should be backported to alpha4 (without the zlib part).
 2012-10-30 22:18:42 +01:00
Jérôme Duval
a6a99fce04 zlib: added an optional build package, integrated to the build 
* optional package for zlib 1.2.7
* keep zlib in build for the bootloader tarfs
 2012-10-30 21:50:24 +01:00
Siarzhuk Zharski
bf855d3754 sys/xattr.h should be installed under 3rdparty instead of gnu directory 2012-10-25 20:47:18 +02:00
Joseph R. Prostko
fd720fd2da Update the GCC4 optional package...yes, again 
* This package is current as of btrev43040
* Primarily did this rebuild to assure the GCC4 package was made with the latest buildtool sources
* This invalidates the need to cherry pick hrev44704 for R1A4
+alpha4
 2012-10-19 17:29:24 -04:00
Joseph R. Prostko
cb8f90c0c8 Update Perl 5.10.1 GCC4 package for R1A4 
* After the SSP fix committed recently for GCC, Perl can now build again correctly
+alpha4
 2012-10-17 13:30:12 -04:00
Joseph R. Prostko
02a7951ec0 Update GCC4 package 
* This package is smaller in size than the previous due to the fix in btrev43038
* This package addresses issue building code with SSP due to fix in btrev43039
* This commit along with btrev43039 fixes #8931
+alpha4 (and hopefully last update to GCC before R1A4 release)
 2012-10-17 08:15:23 -04:00
Joseph R. Prostko
e7defb0055 Update GCC2 and GCC4 optional packages for R1A4 
* GCC4 was updated to GCC 4.6.3 to fix ICE issue while building natively
+ alpha4
 2012-10-12 20:21:12 -04:00
Scott McCreary
e8a905efef Fixed typo 2012-10-02 19:23:13 -07:00
Scott McCreary
ae978eb9ca Updated caya to r279 2012-10-02 08:08:03 -07:00
Scott McCreary
2cf4bb44cf Fix typo. 2012-10-01 23:27:42 -07:00
Scott McCreary
6687d08375 Updated r1a4 builds for a few OptionalPackages 2012-10-01 23:23:01 -07:00
Humdinger
dfefaf1514 Extract demo packages to /boot. Added image package. 2012-09-22 12:32:22 +02:00
Matt Madia
244fb0a393 Rebuilt BeZillaBrowser (for libjpeg update). 
Note: This is not for the r1alpha4 branch. That will come later.
 2012-09-21 19:38:12 +00:00
Matt Madia
5114fc1dd3 Ensure that wpa_supplicant does not get stripped. See #8603 for history. 2012-09-16 19:45:44 -04:00
Scott McCreary
c2ff7a30e3 Add OptionalPackage Droid, font from Google's Android project 2012-09-13 20:25:40 -07:00
Scott McCreary
4f444fab2e Add OptionalPackage Nanumfont, a Korean monospace font 2012-09-13 20:10:00 -07:00
Scott McCreary
8e77147bfc Rebuilt some more packages mostly to fix directory issues. 2012-09-12 22:48:04 -07:00
Jérôme Duval
ce14ea0c3e DevelopmentMin optional package: add 3rdparty headers 
* Add freetype, libpng and jpeg headers
 2012-09-12 22:12:32 +02:00
Scott McCreary
30aeebc716 Rebuilf beam and transmission gcc4 packages 2012-09-11 23:45:07 -07:00
Scott McCreary
554fe146cb Updated several more OptionalPackages 2012-09-11 23:45:06 -07:00
Scott McCreary
d9cfdbd1e9 Fix typo 2012-09-04 21:38:00 -07:00
Scott McCreary
aa8be1fc17 Update several more packages for R1A4 2012-09-04 21:19:22 -07:00
John Scipione
e85dfa6bad Update optional package for Colors! 2012-09-03 17:23:06 -04:00
Matt Madia
cd9b8bf005 FIXED the urls of several optional packages. 2012-09-02 17:29:13 +00:00
Rene Gollent
fb5ef78df0 Slight cleanup. Fix missing separator in texinfo path. 2012-08-31 20:34:56 -04:00
Scott McCreary
61306f15a1 Rebuilt many OptionalPackages for R1A4 2012-08-31 00:14:57 -07:00
Jérôme Duval
61cb4d8c6d libpng and jpeg: build against optional packages. 
* added optional feature package for libpng 1.5.12 gcc4/gcc2 x86 and ppc
* drop libpng sources and headers from the tree.
* added optional feature package for jpeg 8d gcc4/gcc2 x86 and ppc
* drop jpeg sources and headers from the tree.
 2012-08-27 22:03:18 +02:00
Joseph R. Prostko
f49d27c7ed Allow Puri to be added to GCC2 hybrid builds 2012-08-21 22:20:13 -04:00
Alex Smith
4591ebc99a Fixes for building Haiku x86_64 from itself. 2012-08-18 19:57:46 +01:00
Alex Smith
aecb9567e3 Rebuilt flex package for x86_64. 
The original package was cross-compiled to Haiku, turns out flex's
build system uses paths to stuff from the host system, so the package
was broken. Rebuilt from Haiku.
 2012-08-18 19:07:25 +01:00
Scott McCreary
b9398be907 Added chess game Puri as an OptionalPackage 2012-08-17 05:33:02 -07:00
Matt Madia
467f607aa3 Add WebPositive catalogs to gcc2hybrid images. Fixes #8846. 2012-08-18 10:33:39 -04:00
Alex Smith
3bf3aa2e2c Added the rest of the basic development packages. 
Added autoconf, automake, libtool, texinfo, perl, gettext and nano.
Building an image with the nightly targets should give you an image
with these included.
 2012-08-17 13:03:31 +01:00
Alex Smith
e688bf23d4 Merge branch 'master' into x86_64 
Conflicts:
	src/servers/app/ServerWindow.cpp
 2012-08-16 21:11:15 +01:00
Alex Smith
602d9c96a5 Added some of the development optional packages. 
This adds some of the development packages for x86_64. All of the
DevelopmentBase packages (gcc, make, jam, bison, flex, m4, mkdepend)
have been built and uploaded.
 2012-08-16 20:32:29 +01:00
Rene Gollent
ebe79dfe77 Added GCC4 packages of liblayout, BePDF and Beam. 
Provided by Chris Roberts. Thanks!
 2012-08-12 16:01:50 -04:00
Alex Smith
666b46e2e3 Added libbe, ICU and consoled to the image. 
The boot script now launches consoled instead if app_server does not
exist, so there is now an interactive Bash prompt! libbe requires ICU,
which is an optional package, so I've built the packages and they've
been uploaded to haiku-files.org (thanks umccullough).
 2012-07-30 21:42:49 +01:00
Scott McCreary
dc321a67d6 Fixed pair of typos in hgrep script. 2012-07-23 22:23:41 +00:00
Scott McCreary
2c1dcd1fee Added hgrep and lgrep as OptionalPackages, this fixes #3376. 2012-07-23 21:52:41 +00:00
Rene Gollent
0b4ae86086 Fix #8751 and possibly also #7198. 
- The cdrecord port was using the wrong path for searching for SCSI
  devices. This led to it failing to find SATA CD drives. Updated
  package by Chris Roberts.
 2012-07-19 20:58:57 -04:00
Scott McCreary
af2f75a016 Updated cmake to 2.8.5 2012-07-18 23:38:53 +00:00
Scott McCreary
0783fe388d Updated build for LibXML2 2012-07-18 23:37:00 +00:00
Scott McCreary
95c8d9513a Updated build for XZ-Utils 2012-07-18 23:33:36 +00:00
Matt Madia
29c5696ed7 Changes relating to building WebPositive from source. 
* Add WebKit optional package.
 * Make WebKit a dependency of WebPositive
 * Enable building of WebPositive from source.

Note: WebKit currently expands to lib/.  Alternative gcc-subdirectories
are not taken into consideration. Though it is trivial to change.
 2012-07-12 19:45:32 +00:00
Matt Madia
eb97152649 Updated CARootCertificates. 2012-07-04 20:37:22 -04:00
Scott McCreary
4daad1e105 Fixed url dates for gcc4 packages for bzr and cvs. 
Updated taglib gcc4 package name to match typo from alpha3 release.
 2012-06-25 21:12:17 +00:00
Scott McCreary
6ccbb9012f Fixed urls for a few gcc2 OptionalPacakges. 
Changing talib back to 1.6.3 as 1.7.2 is failing to build with gcc4.
 2012-06-25 21:12:10 +00:00
Scott McCreary
893996e358 Updated gcc2 packages for p7zip, mercurial, expat, cvs, 
curl, bzr, apr, and apr-util
 2012-06-25 21:12:03 +00:00
Scott McCreary
cc41587c17 Updated optionalpackages for apr, apr-util, curl,subversion, git, mercurial, openssh, sqlite, 
cdrtools, man, p7zip, tar, libxml2, and yasm.
 2012-06-25 21:11:56 +00:00
Scott McCreary
d1556a0e0f Updated optional packages for curl, freetype, libxml2, mercurial, 
openssl, p7zip, sqlite and tar.
 2012-06-25 21:11:49 +00:00
Matt Madia
55713eef96 Updated URL's for WifiFirmwareScriptData. Fixes #8645. 2012-06-20 22:11:33 -04:00
Humdinger
76f066c2a1 Newly built Beam package fixes ticket #8611 2012-06-04 15:35:28 +02:00
Matt Madia
87a01ad64e Added Caya as an optional package. 
Provided by Barrett. Fixes #7439.
 2012-05-20 14:31:11 +00:00
Matt Madia
96e2080d5e Updated Keymap Switcher. Provided by Siarzhuk Zharski. 2012-05-20 10:23:08 +00:00
Matt Madia
cffe509843 Updated KeymapSwitcher. Provided by Siarzhuk Zharski. 2012-05-14 16:44:50 +00:00
Matt Madia
bb4e1d3e6f Updated CA Root Certificates. 2012-05-02 18:49:30 +00:00
John Scipione
ab0d7676f8 Added Colors\! optional package 2012-05-01 23:22:26 -04:00
Matt Madia
71cfb0c8d0 Updated BeZillaBrowser. Built on hrev43937. Fixes #8417. 2012-04-04 18:46:49 +00:00
Jérôme Duval
bc11edcdb5 wpa_supplicant: updated to 0.7.3 2012-04-03 
* compiles against updated FreeBSD compat layer headers.
 2012-04-04 19:40:55 +02:00
scottmc2@gmail.com
c106a6bc2e Updated optionalpackages for texinfo, sqlite and bzr. 2012-03-31 17:58:24 -07:00
Rene Gollent
484afd3a08 Updated Web+ package. 
Fixes an oversight in yesterday's bug fix.
 2012-03-31 14:21:04 -04:00
Rene Gollent
ab2948538e Update Web+ optional package. 
- Fixes a problem in Web+'s autocompletion handler that would
  result in it eating things like workspace switching shortcuts
  if Web+'s URL input had focus.
 2012-03-30 22:23:58 -04:00
Jérôme Duval
f659f955ba Added an optional package DevelopmentPowerPC 
* haiku-devlibs-ppc-gcc4 zip archive contains libroot and glue (but no stdc++).
* fixed /boot/develop/lib/$arch symlink to point to the right dir instead of current.
* setgcc now handles the ppc arch and updates the arch link /boot/develop/lib.
 2012-03-18 15:36:26 +01:00
Jérôme Duval
65bce31ef8 Freetype: FreetypeRules isn't needed anymore. 
* fixed copy of freetype headers, now part of the optional package.
 2012-03-17 22:52:10 +01:00
Matt Madia
1d368d9b78 Updated CARootCertificates package. 2012-03-10 21:20:45 +00:00
Alexander von Gluck IV
8fb9e2dbb8 jam: Add clang binary optional package 
* Created from haikuporter ticket #313
* Tested as functional under gcc4h
 2012-03-09 15:07:46 -06:00
Humdinger
935af17a2f Recompiled gcc2 version of optional package Clockwerk. 2012-03-04 20:25:18 +01:00
Rene Gollent
3d4db3d64e Update Vision packages to account for BControlLook changes. 
Fixes #8355.
 2012-02-26 14:26:18 -05:00
Stephan Aßmus
0ef4598ff0 Updated Clockwerk optional packages for gcc2 and gcc4. 
* Changes to the layout API broke the old packages.
 * The update to GCC4.6 broke compiling.
 2012-02-25 17:33:26 +01:00
Matt Madia
9498da9c14 Seems even my fix was off by one. 2012-02-20 15:20:00 +00:00
Humdinger
5721015d44 Added demo packages for audio, video, data and images. 2012-02-20 19:49:36 +01:00
Matt Madia
5227cdd195 Fixed an off by one error. 2012-02-20 09:58:21 +00:00
Matt Madia
743d0826f7 Updated the cert package, to one with a date stamp. 
The haiku-files.org cron script will create a new package only when the cert
has been updated. An email will inform me of such an update.
 2012-02-19 14:00:48 +00:00
Matt Madia
bff40a31c1 Updated WebPositive. Supports common/data/ssl/cert.pem 
This package contains only the app + libs. The certificate file
is satisfied through OptionalPackageDependencies. The bookmarks
have been moved (and updated) to a separate archive.

Thanks Rene Gollent and Chris Roberts for the help!

This group of changesets should close #7707, though it is possible
that other optional-packages, pre-built software will still fail to
locate the certificates file in the new location.
 2012-02-19 09:29:31 +00:00
Matt Madia
ea70913a5c Rebuilt Curl 7.21.7 (haikuports r1815) to support cert.pem 
Thanks Chris Roberts for the help with Curl!
 2012-02-19 09:29:30 +00:00
Matt Madia
94c3d306db Created CARootCertificates, extracts to common/data/ssl/cert.pem 
Via a cron script, www.haiku-files.org will automatically create a new package
from http://curl.haxx.se/ca/cacert.pem. This new package satisfies our
OpenSSL's expectations of where the certificate file lives. It also ensures
that new builds of Haiku will have the newest certificate file. As an example,
the cacert.pem included in Web+ was from Sept-2009.

Updated builds of Curl and Web+ to follow.
 2012-02-19 09:29:29 +00:00
Michael Lotz
dd2116b8eb Update wpa_supplicant package for gcc2. 
It should work on current images again and contains a few usability
tweaks that make it simpler to navigate/use.
 2012-02-03 21:25:09 +01:00
Jérôme Duval
1a4cf8161e Moved ctags to an optional package 
* removed ctags from Haiku sources and from haiku image
* added ctags to mandatory packages for the time being.
 2012-01-23 23:50:20 +01:00
Rene Gollent
612e834851 Update package again due to a few stray attributes that were missed. 
Should really fix #8290.
 2012-01-23 15:52:14 -05:00
Rene Gollent
8154b8ae5e Updated Web+ optional package to remove stray Tracker attributes. 
Fixes #8290.
 2012-01-23 09:59:36 -05:00
Jérôme Duval
5c015f8811 Updated gcc 4 native package to 4.6.2 2012-01-22 19:41:25 +01:00
Matt Madia
83cbfa5e0e Rebuilt BeZillaBrowser for gcc4. 2011-12-26 23:02:48 -05:00
Matt Madia
d5b5b51e6c Updated the jam packages to 2011-12-22 2011-12-26 16:04:15 -05:00
Joseph R. Prostko
68fe8a9edc * Update KeymapSwitcher and Vim optional packages 2011-12-23 18:20:08 -05:00
Oliver Tappe
bb6b6a1504 Correct explicitly created symlinks for ICU-devel package 
* skip the right amount of extensions until the actual abi version
  is reached
 2011-12-20 21:59:33 +01:00
Rene Gollent
730714fea5 Update Pe gcc4 optional package. 2011-12-18 16:09:29 -05:00
Rene Gollent
f7d5d48f98 Updated Vision packages. 2011-12-17 16:15:35 -05:00
Rene Gollent
bae0f6db21 Updated Web+ package due to layout API changes. 2011-12-17 00:03:23 -05:00
Oliver Tappe
ec99f3b2a6 Adjust mbstate_t to embed the state of the ICU converter. 
* make room in mbstate_t for containing an ICU-converter's state
  (well, in fact the whole converter object)
* adjust libroot's locale add-on to clone converters into a given
  mbstate_t directly
* adjust ICUThreadLocalStorageValue to contain the converter pointer
  instead of a converter-ID (if the converter is related to an
  mbstate_t, it points into the mbstate_t).
* adjust users of converters to directly use converter pointers
  instead of ICUConverterRef
* drop now unused ICUConverterManager and ICUConverterRef
* update gcc4 optional package

This brings our multibyte implementation into a fully working state,
both non-ascii and non-8-bit characters can now be handled normally
in the Terminal, i.e. this finally fixes #6276.

N.B.: Since the size of mbstate_t has changed, everything (including
the compiler!) needs to be rebuilt.
 2011-12-15 13:18:11 +01:00
Rene Gollent
ebc0d47cc6 Add Debugger to Development package. 2011-12-11 20:59:43 -05:00
Scott McCreary
64e63a6bb5 Updated openssh optionalpackage 
* Updated sshd_keymaker.sh script to use --group instead of --app
 2011-11-30 20:57:01 +00:00
Ingo Weinhold
14f94ae7d4 Fix location of the Deskbar menu symlinks 
Conflicts:

	build/jam/OptionalPackages
 2011-11-25 06:19:34 +01:00
Oliver Tappe
210361191d Update gcc4 optional package. 2011-11-24 00:26:10 +01:00
Oliver Tappe
c33232c167 Update optional gcc2 package. 2011-11-23 20:19:33 +01:00
Scott McCreary
3c38636c9f Update git to version 1.7.7.2 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@43236 a95241bf-73f2-0310-859d-f6bbb57e9c96
 2011-11-11 20:56:14 +00:00
Siarzhuk Zharski
90586eb692 * KeymapSwitcher package updated to work with recent (after ~r43100) revisions of Haiku. 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@43224 a95241bf-73f2-0310-859d-f6bbb57e9c96
 2011-11-08 09:53:54 +00:00
Ingo Weinhold
19ae20e67e Merge branch 'master' into pm-flat 
Conflicts:
	build/jam/HaikuImage
	build/jam/OptionalBuildFeatures
	build/jam/OptionalPackages
	build/jam/UserBuildConfig.sample
	data/bin/installoptionalpackage
	src/apps/deskbar/DeskbarMenu.cpp
	src/servers/debug/DebugServer.cpp
	src/system/kernel/fs/vfs.cpp
 2011-11-05 17:00:01 +01:00
François Revol
1bf8552a7b Added an optional package for dmidecode <http://www.nongnu.org/dmidecode/>, which provides useful information from the BIOS, including motherboard vendor and name. 
Source package is at http://revolf.free.fr/beos/dmidecode-2.11_haiku-2011-11-02.tar.xz


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@43109 a95241bf-73f2-0310-859d-f6bbb57e9c96
 2011-11-02 13:19:39 +00:00
Michael Lotz
fe8708f308 * Update the wpa_supplicant package to include the latest synchronous join 
changes.
* Fix the conditional for GCC4 where I missed removing a closing parenthesis.
  Thanks to Jens Arm for pointing out that not-as-obvious-as-hoped-for syntax
  error.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@42804 a95241bf-73f2-0310-859d-f6bbb57e9c96
 2011-10-06 10:22:02 +00:00
Michael Lotz
13cf6c7044 Forgot to change the grist of the GCC4 wpa_supplicant package in r42800. Sorry. 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@42803 a95241bf-73f2-0310-859d-f6bbb57e9c96
 2011-10-05 18:56:58 +00:00
Michael Lotz
e3e636ae3a Update the GCC4 wpa_supplicant package to one built with GCC4.5. 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@42800 a95241bf-73f2-0310-859d-f6bbb57e9c96
 2011-10-03 18:53:34 +00:00
Michael Lotz
e94e30ff78 Add the wpa_supplicant optional package. It should be stable and is working on 
the limited set of hardware I could test it with.
By installing the wpa_supplicant one can now join WEP/WPA/WPA2 networks by
either selecting them in the network prefs/network status applet or using
"ifconfig <interface> join <network name> [password]". The wpa_supplicant opens
a dialog asking for more details if it can't connect with the given information.
Note that there is no way to automatically store that extra info right now, so
it has to be provided on each join. The configuration can however be stored
manually into the /boot/common/settings/network/wireless_networks config file.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@42775 a95241bf-73f2-0310-859d-f6bbb57e9c96
 2011-09-28 00:33:45 +00:00
Scott McCreary
f6144bf719 Updated openssl to 1.0.0e and openssh to 5.9p1. 
Note that this moves the ssl directory to now be in B_COMMON_DATA_DIRECTORY/ssl, and may require rebuilding of other packages as 
well.  See Haikuports changeset1635 and Haiku r41767.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@42733 a95241bf-73f2-0310-859d-f6bbb57e9c96
 2011-09-09 22:27:08 +00:00
Philippe Houdoin
20cc5ae73c Update WebPositive package, new build was needed due to the 
new ICU 4.8.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@42692 a95241bf-73f2-0310-859d-f6bbb57e9c96
 2011-08-26 22:16:24 +00:00
Oliver Tappe
00912ff317 * fix ICU-devel optional package to include link-time libraries (as links to the 
actual libs in /system/lib)
* adjust installation code for ICU-devel to generate link for the non-versioned
  form (libicu*.so) and one matching the soname (libicu*.so.48)

git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@42691 a95241bf-73f2-0310-859d-f6bbb57e9c96
 2011-08-26 19:28:39 +00:00
Matt Madia
5b9c0414de Added two scripts, which attempt to load the appropriate localized docs. 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@42630 a95241bf-73f2-0310-859d-f6bbb57e9c96
 2011-08-13 02:34:16 +00:00
Matt Madia
d98662a8a7 Automatic whitespace cleanup. No functional change. 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@42628 a95241bf-73f2-0310-859d-f6bbb57e9c96
 2011-08-13 01:53:39 +00:00
Scott McCreary
360ac869d3 Updated apr to 1.4.5, apr-util to 1.3.12 and subversion to 1.6.17. 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@42562 a95241bf-73f2-0310-859d-f6bbb57e9c96
 2011-08-03 23:34:01 +00:00
Ingo Weinhold
8212d04704 Repackage BeZillaBrowser as hpkg 2011-07-18 21:04:33 +02:00
Ingo Weinhold
f642202ae8 Updated gcc 2.95.3 package 
The /boot/common include paths are now built in.
 2011-07-17 16:55:17 +02:00
Ingo Weinhold
a0f6347784 Fix location of the Deskbar menu symlinks 2011-07-17 16:55:14 +02:00
Ingo Weinhold
e96cbb12b4 Update cmake package, create doxygen package 2011-07-17 16:55:13 +02:00
Ingo Weinhold
e94674ce75 cmake 2.8.5 optional package repackaged as hpkg 2011-07-17 16:55:13 +02:00
Ingo Weinhold
b5831cdf17 Disable WonderBrush until repackaged 2011-07-17 16:55:00 +02:00
Ingo Weinhold
fd0e9e33d0 Fix bison hpkg package name 2011-07-17 16:54:50 +02:00
Ingo Weinhold
00043b5320 Use InstallOptionalHaikuImagePackage for gcc too 2011-07-17 16:54:49 +02:00
Ingo Weinhold
78c665f2c3 lpe symlink is in the pe package now 2011-07-17 16:54:48 +02:00
Ingo Weinhold
d3deb18a2d Repackage default optional packages as hpkg files 2011-07-17 16:54:46 +02:00
Ingo Weinhold
b478cc3fc5 Put TimGMSoundFont package in the right directory 2011-07-17 16:54:22 +02:00
Ingo Weinhold
3f6ca2fdca Move remaining /boot/system contents into packages 
* Build system: Create packages haiku-devel, haiku-welcome,
  haiku-userguide, and makefile-engine.
* The TimGMSoundFont and BeBook zip files have been repackaged as hpkg
  files.
* Adjust the optional package definitions accordingly.
 2011-07-17 16:54:19 +02:00
Ingo Weinhold
fdc30d62ce Fix gcc2 and ICU optional packages 
* InstallOptionalHaikuImagePackage: In case of hpkg packages, copy them
  to the target directory, instead of extracting them.
* Correct gcc 2 package download URL.
* The ICU gcc 2 optional packages has been repackaged as hpkg. Use that.
  For gcc 4 things are broken, now.
 2011-07-17 16:54:19 +02:00
Oliver Tappe
3dfd9cb95c Flat commit of all changes from package-management branch in svn 2011-07-17 16:54:06 +02:00
Scott McCreary
1dcae018bc Updated python to 2.6.7. 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@42308 a95241bf-73f2-0310-859d-f6bbb57e9c96
 2011-06-25 02:08:27 +00:00
Jérôme Duval
6289e476a9 Updated gcc 4 native package to 4.5.3 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@42292 a95241bf-73f2-0310-859d-f6bbb57e9c96
 2011-06-23 18:04:28 +00:00
Scott McCreary
fe55cf20bd Updated curl to 7.21.7 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@42291 a95241bf-73f2-0310-859d-f6bbb57e9c96
 2011-06-23 17:15:55 +00:00
Scott McCreary
462d9019a5 Updated KeymapSwitcher which fixes an issue in the 06-11 builds, from S.Zharski. 
+alpha3  


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@42117 a95241bf-73f2-0310-859d-f6bbb57e9c96
 2011-06-12 00:38:05 +00:00
scottmc
ede349bfd9 Updated KeymapSwitcher OptionalPackages with new icon from ZuMi. 
+alpha3


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@42102 a95241bf-73f2-0310-859d-f6bbb57e9c96
 2011-06-11 16:35:36 +00:00
Jérôme Duval
32b9a38570 updated DevelopmentJava packages for r1a3 (based on .bep) 
+alpha


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@42071 a95241bf-73f2-0310-859d-f6bbb57e9c96
 2011-06-09 18:32:20 +00:00
Scott McCreary
2efeb0d6d2 Disabled BeHappy as an OptionalPackage as it is currently broken. If/when it gets fixed, it will be easy to re-add it. 
+alpha3


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@42056 a95241bf-73f2-0310-859d-f6bbb57e9c96
 2011-06-08 17:39:46 +00:00
Scott McCreary
0bae414087 Updated vision OptionalPackage to include a default VisionSettings file. This fixes #6040. 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@42024 a95241bf-73f2-0310-859d-f6bbb57e9c96
 2011-06-07 20:00:52 +00:00
Jérôme Duval
c2826da6d7 make DevelopmentJava available for hybrid builds. 
+alpha


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@41974 a95241bf-73f2-0310-859d-f6bbb57e9c96
 2011-06-06 17:07:40 +00:00
Scott McCreary
0c3a8f1355 Updated armyknife OptionalPackage to fix a couple of mime-type issues 
reported and patched by Humdinger.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@41914 a95241bf-73f2-0310-859d-f6bbb57e9c96
 2011-06-04 21:25:04 +00:00
Scott McCreary
f646869dce Updated NetSurf OptionalPackage for alpha3. 
+alpha3


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@41900 a95241bf-73f2-0310-859d-f6bbb57e9c96
 2011-06-04 07:35:18 +00:00
Scott McCreary
b6478330e3 Updated ruby to a build which has support for readline. Commented out the symlink for friss until it gets figured out 
and fixed.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@41871 a95241bf-73f2-0310-859d-f6bbb57e9c96
 2011-06-02 16:08:15 +00:00
Ryan Leavengood
de6ea73bce Update WebPositive to a build made on a gcc4 r1a3 RC. 
+alpha3


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@41866 a95241bf-73f2-0310-859d-f6bbb57e9c96
 2011-06-02 04:26:42 +00:00
Scott McCreary
53592f6036 Added new gcc2 and gcc4 OptionalPackages for FRiSS, fixed some more typos. 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@41862 a95241bf-73f2-0310-859d-f6bbb57e9c96
 2011-06-01 20:44:07 +00:00
Scott McCreary
4d0944c90d Updated KeymapSwitcher OptionalPackages for gcc2 and gcc4 alpha3, built by S.Zharski 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@41857 a95241bf-73f2-0310-859d-f6bbb57e9c96
 2011-05-31 22:10:11 +00:00
Scott McCreary
22d447acdc Updated gcc2 Ruby OptionalPackage for alpha3. 
+alpha3


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@41855 a95241bf-73f2-0310-859d-f6bbb57e9c96
 2011-05-31 19:37:45 +00:00
Scott McCreary
331a968c65 Updated bepdf OptionalPackage for alpha3, moved licenses into to .OptionalPackageDescription file instead of OptionalPackages. 
+alpha3


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@41848 a95241bf-73f2-0310-859d-f6bbb57e9c96
 2011-05-31 00:10:54 +00:00
Scott McCreary
cb23dea57a Updated bepdf OptionalPackage for alpha3. 
+alpha3


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@41802 a95241bf-73f2-0310-859d-f6bbb57e9c96
 2011-05-29 07:36:21 +00:00
Scott McCreary
31327d3a86 Rebuilt icu gcc2 and gcc4 OptionalPackages, and armyknife gcc2 package for alpha3. 
+alpha3


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@41783 a95241bf-73f2-0310-859d-f6bbb57e9c96
 2011-05-27 22:34:52 +00:00
Scott McCreary
9000a31cc1 Updated gcc4 build of transmission, added a gcc2 build, and removed gettext dependency for transmission. 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@41780 a95241bf-73f2-0310-859d-f6bbb57e9c96
 2011-05-27 19:04:46 +00:00
Scott McCreary
9bdbd4add5 Updated gcc2 and gcc4 vim OptionalPackages compiled by Siarzhuk Zharski 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@41764 a95241bf-73f2-0310-859d-f6bbb57e9c96
 2011-05-26 22:43:45 +00:00
Scott McCreary
0bc48df539 Updated gcc4 taglib package and fixed typo in mercurial's filename. 
+alpha3


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@41737 a95241bf-73f2-0310-859d-f6bbb57e9c96
 2011-05-25 13:05:42 +00:00
Scott McCreary
4d2ca803f6 Updated several more gcc4 OptionalPackages, including sed, tar, vision, pe and others. 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@41720 a95241bf-73f2-0310-859d-f6bbb57e9c96
 2011-05-24 20:36:19 +00:00
Scott McCreary
43eaff044c Updated a few dozen gcc4 OptionalPackages for r1a3. Note that these were all 
built in an r1a3 gcc4 only environment.  
+alpha3


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@41711 a95241bf-73f2-0310-859d-f6bbb57e9c96
 2011-05-24 15:48:45 +00:00
Scott McCreary
94427d9b8b Updated gcc4 groff andgperf builds for alpha3. 
+alpha3


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@41649 a95241bf-73f2-0310-859d-f6bbb57e9c96
 2011-05-22 07:04:08 +00:00
Scott McCreary
760b07424d Updated gcc4 OptioanlPackages cdrtools, expat, bzip2, fastdep and texinfo for alpha3. 
+alpha3


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@41648 a95241bf-73f2-0310-859d-f6bbb57e9c96
 2011-05-22 06:39:01 +00:00
Scott McCreary
003ebfa1cc Updated gcc4 OptionalPackages apr, apr-util, beae, burnitnow, ccache and sqlite, for alpha3. 
+alpha3


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@41647 a95241bf-73f2-0310-859d-f6bbb57e9c96
 2011-05-22 06:11:12 +00:00
Scott McCreary
2801333400 Updated gcc4 git and cmake OptionalPackages foralpha3. 
+alpha3


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@41646 a95241bf-73f2-0310-859d-f6bbb57e9c96
 2011-05-22 05:46:10 +00:00
Scott McCreary
7a51693772 Added fresh gcc2 builds of smpeg, taglib, sdl-rft and armyknife. 
+alpha3


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@41624 a95241bf-73f2-0310-859d-f6bbb57e9c96
 2011-05-21 05:08:38 +00:00
Scott McCreary
ccd4d547b9 Updated gcc4 builds for box2d, neon, curl and cvs. 
+alpha3


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@41614 a95241bf-73f2-0310-859d-f6bbb57e9c96
 2011-05-20 23:54:36 +00:00
Scott McCreary
f432cc5ef2 First wave of gcc4 built OptionalPackages for alpha3. 
+alpha3


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@41613 a95241bf-73f2-0310-859d-f6bbb57e9c96
 2011-05-20 22:52:01 +00:00
Scott McCreary
b20355e2ba Fix tar gcc2 OptionalPackage, prefixdir was wrong. 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@41606 a95241bf-73f2-0310-859d-f6bbb57e9c96
 2011-05-20 17:05:57 +00:00
Scott McCreary
eaa961e97a Fixed build of gcc2 OptionalPackages for expat and subversion 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@41605 a95241bf-73f2-0310-859d-f6bbb57e9c96
 2011-05-20 16:29:14 +00:00
Scott McCreary
f1abcf7879 Fixed cmake-2.8.4 OptionalPackage. 
+alpha3


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@41585 a95241bf-73f2-0310-859d-f6bbb57e9c96
 2011-05-19 17:30:07 +00:00
Scott McCreary
5f883d4da0 Cleaned up directories for python. 
+alpha3


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@41582 a95241bf-73f2-0310-859d-f6bbb57e9c96
 2011-05-19 16:50:33 +00:00
Scott McCreary
593395df56 First wave of OptionalPackages rebuilt forR1A3 
+alpha3


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@41579 a95241bf-73f2-0310-859d-f6bbb57e9c96
 2011-05-19 08:47:23 +00:00
Scott McCreary
8ba4ac51f5 Updated libiconv gcc2 optionalpackage to clean up B_COMMON_DOCUMENTATION_DIRECTORY/doc directory. 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@41524 a95241bf-73f2-0310-859d-f6bbb57e9c96
 2011-05-16 03:20:45 +00:00
Scott McCreary
84464c202e Updated subversion optionalpackages to getrid of gettext dependency. 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@41511 a95241bf-73f2-0310-859d-f6bbb57e9c96
 2011-05-15 06:11:39 +00:00
Scott McCreary
ca4d4538aa Updated neon optionalpackage without dependency on gettext. 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@41510 a95241bf-73f2-0310-859d-f6bbb57e9c96
 2011-05-15 06:08:33 +00:00
Scott McCreary
a94173fd0f Updated gcc4 optionalpackage for yasm to remove dependency on 
gettext.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@41509 a95241bf-73f2-0310-859d-f6bbb57e9c96
 2011-05-15 03:01:33 +00:00
Scott McCreary
3da6df44df Cleaned up directories for libiconv gcc4 optionalpackage 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@41492 a95241bf-73f2-0310-859d-f6bbb57e9c96
 2011-05-13 23:57:45 +00:00
Scott McCreary
8af3c3e614 Cleaned up gcc4 libpcre optionalpackage, it was putting files in B_COMMON_DOCUMENTATION/doc rather 
than B_COMMON_DOCUMENTATION/doc/pcre.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@41490 a95241bf-73f2-0310-859d-f6bbb57e9c96
 2011-05-13 23:32:11 +00:00
Scott McCreary
5733c80d30 Fixed gcc4 sed optionalpackage. 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@41489 a95241bf-73f2-0310-859d-f6bbb57e9c96
 2011-05-13 23:27:13 +00:00
Scott McCreary
c75f313fbd Added gcc4 man optionalpackage 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@41475 a95241bf-73f2-0310-859d-f6bbb57e9c96
 2011-05-13 15:40:53 +00:00
Scott McCreary
ee71768be6 Added gcc4 taglib optionalpackage 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@41474 a95241bf-73f2-0310-859d-f6bbb57e9c96
 2011-05-13 15:36:25 +00:00
Scott McCreary
01e2c102e2 Added gcc4 yasm optionalpackage 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@41473 a95241bf-73f2-0310-859d-f6bbb57e9c96
 2011-05-13 15:31:10 +00:00
Scott McCreary
ec949c22c2 Added fastdep gcc4 optionalpackage 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@41472 a95241bf-73f2-0310-859d-f6bbb57e9c96
 2011-05-13 15:24:55 +00:00
Scott McCreary
64979f3ecf Added ccache gcc4 optionalpackage 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@41471 a95241bf-73f2-0310-859d-f6bbb57e9c96
 2011-05-13 15:20:53 +00:00
Scott McCreary
92758e8cdb Added gcc4 sed optionalpackage. 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@41469 a95241bf-73f2-0310-859d-f6bbb57e9c96
 2011-05-13 07:06:34 +00:00
Scott McCreary
1e11575453 Added bzip2 gcc4 optionalpackage. 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@41468 a95241bf-73f2-0310-859d-f6bbb57e9c96
 2011-05-13 06:59:13 +00:00
Scott McCreary
9abab7eb49 Added gcc4 version of git. 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@41461 a95241bf-73f2-0310-859d-f6bbb57e9c96
 2011-05-12 03:01:17 +00:00
Scott McCreary
fb90397da7 Updated builds of openssl, openssh, git, mercurial, curl and neon. 
Fixed typo on previous commit of expat.
Note that this moves the location of openssl, so other packages that 
make use of openssl may or may not require rebuilding as well.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@41458 a95241bf-73f2-0310-859d-f6bbb57e9c96
 2011-05-12 00:40:21 +00:00
Scott McCreary
df84df070d Updated expat to fix its directories. 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@41391 a95241bf-73f2-0310-859d-f6bbb57e9c96
 2011-05-08 20:42:57 +00:00
Scott McCreary
989348ea3d Fixed gcc2 sqlite package, previous one had some stray directories in it. The gcc4 zip was ok. 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@41360 a95241bf-73f2-0310-859d-f6bbb57e9c96
 2011-05-07 03:56:56 +00:00
Scott McCreary
94cf4ec0dd Fixed doc directory for xz-utils. 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@41359 a95241bf-73f2-0310-859d-f6bbb57e9c96
 2011-05-07 03:53:29 +00:00
Scott McCreary
28d6f46e24 Cleaned up directories for rsync and added gcc4 build. 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@41358 a95241bf-73f2-0310-859d-f6bbb57e9c96
 2011-05-07 03:41:15 +00:00
Scott McCreary
1da9b17c5d Updated groff gcc2 build to clean up directories, added gcc4 built groff. 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@41357 a95241bf-73f2-0310-859d-f6bbb57e9c96
 2011-05-07 03:36:32 +00:00
Scott McCreary
d4b77be645 Cleaned up directories for gperf. 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@41356 a95241bf-73f2-0310-859d-f6bbb57e9c96
 2011-05-07 03:31:32 +00:00
Scott McCreary
79e5f20ba1 Missed updating the date on the first yasm filename. 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@41325 a95241bf-73f2-0310-859d-f6bbb57e9c96
 2011-05-05 19:16:38 +00:00
Scott McCreary
db06a74933 Updated subversion to 1.6.15 and cleaned up it's directories. 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@41324 a95241bf-73f2-0310-859d-f6bbb57e9c96
 2011-05-05 18:57:50 +00:00
Scott McCreary
cc038dac22 Updated apr and apr-util builds to clean up their directories. 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@41323 a95241bf-73f2-0310-859d-f6bbb57e9c96
 2011-05-05 18:54:40 +00:00
Scott McCreary
f33d4712c0 Updated xz-utils to 5.0.1, removed unneeded if statement as the xz-utils gcc4 works on both 
gcc2 and gcc4.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@41322 a95241bf-73f2-0310-859d-f6bbb57e9c96
 2011-05-05 18:47:15 +00:00
Scott McCreary
06dc474efb Updated cmake OptionalPackage to clean up it's directories. 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@41314 a95241bf-73f2-0310-859d-f6bbb57e9c96
 2011-05-03 22:59:49 +00:00
Scott McCreary
079bd8028b Updated cdrtools OptionalPackage to move rscsi from B_COMMON_SERVERS_DIRECTORY to B_COMMON_BIN_DIRECTORY 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@41312 a95241bf-73f2-0310-859d-f6bbb57e9c96
 2011-05-03 22:47:17 +00:00
Scott McCreary
4148f22180 Updated yasm OptionalPackage to get rid of some stray files. 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@41311 a95241bf-73f2-0310-859d-f6bbb57e9c96
 2011-05-03 22:43:46 +00:00
Scott McCreary
a2002544cd Fixed url to gcc4 lua OptionalPackage. Discovered by MichaelPeppers. 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@41210 a95241bf-73f2-0310-859d-f6bbb57e9c96
 2011-04-10 02:07:52 +00:00
Matt Madia
00a625f4b8 Revert APR and APR-Util to pre-r41106 builds, until the issue reported in #7412 
can be fixed properly.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@41168 a95241bf-73f2-0310-859d-f6bbb57e9c96
 2011-04-03 00:11:21 +00:00
Scott McCreary
cbc8e67a7a Changed cmake builds back to the 2011-02-25 builds as those seem to be 
the most recent stable versions.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@41138 a95241bf-73f2-0310-859d-f6bbb57e9c96
 2011-03-29 15:25:17 +00:00
Scott McCreary
9f6153aa51 Fixed apr and apr-util builds. 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@41136 a95241bf-73f2-0310-859d-f6bbb57e9c96
 2011-03-28 15:22:37 +00:00
Scott McCreary
b0e6c980ed Updated builds of apr, apr-util and cmake to correct directory issues. 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@41106 a95241bf-73f2-0310-859d-f6bbb57e9c96
 2011-03-25 23:52:51 +00:00
Scott McCreary
cb56913ac1 Rebuilt gcc4 cmake optionalpackage. 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@41080 a95241bf-73f2-0310-859d-f6bbb57e9c96
 2011-03-22 16:56:28 +00:00
Scott McCreary
042b214313 Fixed paladin gcc4 build. 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@41022 a95241bf-73f2-0310-859d-f6bbb57e9c96
 2011-03-18 21:39:48 +00:00
Scott McCreary
18bfd5000e Updated xz-utils to 5.0.1 and cleaned up it's directories. The "if gcc >= 4" section may be able to be 
cleaned up if this 5.0.1 gcc4 built package tests out ok on a gcc2 system.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@40982 a95241bf-73f2-0310-859d-f6bbb57e9c96
 2011-03-16 23:47:16 +00:00
Scott McCreary
cc7c118b0c Updated cdrtools to 3.01a01 and cleaned up it's directories, also cleaned up the directories for sqlite. 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@40981 a95241bf-73f2-0310-859d-f6bbb57e9c96
 2011-03-16 21:31:03 +00:00
Scott McCreary
3b63d45a5d Updated libxml2 and neon packages and listed libxml2 as a dependency of neon. 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@40977 a95241bf-73f2-0310-859d-f6bbb57e9c96
 2011-03-16 19:50:53 +00:00
Scott McCreary
6a907d5140 Updated git to 1.7.3.5, and cleaned up it's directories a bit. 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@40965 a95241bf-73f2-0310-859d-f6bbb57e9c96
 2011-03-15 17:54:46 +00:00
Scott McCreary
490435a191 Cleaned up make's directories. 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@40963 a95241bf-73f2-0310-859d-f6bbb57e9c96
 2011-03-15 16:50:45 +00:00