[SCM] ardour Debian packaging branch, master, updated. upstream/2.8.2-87-g1c78c13

[adiknoth-guest at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit b0eeed964db7d07c5042d56c0c734ec57798f45d
Author: Adrian Knoth <adi at drcomp.erfurt.thur.de>
Date:   Wed Aug 12 13:55:21 2009 +0200

    Added mimetype handles for .ardour files (Closes: #541118)

diff --git a/debian/ardour-altivec.desktop b/debian/ardour-altivec.desktop
index bed3d8f..c792d0b 100644
--- a/debian/ardour-altivec.desktop
+++ b/debian/ardour-altivec.desktop
@@ -7,3 +7,4 @@ Terminal=false
 Type=Application
 Icon=/usr/share/ardour2/icons/ardour_icon_22px.png
 Categories=AudioVideo;Audio;
+MimeType=application/x-ardour;
diff --git a/debian/ardour-i686.desktop b/debian/ardour-i686.desktop
index 7988bf8..8268cd1 100644
--- a/debian/ardour-i686.desktop
+++ b/debian/ardour-i686.desktop
@@ -7,3 +7,4 @@ Terminal=false
 Type=Application
 Icon=/usr/share/ardour2/icons/ardour_icon_22px.png
 Categories=AudioVideo;Audio;
+MimeType=application/x-ardour;
diff --git a/debian/ardour-opt.desktop b/debian/ardour-opt.desktop
index 34f29d2..87cd294 100644
--- a/debian/ardour-opt.desktop
+++ b/debian/ardour-opt.desktop
@@ -7,3 +7,4 @@ Terminal=false
 Type=Application
 Icon=/usr/share/ardour2/icons/ardour_icon_22px.png
 Categories=AudioVideo;Audio;
+MimeType=application/x-ardour;
diff --git a/debian/ardour.desktop b/debian/ardour.desktop
index 2ae1a36..d48b5d9 100644
--- a/debian/ardour.desktop
+++ b/debian/ardour.desktop
@@ -7,3 +7,4 @@ Terminal=false
 Type=Application
 Icon=/usr/share/ardour2/icons/ardour_icon_22px.png
 Categories=AudioVideo;Audio;
+MimeType=application/x-ardour;
diff --git a/gtk2_ardour/ardour2.xml b/debian/ardour.sharedmimeinfo
similarity index 70%
copy from gtk2_ardour/ardour2.xml
copy to debian/ardour.sharedmimeinfo
index dd1c46e..c93411b 100644
--- a/gtk2_ardour/ardour2.xml
+++ b/debian/ardour.sharedmimeinfo
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <mime-info xmlns="http://www.freedesktop.org/standards/shared-mime-info">
-  <mime-type type="application/x-ardour2">
-  <sub-class-of type="application/xml"/>
+  <mime-type type="application/x-ardour">
   <comment>Ardour session file</comment>
   <glob pattern="*.ardour"/>
+  <generic-icon name="application-x-ardour"/>
   </mime-type>
 </mime-info>
diff --git a/debian/changelog b/debian/changelog
index c205897..4b46239 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,7 @@ ardour (1:2.8.2-1) UNRELEASED; urgency=low
   * Fix lintian warning about debian/NEWS
   * Bump standards version
   * Set DH compat version to 6
+  * Added mimetype handles for .ardour files (Closes: #541118)
 
  -- Adrian Knoth <adi at drcomp.erfurt.thur.de>  Sat, 25 Jul 2009 12:25:17 +0200
 
diff --git a/debian/rules b/debian/rules
index a480ad1..152ed20 100755
--- a/debian/rules
+++ b/debian/rules
@@ -18,6 +18,7 @@ DEB_UPSTREAM_VERSION := $(shell echo $(DEB_VERSION) | sed 's/-[^-]*$$//')
 DEB_UPSTREAM_TARBALL_VERSION := $(shell echo $(DEB_UPSTREAM_VERSION) | sed 's/+[^+]*$$//')
 include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/gnome.mk
 DEB_CLEAN_EXCLUDE=debian/tmp
 DEB_DESTDIR = $(CURDIR)/debian/tmp/
 

-- 
ardour Debian packaging