Rename haiku_cross_devel packages.

* haiku_cross_devel is now haiku_cross_devel_sysroot
* haiku_cross_devel_wrapper is now haiku_cross_devel

build/jam/packages/HaikuCrossDevel

@@ -6,8 +6,9 @@
 
 # first create the actual cross development package
 
-local haikuCrossDevelPackage = haiku_cross_devel_$(HAIKU_PACKAGING_ARCH).hpkg ;
+local haikuCrossDevelSysrootPackage 
-HaikuPackage $(haikuCrossDevelPackage) ;
+	= haiku_cross_devel_sysroot_$(HAIKU_PACKAGING_ARCH).hpkg ;
+HaikuPackage $(haikuCrossDevelSysrootPackage) ;
 
 local developCrossLibDirTokens = develop lib ;
 
@@ -56,19 +57,19 @@ if $(HAIKU_GCC_VERSION[1]) = 2 {
 		: [ FDirName $(HAIKU_TOP) headers cpp ] : 2.95.3 ;
 }
 
-BuildHaikuPackage $(haikuCrossDevelPackage) : haiku_cross_devel ;
+BuildHaikuPackage $(haikuCrossDevelSysrootPackage) : haiku_cross_devel_sysroot ;
 
 # Now create a wrapper package which just contains the actual cross development 
 # package. This wrapper package can safely be installed into the system 
 # hierarchy of the target system, from where haikuporter will fetch it when
 # needed.
 
-local haikuCrossDevelWrapperPackage 
+local haikuCrossDevelPackage 
-	= haiku_cross_devel_wrapper_$(HAIKU_PACKAGING_ARCH).hpkg ;
+	= haiku_cross_devel_$(HAIKU_PACKAGING_ARCH).hpkg ;
-HaikuPackage $(haikuCrossDevelWrapperPackage) ;
+HaikuPackage $(haikuCrossDevelPackage) ;
 
 # add the wrapped package
 local developCrossDirTokens = develop cross ;
-AddFilesToPackage $(developCrossDirTokens) : $(haikuCrossDevelPackage) ;
+AddFilesToPackage $(developCrossDirTokens) : $(haikuCrossDevelSysrootPackage) ;
 
-BuildHaikuPackage $(haikuCrossDevelWrapperPackage) : haiku_cross_devel_wrapper ;
+BuildHaikuPackage $(haikuCrossDevelPackage) : haiku_cross_devel ;

src/data/package_infos/generic/haiku_cross_devel

@@ -4,11 +4,11 @@
 name			haiku_cross_devel
 version			R1~alpha4_pm-1
 architecture	any
-summary			"The Haiku base system files for cross development"
+summary			"Contains a package with system files for cross development"
 
-description		"The package contains all files associated with the base \
+description		"This package provides a package that contains all files \
-system needed for cross development, like static libraries, glue code, \
+associated with the base system needed for cross development, like static \
-library symlinks, header files, etc."
+libraries, glue code, library symlinks, header files, etc."
 
 packager		"The Haiku build system"
 vendor			"Haiku Project"

src/data/package_infos/generic/haiku_cross_devel_sysroot

@@ -0,0 +1,21 @@
+#define DO_CONCAT(a, b) a ## b
+#define CONCAT(a, b) DO_CONCAT(a, b)
+
+name			haiku_cross_devel_sysroot
+version			R1~alpha4_pm-1
+architecture	any
+summary			"The Haiku base system files for cross development"
+
+description		"The package contains all files associated with the base \
+system needed for cross development, like static libraries, glue code, \
+library symlinks, header files, etc."
+
+packager		"The Haiku build system"
+vendor			"Haiku Project"
+
+copyrights		"2001-2013 Haiku, Inc. et al"
+licenses		"MIT"
+
+provides {
+	CONCAT(haiku_cross_devel_sysroot_, HAIKU_PACKAGING_ARCH) = R1~alpha4_pm-1
+}

src/data/package_infos/generic/haiku_cross_devel_wrapper

@@ -1,21 +0,0 @@
-#define DO_CONCAT(a, b) a ## b
-#define CONCAT(a, b) DO_CONCAT(a, b)
-
-name			haiku_cross_devel_wrapper
-version			R1~alpha4_pm-1
-architecture	any
-summary			"Contains a package with system files for cross development"
-
-description		"This package provides a package that contains all files \
-associated with the base system needed for cross development, like static \
-libraries, glue code, library symlinks, header files, etc."
-
-packager		"The Haiku build system"
-vendor			"Haiku Project"
-
-copyrights		"2001-2013 Haiku, Inc. et al"
-licenses		"MIT"
-
-provides {
-	CONCAT(haiku_cross_devel_wrapper_, HAIKU_PACKAGING_ARCH) = R1~alpha4_pm-1
-}