From 5745d8df0f15109ba8c85d551f1cde7619497a03 Mon Sep 17 00:00:00 2001
From: Igor Pashev <pashev.igor@gmail.com>
Date: Sun, 21 Dec 2014 19:57:56 +0300
Subject: dh-smf (6) unstable; urgency=medium

  * Fixed code for skipping milestones.
---
 debian/changelog |  6 ++++++
 dh_smf           | 11 +++++------
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 4df421e..8789249 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+dh-smf (6) unstable; urgency=medium
+
+  * Fixed code for skipping milestones.
+
+ -- Igor Pashev <pashev.igor@gmail.com>  Sun, 21 Dec 2014 19:50:45 +0300
+
 dh-smf (5) unstable; urgency=medium
 
   * Support multiple services in a single manifest (after CUPS)
diff --git a/dh_smf b/dh_smf
index 4ecacad..b67d042 100755
--- a/dh_smf
+++ b/dh_smf
@@ -185,15 +185,14 @@ foreach my $package ( @{ $dh{DOPACKAGES} } ) {
             ],
         );
         while ( my ( $svc, $attrs ) = each %{ $xml->{'service'} } ) {
-            push @services, mkservices( $svc, $attrs );
+            push @services, mkservices( $svc, $attrs )
+              unless $svc =~ /milestone\//;
         }
     }
 
-# Ignore milestones and dummy services. A milestone is usually a dummy service as well
-    @services = grep {
-             $_->{'name'} !~ /milestone\//
-          && $_->{'exec_method'}->{'start'}->{'exec'} ne ':true'
-    } @services;
+    # Ignore dummy services.
+    @services =
+      grep { $_->{'exec_method'}->{'start'}->{'exec'} ne ':true' } @services;
 
     error("No SMF services found in @manifests") unless @services;
 
-- 
cgit v1.2.3