commit vmx-manager

25 May 2007

Hello community,

here is the log from the commit of package vmx-manager
checked in at Sat May 26 00:07:13 CEST 2007.

--------

--- vmx-manager/vmx-manager.changes	2007-05-24 02:17:50.000000000 +0200
+++ /mounts/work_src_done/NOARCH/vmx-manager/vmx-manager.changes	2007-05-25 19:59:41.494331000 +0200
@@ -1,0 +2,5 @@
+Fri May 25 19:59:35 CEST 2007 - james@suse.de
+
+- update to 0.2.8 
+
+-------------------------------------------------------------------

Old:
----
  vmx-manager-0.2.5.dif
  vmx-manager-0.2.5.tar.bz2

New:
----
  vmx-manager-0.2.8.dif
  vmx-manager-0.2.8.tar.bz2

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ vmx-manager.spec ++++++
--- /var/tmp/diff_new_pack.Xz2721/_old	2007-05-26 00:06:47.000000000 +0200
+++ /var/tmp/diff_new_pack.Xz2721/_new	2007-05-26 00:06:47.000000000 +0200
@@ -1,5 +1,5 @@
 #
-# spec file for package vmx-manager (Version 0.2.5)
+# spec file for package vmx-manager (Version 0.2.8)
 #
 # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
 # This file and all modifications and additions to the pristine
@@ -16,8 +16,8 @@
 License:        GNU General Public License (GPL)
 Group:          Productivity/Other
 Autoreqprov:    on
-Version:        0.2.5
-Release:        29
+Version:        0.2.8
+Release:        1
 Summary:        Create, configure, and manage VMware virtual machines
 Source:         %{name}-%{version}.tar.bz2
 Patch:          %{name}-%{version}.dif
@@ -67,6 +67,8 @@
 %postun
 
 %changelog
+* Fri May 25 2007 - james@suse.de
+- update to 0.2.8
 * Thu May 24 2007 - ro@suse.de
 - remove X-SuSE-translate from desktop file
 * Thu Mar 08 2007 - sbrabec@suse.cz

++++++ vmx-manager-0.2.5.dif -> vmx-manager-0.2.8.dif ++++++

++++++ vmx-manager-0.2.5.tar.bz2 -> vmx-manager-0.2.8.tar.bz2 ++++++
++++ 4243 lines of diff (skipped)
++++    retrying with extended exclude list
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/vmx-manager-0.2.5/ChangeLog new/vmx-manager-0.2.8/ChangeLog
--- old/vmx-manager-0.2.5/ChangeLog	2007-01-31 01:07:53.000000000 +0100
+++ new/vmx-manager-0.2.8/ChangeLog	2007-05-23 18:36:36.000000000 +0200
@@ -1,3 +1,21 @@
+2007-05-23  James Willcox  <snorp@novell.com>
+
+	* configure.ac: bump to 0.2.8
+	* src/VirtualMachine.cs: VMware Player 2.0 uses different lock
+	files, so monitor those as well.
+
+2007-03-15  James Willcox  <snorp@novell.com>
+
+	* configure.ac: bump to 0.2.7
+	* src/CdDriveCombo.cs: avoid a null ref exception when no drives
+	are found.  Seriously fixes 247589.
+
+2007-03-01  James Willcox  <snorp@novell.com>
+
+	* configure.ac: bump to 0.2.6
+	* src/Utility.cs (FindCdDrives): avoid a null ref exception when
+	there no drives found.  Fixes 247589
+
 2007-01-30  James Willcox  <snorp@novell.com>
 
 	* configure.ac: bump to 0.2.5
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/vmx-manager-0.2.5/configure.ac new/vmx-manager-0.2.8/configure.ac
--- old/vmx-manager-0.2.5/configure.ac	2007-01-31 01:01:52.000000000 +0100
+++ new/vmx-manager-0.2.8/configure.ac	2007-05-23 18:35:54.000000000 +0200
@@ -1,6 +1,6 @@
 AC_INIT(src/EntryPoint.cs)
 
