[yast-commit] r41770 - in /trunk/packager: ./ package/ src/clients/ src/config/ src/include/ src/include/dirinstall/ src/modules/

Author: locilka Date: Mon Nov 5 11:24:49 2007 New Revision: 41770 URL: http://svn.opensuse.org/viewcvs/yast?rev=41770&view=rev Log: - Part of the package content has been moved to a new package yast2-dirinstall. - 2.16.3 Removed: trunk/packager/src/clients/dirinstall.ycp trunk/packager/src/clients/dirinstall_options.ycp trunk/packager/src/clients/dirinstall_options_proposal.ycp trunk/packager/src/clients/inst_dirinstall.ycp trunk/packager/src/clients/inst_dirinstall_finish.ycp trunk/packager/src/config/dirinstall.desktop trunk/packager/src/config/dirinstall.xml trunk/packager/src/include/dirinstall/ trunk/packager/src/modules/DirInstall.ycp Modified: trunk/packager/VERSION trunk/packager/package/yast2-packager.changes trunk/packager/src/config/Makefile.am trunk/packager/src/include/Makefile.am trunk/packager/src/modules/SpaceCalculation.ycp trunk/packager/yast2-packager.spec.in Modified: trunk/packager/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/VERSION?rev=41770&r1=41769&r2=41770&view=diff ============================================================================== --- trunk/packager/VERSION (original) +++ trunk/packager/VERSION Mon Nov 5 11:24:49 2007 @@ -1 +1 @@ -2.16.2 +2.16.3 Modified: trunk/packager/package/yast2-packager.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/package/yast2-packager.changes?rev=41770&r1=41769&r2=41770&view=diff ============================================================================== --- trunk/packager/package/yast2-packager.changes (original) +++ trunk/packager/package/yast2-packager.changes Mon Nov 5 11:24:49 2007 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Mon Nov 5 11:23:33 CET 2007 - locilka@suse.cz + +- Part of the package content has been moved to a new package + yast2-dirinstall. +- 2.16.3 + +------------------------------------------------------------------- Fri Nov 2 17:22:16 CET 2007 - locilka@suse.cz - Removed dependency on yast2-bootloader, Bootloader::PreUpdate() Modified: trunk/packager/src/config/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/src/config/Makefile.am?rev=41770&r1=41769&r2=41770&view=diff ============================================================================== --- trunk/packager/src/config/Makefile.am (original) +++ trunk/packager/src/config/Makefile.am Mon Nov 5 11:24:49 2007 @@ -1,9 +1,4 @@ # Makefile.am for source/packager/src/config -controldir = $(yast2dir)/control - -control_DATA = \ - dirinstall.xml - desktop_DATA = $(wildcard *.desktop) EXTRA_DIST = $(desktop_DATA) $(control_DATA) Modified: trunk/packager/src/include/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/src/include/Makefile.am?rev=41770&r1=41769&r2=41770&view=diff ============================================================================== --- trunk/packager/src/include/Makefile.am (original) +++ trunk/packager/src/include/Makefile.am Mon Nov 5 11:24:49 2007 @@ -2,7 +2,7 @@ # Makefile.am for packager/src # -SUBDIRS = checkmedia dirinstall +SUBDIRS = checkmedia yncludedir = @yncludedir@/packager ynclude_DATA = \ Modified: trunk/packager/src/modules/SpaceCalculation.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/src/modules/SpaceCalculation.ycp?rev=41770&r1=41769&r2=41770&view=diff ============================================================================== --- trunk/packager/src/modules/SpaceCalculation.ycp (original) +++ trunk/packager/src/modules/SpaceCalculation.ycp Mon Nov 5 11:24:49 2007 @@ -23,7 +23,6 @@ import "ProductFeatures"; import "Report"; import "String"; - import "DirInstall"; import "Stage"; boolean info_called = false; // list partition_info already initialized? @@ -99,7 +98,7 @@ // filter out headline and other invalid entries partition = filter( map part, partition, ``( substring ( part["name"]:"", 0, 1 ) == "/" ) ); - if (DirInstall::installing_into_dir) + if (Installation::dirinstall_installing_into_dir) { target = GetDirMountPoint(DirInstall::GetTarget(), partition ); y2milestone("Installing into a directory, target directory: %1, target mount point: %2", DirInstall::GetTarget(), target); @@ -119,7 +118,7 @@ string mountName = part["name"]:""; string spec = part["spec"]:""; - if (DirInstall::installing_into_dir) + if (Installation::dirinstall_installing_into_dir) { if (substring(mountName, 0, 1) != "/") { Modified: trunk/packager/yast2-packager.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/yast2-packager.spec.in?rev=41770&r1=41769&r2=41770&view=diff ============================================================================== --- trunk/packager/yast2-packager.spec.in (original) +++ trunk/packager/yast2-packager.spec.in Mon Nov 5 11:24:49 2007 @@ -2,7 +2,7 @@ @HEADER@ -BuildRequires: gcc-c++ libxcrypt-devel yast2-country yast2-xml docbook-xsl-stylesheets doxygen libxslt perl-XML-Writer sgml-skel update-desktop-files yast2-devtools yast2-testsuite yast2-slp +BuildRequires: gcc-c++ libxcrypt-devel yast2-country yast2-xml perl-XML-Writer update-desktop-files yast2-devtools yast2-testsuite yast2-slp # Installation::installedVersion && Installation::updateVersion # Update::* moved to Installation::update_* @@ -61,16 +61,12 @@ %files %defattr(-,root,root) %dir @yncludedir@/checkmedia -%dir @yncludedir@/dirinstall %dir @yncludedir@/packager @yncludedir@/checkmedia/* -@yncludedir@/dirinstall/* @yncludedir@/packager/* @clientdir@/*.ycp @moduledir@/* @desktopdir@/*.desktop @scrconfdir@/* @execcompdir@/servers_non_y2/ag_* -%dir /usr/share/YaST2/control -/usr/share/YaST2/control/*.xml %doc @docdir@ -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org