[PackageKit-commit] packagekit: Branch 'master' - 3 commits

[Richard Hughes]

 data/Makefile.am                    |    3 ++-
 data/packagekit-pack.xml.in         |    9 ---------
 data/packagekit-package-list.xml.in |    9 +++++++++
 data/packagekit-servicepack.xml.in  |    9 +++++++++
 docs/html/files/.gitignore          |    1 +
 5 files changed, 21 insertions(+), 10 deletions(-)

New commits:
commit 67854a4ed584c07d6c595946f77478005c8991a3
Author: Richard Hughes <richard at hughsie.com>
Date:   Mon Oct 13 10:40:04 2008 +0100

    bugfix: the mime type of a service pack is x-servicepack, not x-pack

diff --git a/data/Makefile.am b/data/Makefile.am
index 7540ff8..c38682a 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -32,7 +32,7 @@ mimedir = $(datadir)/mime/packages
 mime_in_files = 					\
 	packagekit-catalog.xml.in			\
 	packagekit-package-list.xml.in			\
-	packagekit-pack.xml.in				\
+	packagekit-servicepack.xml.in			\
 	$(NULL)						
 mime_DATA = $(mime_in_files:.xml.in=.xml)
 
diff --git a/data/packagekit-pack.xml.in b/data/packagekit-pack.xml.in
deleted file mode 100644
index 1e00ab8..0000000
--- a/data/packagekit-pack.xml.in
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<mime-info xmlns="http://www.freedesktop.org/standards/shared-mime-info">
-  <mime-type type="application/x-pack">
-    <_comment>PackageKit Service Pack</_comment>
-    <glob pattern="*.servicepack"/>
-    <generic-icon name="package-x-generic"/>
-  </mime-type>
-</mime-info>
-
diff --git a/data/packagekit-servicepack.xml.in b/data/packagekit-servicepack.xml.in
new file mode 100644
index 0000000..dc9a3cb
--- /dev/null
+++ b/data/packagekit-servicepack.xml.in
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<mime-info xmlns="http://www.freedesktop.org/standards/shared-mime-info">
+  <mime-type type="application/x-servicepack">
+    <_comment>PackageKit Service Pack</_comment>
+    <glob pattern="*.servicepack"/>
+    <generic-icon name="package-x-generic"/>
+  </mime-type>
+</mime-info>
+
commit 4936cc5feed5d0680ddd07957920a628b181c74f
Author: Richard Hughes <richard at hughsie.com>
Date:   Mon Oct 13 10:38:05 2008 +0100

    trivial: gitignore update

diff --git a/docs/html/files/.gitignore b/docs/html/files/.gitignore
index 7802a1d..6c9f511 100644
--- a/docs/html/files/.gitignore
+++ b/docs/html/files/.gitignore
@@ -1,3 +1,4 @@
 system
 session
+*.pdf
 
commit 5f9b68462c47bd31dba921814d4e81a474ea57d3
Author: Richard Hughes <richard at hughsie.com>
Date:   Mon Oct 13 10:37:24 2008 +0100

    bugfix: register the mime-type x-package-list as we are using it for service packs

diff --git a/data/Makefile.am b/data/Makefile.am
index 14ac591..7540ff8 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -31,6 +31,7 @@ endif
 mimedir = $(datadir)/mime/packages
 mime_in_files = 					\
 	packagekit-catalog.xml.in			\
+	packagekit-package-list.xml.in			\
 	packagekit-pack.xml.in				\
 	$(NULL)						
 mime_DATA = $(mime_in_files:.xml.in=.xml)
diff --git a/data/packagekit-package-list.xml.in b/data/packagekit-package-list.xml.in
new file mode 100644
index 0000000..d2c6cbd
--- /dev/null
+++ b/data/packagekit-package-list.xml.in
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<mime-info xmlns="http://www.freedesktop.org/standards/shared-mime-info">
+  <mime-type type="application/x-package-list">
+    <_comment>PackageKit Package List</_comment>
+    <glob pattern="*.package-list"/>
+    <generic-icon name="package-x-generic"/>
+  </mime-type>
+</mime-info>
+