-AM_INIT_AUTOMAKE(vmx-manager, 0.2.5)
+AM_INIT_AUTOMAKE(vmx-manager, 0.2.8)
 AM_MAINTAINER_MODE
 
 AC_PROG_INTLTOOL([0.21])
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/vmx-manager-0.2.5/intltool-extract.in new/vmx-manager-0.2.8/intltool-extract.in
--- old/vmx-manager-0.2.5/intltool-extract.in	2007-01-31 01:01:58.000000000 +0100
+++ new/vmx-manager-0.2.8/intltool-extract.in	2007-05-23 18:38:05.000000000 +0200
@@ -32,7 +32,7 @@
 ## Release information
 my $PROGRAM      = "intltool-extract";
 my $PACKAGE      = "intltool";
-my $VERSION      = "0.35.0";
+my $VERSION      = "0.35.5";
 
 ## Loaded modules
 use strict; 
@@ -114,6 +114,11 @@
 sub place_normal {
     $FILE	 = $ARGV[0];
     $OUTFILE     = "$FILE.h";
+
+    my $dirname = dirname ($OUTFILE);
+    if (! -d "$dirname" && $dirname ne "") {
+        system ("mkdir -p $dirname");
+    }
 }   
 
 sub place_local {
@@ -156,7 +161,7 @@
       --type=TYPE   Specify the file type of FILENAME. Currently supports:
                     "gettext/glade", "gettext/ini", "gettext/keys"
                     "gettext/rfc822deb", "gettext/schemas",
-                    "gettext/scheme", "gettext/xml"
+                    "gettext/scheme", "gettext/xml", "gettext/quoted"
   -l, --local       Writes output into current working directory
                     (conflicts with --update)
       --update      Writes output into the same directory the source file 
@@ -212,6 +217,7 @@
     &type_scheme if $gettext_type eq "scheme";
     &type_schemas  if $gettext_type eq "schemas";
     &type_rfc822deb  if $gettext_type eq "rfc822deb";
+    &type_quoted if $gettext_type eq "quoted";
 }
 
 sub entity_decode_minimal
@@ -242,7 +248,7 @@
 {
     return '\"' if $_ eq '"';
     return '\n' if $_ eq "\n";
-    return '\\' if $_ eq '\\';
+    return '\\\\' if $_ eq '\\';
 
     return $_;
 }
