Merge branch 'master' of git.qubes-os.org:/var/lib/qubes/git/marmarek/core into spring-merge

2011-03-28 17:27:50 +02:00 · 2011-03-28 17:27:50 +02:00 · ad39a33496
commit ad39a33496
parent 81257fff75 6c2a6d4d4d
6 changed files with 9 additions and 5 deletions
--- a/appvm/.gitignore
+++ b/appvm/.gitignore
@ -1,3 +1,7 @@
 qubes_add_pendrive_script
 qubes_penctl
 qvm-open-in-dvm
+dvm_file_editor
+qfile-agent
+qfile-agent-dvm
+qfile-unpacker
--- a/rpm_spec/core-appvm.spec
+++ b/rpm_spec/core-appvm.spec
@ -24,7 +24,7 @@

 Name:		qubes-core-appvm
 Version:	%{version}
-Release:	1
+Release:	1%{dist}
 Summary:	The Qubes core files for AppVM

 Group:		Qubes
--- a/rpm_spec/core-commonvm.spec
+++ b/rpm_spec/core-commonvm.spec
@ -24,7 +24,7 @@

 Name:		qubes-core-commonvm
 Version:	%{version}
-Release:	1
+Release:	1%{dist}
 Summary:	The Qubes core files for any VM

 Group:		Qubes
--- a/rpm_spec/core-netvm.spec
+++ b/rpm_spec/core-netvm.spec
@ -24,7 +24,7 @@

 Name:		qubes-core-netvm
 Version:	%{version}
-Release:	1
+Release:	1%{dist}
 Summary:	The Qubes core files for NetVM

 Group:		Qubes
--- a/rpm_spec/core-proxyvm.spec
+++ b/rpm_spec/core-proxyvm.spec
@ -24,7 +24,7 @@

 Name:		qubes-core-proxyvm
 Version:	%{version}
-Release:	1
+Release:	1%{dist}
 Summary:	The Qubes core files for NetVM

 Group:		Qubes
--- a/2
+++ b/2
@ -1 +1 @@
-1.4.1
+1.5.1
 @ -1 +1 @@
 .4.1
 .5.1