5 files changed, 51 insertions, 17 deletions
diff --git a/debian/changelog b/debian/changelog
index 777da5ed..514fbd33 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+cups (1.7.5-10+dyson2) unstable; urgency=medium
+
+  * Fixed SMF manifest location
+  * Rebuilt with all deps
+  * Removed debian/clean
+  * Added debian/patches/dyson-smf.patch
+
+ -- Igor Pashev <pashev.igor@gmail.com>  Mon, 22 Dec 2014 13:34:11 +0300
+
 cups (1.7.5-10+dyson1) unstable; urgency=medium
 
   * Package for Dyson
diff --git a/debian/clean b/debian/clean
deleted file mode 100644
index 8cc61ba3..00000000
--- a/debian/clean
+++ /dev/null
@@ -1,16 +0,0 @@
-conf/cups-files.conf
-configure
-data/cups.path
-data/cups.service
-data/cups.socket
-data/testprint
-doc/help/man-cups-config.html
-doc/help/man-cups-lpd.html
-doc/help/man-cups-snmp.html
-doc/help/man-cupsd.conf.html
-doc/help/man-ipptoolfile.html
-doc/help/man-lppasswd.html
-doc/help/ref-cups-files-conf.html
-man/cups-files.conf.man
-man/cups-snmp.man
-test/ippfind-static
diff --git a/debian/patches/dyson-smf.patch b/debian/patches/dyson-smf.patch
new file mode 100644
index 00000000..54fd320e
--- /dev/null
+++ b/debian/patches/dyson-smf.patch
@@ -0,0 +1,40 @@
+Index: cups/scheduler/cups.xml.in
+===================================================================
+--- cups.orig/scheduler/cups.xml.in
++++ cups/scheduler/cups.xml.in
+@@ -23,7 +23,7 @@
+ <service_bundle type='manifest' name='SUNWcups:services'>
+ 
+ <service
+-    name='application/cups/scheduler'
++    name='application/cups'
+     type='service'
+     version='1'>
+ 
+@@ -66,7 +66,7 @@
+         exec=':kill'
+         timeout_seconds='60' />
+ 
+-    <instance name='default' enabled='false' >
++    <instance name='default' enabled='true' >
+ 
+         <dependency
+             name='config_data'
+@@ -112,7 +112,7 @@
+ </service>
+ 
+ <service
+-    name='application/cups/in-lpd'
++    name='application/cups-lpd'
+     type='service'
+     version='1'>
+ 
+@@ -164,7 +164,7 @@
+             grouping='require_all'
+             restart_on='none'
+             type='service'>
+-            <service_fmri value='svc:/application/cups/scheduler' />
++            <service_fmri value='svc:/application/cups' />
+         </dependency>
+ 
+         <exec_method
diff --git a/debian/patches/series b/debian/patches/series
index ed83d3bc..e7a90242 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -67,3 +67,4 @@ dyson-gssapi.patch
 dyson-sharedlibs.patch
 dyson-no-pie.patch
 dyson-man.patch
+dyson-smf.patch
diff --git a/debian/rules b/debian/rules
index e00cf161..775b4963 100755
--- a/debian/rules
+++ b/debian/rules
@@ -26,7 +26,7 @@ CONFIG_SYSTEMD := --with-systemdsystemunitdir=/lib/systemd/system
 endif
 ifeq (illumos,$(DEB_HOST_ARCH_OS))
 DH_WITH += smf
-CONFIG_SMF := --with-smfmanifestdir=/lib/svc/manifest/applications
+CONFIG_SMF := --with-smfmanifestdir=/lib/svc/manifest/application
 CONFIG_LIBUSB := --disable-libusb
 APPARMOR := yes
 endif