@@ -255,8 +261,11 @@
 
 sub type_ini {
     ### For generic translatable desktop files ###
-    while ($input =~ /^_.*=(.*)$/mg) {
-        $messages{$1} = [];
+    while ($input =~ /^(#(.+)\n)?^_.*=(.*)$/mg) {
+        if (defined($2))  {
+            $comments{$3} = $2;
+        }
+        $messages{$3} = [];
     }
 }
 
@@ -711,6 +720,17 @@
     return @list;
 }
 
+sub type_quoted {
+    while ($input =~ /\"(([^\"]|\\\")*[^\\\"])\"/g) {
+        my $message = $1;
+        my $before = $`;
+        $message =~ s/\\\"/\"/g;
+        $before =~ s/[^\n]//g;
+        $messages{$message} = [];
+        $loc{$message} = length ($before) + 2;
+    }
+}
+
 sub type_glade {
     ### For translatable Glade XML files ###
 
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/vmx-manager-0.2.5/intltool-merge.in new/vmx-manager-0.2.8/intltool-merge.in
--- old/vmx-manager-0.2.5/intltool-merge.in	2007-01-31 01:01:58.000000000 +0100
+++ new/vmx-manager-0.2.8/intltool-merge.in	2007-05-23 18:38:05.000000000 +0200
@@ -35,7 +35,7 @@
 ## Release information
 my $PROGRAM = "intltool-merge";
 my $PACKAGE = "intltool";
-my $VERSION = "0.35.0";
+my $VERSION = "0.35.5";
 
 ## Loaded modules
 use strict; 
@@ -60,6 +60,7 @@
 my $DESKTOP_STYLE_ARG = 0;
 my $SCHEMAS_STYLE_ARG = 0;
 my $RFC822DEB_STYLE_ARG = 0;
+my $QUOTED_STYLE_ARG = 0;
 my $QUIET_ARG = 0;
 my $PASS_THROUGH_ARG = 0;
 my $UTF8_ARG = 0;
@@ -79,6 +80,7 @@
  "desktop-style|d" => \$DESKTOP_STYLE_ARG,
  "schemas-style|s" => \$SCHEMAS_STYLE_ARG,
  "rfc822deb-style|r" => \$RFC822DEB_STYLE_ARG,
+ "quoted-style" => \$QUOTED_STYLE_ARG,
  "pass-through|p" => \$PASS_THROUGH_ARG,
  "utf8|u" => \$UTF8_ARG,
  "multiple-output|m" => \$MULTIPLE_OUTPUT,
@@ -157,6 +159,14 @@
 	&rfc822deb_merge_translations;
 	&finalize;
 } 
+elsif ($QUOTED_STYLE_ARG && @ARGV > 2) 
+{
+	&utf8_sanity_check;
+	&preparation;
+	&print_message;
+	"ed_merge_translations;
+	&finalize;
+} 
 else 
 {
 	&print_help;
@@ -193,6 +203,7 @@
   -k, --keys-style       includes translations in the keys style
   -s, --schemas-style    includes translations in the schemas style
   -r, --rfc822deb-style  includes translations in the RFC822 style
+      --quoted-style     includes translations in the quoted string style
   -x, --xml-style        includes translations in the standard xml style
 
 Other options:
@@ -415,7 +426,7 @@
         {
 	    $nextfuzzy = 1 if /^#, fuzzy/;
        
-	    if (/^msgid "((\\.|[^\\])*)"/ ) 
+	    if (/^msgid "((\\.|[^\\]+)*)"/ ) 
             {
 		$translations{$lang, $msgid} = $msgstr if $inmsgstr && $msgid && $msgstr;
 		$msgid = "";
@@ -431,14 +442,14 @@
 		$nextfuzzy = 0;
 	    }
 
-	    if (/^msgstr "((\\.|[^\\])*)"/) 
+	    if (/^msgstr "((\\.|[^\\]+)*)"/) 
             {
 	        $msgstr = unescape_po_string($1);
 		$inmsgstr = 1;
 		$inmsgid = 0;
 	    }
 
-	    if (/^"((\\.|[^\\])*)"/) 
+	    if (/^"((\\.|[^\\]+)*)"/) 
             {
 	        $msgid .= unescape_po_string($1) if $inmsgid;
 	        $msgstr .= unescape_po_string($1) if $inmsgstr;
@@ -1006,8 +1017,8 @@
 
     if ($MULTIPLE_OUTPUT) {
         for my $lang (sort keys %po_files_by_lang) {
-	    if ( ! -e $lang ) {
-	        mkdir $lang or die "Cannot create subdirectory $lang: $!\n";
+	    if ( ! -d $lang ) {
+	        mkdir $lang or -d $lang or die "Cannot create subdirectory $lang: $!\n";
             }
             open OUTPUT, ">$lang/$OUTFILE" or die "Cannot open $lang/$OUTFILE: $!\n";
             binmode (OUTPUT) if $^O eq 'MSWin32';
@@ -1354,3 +1365,39 @@
     return @list;
 }
 
+sub quoted_translation
+{
+    my ($lang, $string) = @_;
+
+    $string =~ s/\\\"/\"/g;
+
+    my $translation = $translations{$lang, $string};
+    $translation = $string if !$translation;
+
+    $translation =~ s/\"/\\\"/g;
+    return $translation
+}
+
+sub quoted_merge_translations
+{
+    if (!$MULTIPLE_OUTPUT) {
+        print "Quoted only supports Multiple Output.\n";
+        exit(1);
+    }
+
+    for my $lang (sort keys %po_files_by_lang) {
+        if ( ! -d $lang ) {
+            mkdir $lang or -d $lang or die "Cannot create subdirectory $lang: $!\n";
+        }
+        open INPUT, "<${FILE}" or die;
+        open OUTPUT, ">$lang/$OUTFILE" or die "Cannot open $lang/$OUTFILE: $!\n";
+        binmode (OUTPUT) if $^O eq 'MSWin32';
+        while (<INPUT>) 
+        {
+            s/\"(([^\"]|\\\")*[^\\\"])\"/"\"" . "ed_translation($lang, $1) . "\""/ge;
+            print OUTPUT;
+        }
+        close OUTPUT;
+        close INPUT;
+    }
+}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/vmx-manager-0.2.5/intltool-update.in new/vmx-manager-0.2.8/intltool-update.in
--- old/vmx-manager-0.2.5/intltool-update.in	2007-01-31 01:01:58.000000000 +0100
+++ new/vmx-manager-0.2.8/intltool-update.in	2007-05-23 18:38:05.000000000 +0200
@@ -30,7 +30,7 @@
 
 ## Release information
 my $PROGRAM = "intltool-update";
-my $VERSION = "0.35.0";
+my $VERSION = "0.35.5";
 my $PACKAGE = "intltool";
 
 ## Loaded modules
@@ -90,10 +90,9 @@
 $| = 1;
 
 ## Sometimes the source tree will be rooted somewhere else.
-my $SRCDIR = ".";
+my $SRCDIR = $ENV{"srcdir"} || ".";
 my $POTFILES_in;
 
-$SRCDIR = $ENV{"srcdir"} if $ENV{"srcdir"};
 $POTFILES_in = "<$SRCDIR/POTFILES.in";
 
 my $devnull = ($^O eq 'MSWin32' ? 'NUL:' : '/dev/null');
@@ -124,8 +123,10 @@
 
 &Console_Write_IntltoolHelp if $arg_count > 1;
 
+my $PKGNAME = FindPackageName ();
+
 # --version and --help don't require a module name
-my $MODULE = $GETTEXT_PACKAGE || &FindPackageName || "unknown";
+my $MODULE = $GETTEXT_PACKAGE || $PKGNAME || "unknown";
 
 if ($POT_ARG)
 {
@@ -316,7 +317,8 @@
 	@buf_potfiles_ignore,
 	@buf_allfiles,
 	@buf_allfiles_sorted,
-	@buf_potfiles_sorted
+	@buf_potfiles_sorted,
+        @buf_potfiles_ignore_sorted
     );
 
     ## Search and find all translatable files
@@ -342,7 +344,7 @@
     ## comparing with POTFILES.in
     foreach my $ignore ("POTFILES.skip", "POTFILES.ignore")
     {
-	(-s $ignore) or next;
+	(-s "$SRCDIR/$ignore") or next;
 
 	if ("$ignore" eq "POTFILES.ignore")
 	{
@@ -351,7 +353,7 @@
 	}
 
 	print "Found $ignore: Ignoring files...\n" if $VERBOSE;
-	open FILE, "<$ignore" or die "ERROR: Failed to open $ignore!\n";
+	open FILE, "<$SRCDIR/$ignore" or die "ERROR: Failed to open $SRCDIR/$ignore!\n";
 	    
 	while (<FILE>)
 	{
@@ -359,7 +361,7 @@
 	}
 	close FILE;
 
-	@buf_potfiles = (@buf_potfiles_ignore, @buf_potfiles);
+	@buf_potfiles_ignore_sorted = sort (@buf_potfiles_ignore);
     }
 
     foreach my $file (@buf_i18n_plain)
@@ -417,7 +419,7 @@
 		}
 	    }	    
 
-	    if (/\.GetString ?\(QUOTEDTEXT/)
+	    if (/\w\.GetString *\(QUOTEDTEXT/)
 	    {
                 if (defined isNotValidMissing (unpack("x3 A*", $file))) {
                     ## Remove the first 3 chars and add newline
@@ -426,7 +428,8 @@
 		last;
 	    }
 
-	    if (/_\(QUOTEDTEXT/)
+            ## N_ Q_ and _ are the three macros defined in gi8n.h
+	    if (/[NQ]?_ *\(QUOTEDTEXT/)
 	    {
                 if (defined isNotValidMissing (unpack("x3 A*", $file))) {
                     ## Remove the first 3 chars and add newline
@@ -489,6 +492,11 @@
 	$in2{$_} = 1;
     }
 
+    foreach (@buf_potfiles_ignore_sorted) 
+    {
+	$in2{$_} = 1;
+    }
+
     my @result;
 
     foreach (@buf_allfiles_sorted)
@@ -504,7 +512,7 @@
     foreach (@buf_potfiles_sorted)
     {
 	chomp (my $dummy = $_);
-	if ("$dummy" ne "" and ! -f "../$dummy")
+	if ("$dummy" ne "" and !(-f "$SRCDIR/../$dummy" or -f "../$dummy"))
 	{
 	    push @buf_potfiles_notexist, $_;
 	}
@@ -537,7 +545,7 @@
 	    warn "\n" if ($VERBOSE or @result);
 	    warn "\e[1mThe following files do not exist anymore:\e[0m\n\n";
 	    warn @buf_potfiles_notexist, "\n";
-	    warn "Please remove them from POTFILES.in or POTFILES.skip. A file \e[1m'notexist'\e[0m\n".
+	    warn "Please remove them from POTFILES.in. A file \e[1m'notexist'\e[0m\n".
 		 "containing this list of absent files has been written in the current directory.\n";
 	}
     }
@@ -557,14 +565,11 @@
 
 sub GenerateHeaders
 {
-    my $EXTRACT = "@INTLTOOL_EXTRACT@";
-    chomp $EXTRACT;
-
-    $EXTRACT = $ENV{"INTLTOOL_EXTRACT"} if $ENV{"INTLTOOL_EXTRACT"};
+    my $EXTRACT = $ENV{"INTLTOOL_EXTRACT"} || "intltool-extract";
 
     ## Generate the .h header files, so we can allow glade and
     ## xml translation support
-    if (! -x "$EXTRACT")
+    if (0)
     {
 	print STDERR "\n *** The intltool-extract script wasn't found!"
 	     ."\n *** Without it, intltool-update can not generate files.\n";
@@ -671,12 +676,8 @@
 	} 
 	else 
 	{
-	    if ($SRCDIR eq ".") {
-	        print OUTFILE "../$_\n";
-	    } else {
-	        print OUTFILE "$SRCDIR/../$_\n";
-	    }
-	    $gettext_code = &TextFile_DetermineEncoding ("../$_") if ($gettext_support_nonascii and not defined $forced_gettext_code);
+            print OUTFILE "$SRCDIR/../$_\n";
+	    $gettext_code = &TextFile_DetermineEncoding ("$SRCDIR/../$_") if ($gettext_support_nonascii and not defined $forced_gettext_code);
 	}
 
 	next if (! $gettext_support_nonascii);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/vmx-manager-0.2.5/po/ChangeLog new/vmx-manager-0.2.8/po/ChangeLog
--- old/vmx-manager-0.2.5/po/ChangeLog	2007-01-03 20:56:33.000000000 +0100
+++ new/vmx-manager-0.2.8/po/ChangeLog	2007-04-03 23:47:37.000000000 +0200
@@ -0,0 +1,3 @@
+2007-02-23  Daniel Nylander <po@danielnylander.se>
+
+	* sv.po: Added Swedish translation.
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/vmx-manager-0.2.5/po/Makefile.in.in new/vmx-manager-0.2.8/po/Makefile.in.in
--- old/vmx-manager-0.2.5/po/Makefile.in.in	2007-01-31 01:01:58.000000000 +0100
+++ new/vmx-manager-0.2.8/po/Makefile.in.in	2007-05-23 18:38:05.000000000 +0200
@@ -25,7 +25,7 @@
 
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-top_builddir = ..
+top_builddir = @top_builddir@
 VPATH = @srcdir@
 
 prefix = @prefix@
@@ -56,15 +56,19 @@
 
 PO_LINGUAS=$(shell if test -r $(srcdir)/LINGUAS; then grep -v "^\#" $(srcdir)/LINGUAS; fi)
 
-POFILES=$(shell if test -n "$(PO_LINGUAS)"; then LINGUAS="$(PO_LINGUAS)"; else LINGUAS="$(ALL_LINGUAS)"; fi; for lang in $$LINGUAS; do printf "$$lang.po "; done)
+USER_LINGUAS=$(shell if test -n "$(LINGUAS)"; then LLINGUAS="$(LINGUAS)"; ALINGUAS="$(ALL_LINGUAS)"; for lang in $$LLINGUAS; do if test -n "`grep ^$$lang$$ $(srcdir)/LINGUAS`" -o -n "`echo $$ALINGUAS|grep ' ?$$lang ?'`"; then printf "$$lang "; fi; done; fi)
+
+USE_LINGUAS=$(shell if test -n "$(USER_LINGUAS)"; then LLINGUAS="$(USER_LINGUAS)"; else if test -n "$(PO_LINGUAS)"; then LLINGUAS="$(PO_LINGUAS)"; else LLINGUAS="$(ALL_LINGUAS)"; fi; fi; for lang in $$LLINGUAS; do printf "$$lang "; done)
+
+POFILES=$(shell LINGUAS="$(USE_LINGUAS)"; for lang in $$LINGUAS; do printf "$$lang.po "; done)
 
 DISTFILES = ChangeLog Makefile.in.in POTFILES.in $(POFILES)
 EXTRA_DISTFILES = POTFILES.skip Makevars LINGUAS
 
 POTFILES = \
-#This Gets Replace for some reason
+# This comment gets stripped out
 
-CATALOGS=$(shell if test -n "$(PO_LINGUAS)"; then LINGUAS="$(PO_LINGUAS)"; else LINGUAS="$(ALL_LINGUAS)"; fi; for lang in $$LINGUAS; do printf "$$lang.gmo "; done)
+CATALOGS=$(shell LINGUAS="$(USE_LINGUAS)"; for lang in $$LINGUAS; do printf "$$lang.gmo "; done)
 
 .SUFFIXES:
 .SUFFIXES: .po .pox .gmo .mo .msg .cat
@@ -98,11 +102,7 @@
 install-data-no: all
 install-data-yes: all
 	$(mkdir_p) $(DESTDIR)$(itlocaledir)
-	if test -n "$(PO_LINGUAS)"; then \
-	  linguas="$(PO_LINGUAS)"; \
-	else \
-	  linguas="$(ALL_LINGUAS)"; \
-	fi; \
+	linguas="$(USE_LINGUAS)"; \
 	for lang in $$linguas; do \
 	  dir=$(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES; \
 	  $(mkdir_p) $$dir; \
@@ -136,17 +136,18 @@
 installcheck:
 
 uninstall:
-	if test -n "$(PO_LINGUAS)"; then \
-	  linguas="$(PO_LINGUAS)"; \
-	else \
-	  linguas="$(ALL_LINGUAS)"; \
-	fi; \
+	linguas="$(USE_LINGUAS)"; \
 	for lang in $$linguas; do \
 	  rm -f $(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo; \
 	  rm -f $(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo.m; \
 	done
 
 check: all $(GETTEXT_PACKAGE).pot
+	rm -f missing notexist
+	srcdir=$(srcdir) $(INTLTOOL_UPDATE) -m
+	if [ -r missing -o -r notexist ]; then \
+	  exit 1; \
+	fi
 
 mostlyclean:
 	rm -f *.pox $(GETTEXT_PACKAGE).pot *.old.po cat-id-tbl.tmp
@@ -179,11 +180,7 @@
 update-po: Makefile
 	$(MAKE) $(GETTEXT_PACKAGE).pot
 	tmpdir=`pwd`; \
-	if test -n "$(PO_LINGUAS)"; then \
-	  linguas="$(PO_LINGUAS)"; \
-	else \
-	  linguas="$(ALL_LINGUAS)"; \
-	fi; \
+	linguas="$(USE_LINGUAS)"; \
 	for lang in $$linguas; do \
 	  echo "$$lang:"; \
 	  result="`$(MSGMERGE) -o $$tmpdir/$$lang.new.po $$lang`"; \
@@ -211,8 +208,8 @@
 	  $(MAKE) stamp-it; \
 	fi
 
-stamp-it: Makefile.in.in ../config.status POTFILES.in
-	cd .. \
+stamp-it: Makefile.in.in $(top_builddir)/config.status POTFILES.in
+	cd $(top_builddir) \
 	  && CONFIG_FILES=$(subdir)/Makefile.in CONFIG_HEADERS= CONFIG_LINKS= \
 	       $(SHELL) ./config.status
 
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/vmx-manager-0.2.5/src/CdDriveCombo.cs new/vmx-manager-0.2.8/src/CdDriveCombo.cs
--- old/vmx-manager-0.2.5/src/CdDriveCombo.cs	2007-01-03 20:56:33.000000000 +0100
+++ new/vmx-manager-0.2.8/src/CdDriveCombo.cs	2007-03-15 19:39:21.000000000 +0100
@@ -21,9 +21,12 @@
             CellRendererText renderer = new CellRendererText ();
             PackStart (renderer, true);
             AddAttribute (renderer, "text", 0);
-            
-            foreach (Hal.Device dev in hal.FindDeviceByCapabilityAsDevice ("storage.cdrom")) {
-                AddDevice (dev);
+
+            Hal.Device[] list = hal.FindDeviceByCapabilityAsDevice ("storage.cdrom");
+            if (list != null) {
+                foreach (Hal.Device dev in list) {
+                    AddDevice (dev);
+                }
             }
         }
 
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/vmx-manager-0.2.5/src/Utility.cs new/vmx-manager-0.2.8/src/Utility.cs
--- old/vmx-manager-0.2.5/src/Utility.cs	2007-01-31 01:04:02.000000000 +0100
+++ new/vmx-manager-0.2.8/src/Utility.cs	2007-03-01 19:03:48.000000000 +0100
@@ -356,7 +356,12 @@
             Hal.Manager hal = new Hal.Manager ();
 
             List<string> devices = new List<string> ();
-            foreach (Hal.Device dev in hal.FindDeviceByCapabilityAsDevice ("storage.cdrom")) {
+            Hal.Device[] list = hal.FindDeviceByCapabilityAsDevice ("storage.cdrom");
+            if (list == null) {
+                return devices;
+            }
+
+            foreach (Hal.Device dev in list) {
                 devices.Add (dev.GetPropertyString ("block.device"));
             }
 
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/vmx-manager-0.2.5/src/VirtualMachine.cs new/vmx-manager-0.2.8/src/VirtualMachine.cs
--- old/vmx-manager-0.2.5/src/VirtualMachine.cs	2007-01-30 22:54:35.000000000 +0100
+++ new/vmx-manager-0.2.8/src/VirtualMachine.cs	2007-05-23 18:35:44.000000000 +0200
@@ -62,10 +62,9 @@
         public event EventHandler NameChanged;
         public event EventHandler FileNameChanged;
 
-        private string LockFileName {
-            get { return file + ".WRITELOCK"; }
+        private string[] LockFileNames {
+            get { return new string[] { file + ".WRITELOCK", file + ".lck"}; }
         }
-
         
         public string FileName {
             get { return file; }
@@ -601,20 +600,37 @@
             }
         }
 
+        private bool IsLockFile (string path) {
+            foreach (string lockfile in LockFileNames) {
+                if (path == lockfile) {
+                    return true;
+                }
+            }
+
+            return false;
+        }
+
         private void OnFileCreated (object o, FileSystemEventArgs args) {
-            if (args.FullPath == LockFileName || args.FullPath == CheckPointFileName) {
+            if (IsLockFile (args.FullPath) || args.FullPath == CheckPointFileName) {
                 UpdateStatus ();
             }
         }
 
         private void OnFileDeleted (object o, FileSystemEventArgs args) {
-            if (args.FullPath == LockFileName || args.FullPath == CheckPointFileName) {
+            if (IsLockFile (args.FullPath) || args.FullPath == CheckPointFileName) {
                 UpdateStatus ();
             }
         }
 
         private void UpdateStatus () {
-            bool lockExists = File.Exists (LockFileName);
+            bool lockExists = false;
+            foreach (string lockfile in LockFileNames) {
+                if (File.Exists (lockfile) || Directory.Exists (lockfile)) {
+                    lockExists = true;
+                    break;
+                }
+            }
+                
             bool checkPointExists = File.Exists (CheckPointFileName);
 
             VirtualMachineStatus newstatus;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/vmx-manager-0.2.5/TODO new/vmx-manager-0.2.8/TODO
--- old/vmx-manager-0.2.5/TODO	1970-01-01 01:00:00.000000000 +0100
+++ new/vmx-manager-0.2.8/TODO	2007-02-08 23:21:06.000000000 +0100
@@ -0,0 +1,6 @@
+- Get rid of the cheesy VirtualMachine.AddFooDevice methods, and just have
+  AddDevice and RemoveDevice.
+
+- Add the ability to expand disks
+
+- Consider adding the ability to shrink disks


++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org

    

root＠Hilbert.suse.de

tags

participants (1)