[SCM] mate-applets Debian package branch, master, updated. debian/1.8.0+dfsg1-1-3-gb1f5fd4

[Vangelis Mouhtsis]

Gitweb-URL: http://git.debian.org/?p=pkg-mate/mate-applets.git;a=commitdiff;h=b1f5fd4

The following commit has been merged in the master branch:
commit b1f5fd458f3eabb1e2f7f07b218d991dc8eae27d
Merge: a97747feee841d72e748c26f33223c0e3394fcc2 bb4b4c5019deb87fbc0ff0e7ea126804c31daba5
Author: Vangelis Mouhtsis <vangelis at gnugr.org>
Date:   Wed May 7 12:02:08 2014 +0300

    debian/rules: Replace on dh_install --list-missing -> --fail-missing

 debian/changelog                                   |   8 +
 debian/compat                                      |   2 +-
 debian/control                                     |  24 +--
 debian/copyright                                   | 223 ++++++++++++++-------
 debian/man/mate-cpufreq-selector.1                 |  29 +++
 debian/man/mate-invest-chart.1                     |  43 ++++
 debian/mate-applets-common.install                 |   3 -
 debian/mate-applets.manpages                       |   1 +
 .../2001_omit-gfdl-licensed-help-files.patch       | 144 +++++++++++++
 debian/patches/README                              |   3 +
 debian/patches/series                              |   1 +
 debian/rules                                       |  36 +++-
 debian/watch                                       |   4 +-
 13 files changed, 428 insertions(+), 93 deletions(-)

diff --cc debian/changelog
index 070f1dd,8dddd40..47349f1
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,5 -1,5 +1,13 @@@
++<<<<<<< HEAD
 +mate-applets (1.8.0-1) UNRELEASED; urgency=low
 +
 +  * Initial release. (Closes: #734888).
 +
 + -- Vangelis Mouhtsis <vangelis at gnugr.org>  Fri, 18 Apr 2014 17:34:09 +0300
++=======
+ mate-applets (1.8.0+dfsg1-1) unstable; urgency=low
+ 
+   * Initial release. (Closes: #734888).
+ 
+  -- Mike Gabriel <sunweaver at debian.org>  Mon, 21 Apr 2014 13:57:07 +0200
++>>>>>>> bb4b4c5019deb87fbc0ff0e7ea126804c31daba5
diff --cc debian/rules
index b0d9917,7bd86c2..698f0ce
--- a/debian/rules
+++ b/debian/rules
@@@ -1,10 -1,17 +1,17 @@@
  #!/usr/bin/make -f
  
+ PKD   = $(word 1,$(abspath $(dir $(MAKEFILE_LIST))))
+ PKG   = $(word 2,$(shell dpkg-parsechangelog -l$(PKD)/changelog | grep ^Source))
+ UVER  = $(shell dpkg-parsechangelog -l$(PKD)/changelog | perl -ne 'print $$1 if m{^Version:\s+(?:\d+:)?(\d.*)(?:\-\d+.*)};')
+ DTYPE = +dfsg1
+ VER  ?= $(subst $(DTYPE),,$(UVER))
+ 
  include /usr/share/cdbs/1/rules/debhelper.mk
- #include /usr/share/cdbs/1/rules/utils.mk
  include /usr/share/cdbs/1/class/autotools.mk
  
- DEB_DH_INSTALL_ARGS += --list-missing
+ DEB_BUILD_PARALLEL = 1
+ 
 -DEB_DH_INSTALL_ARGS += --list-missing
++DEB_DH_INSTALL_ARGS += --fail-missing
  
  DEB_CONFIGURE_SCRIPT := ./autogen.sh
  

-- 
mate-applets Debian package