[SCM] GNU Shockwave Flash (SWF) player branch, master, updated. debian/0.8.10_git20111001-1-9-g75830a0

[Gabriele Giacone]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Shockwave Flash (SWF) player".

The branch, master has been updated
       via  75830a0666c34e2c8451c2107f77c9b8a72d1b8e (commit)
       via  dc78af9f027ef21416d664514d0d9d282c56f4b6 (commit)
       via  3894557979daaa1c843eca1f7cd3effb0eb75f22 (commit)
       via  7e0704c0af13df8b51afd7a0f4c095a4e29902ad (commit)
       via  3bc4793df95200ef65ed2854c3a6e337782d29fb (commit)
      from  f1c0e0cd2a467191f559cc5ac56d21f653c17f26 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 75830a0666c34e2c8451c2107f77c9b8a72d1b8e
Author: Gabriele Giacone <1o5g4r8o at gmail.com>
Date:   Mon Oct 31 20:14:41 2011 +0100

    Add nocheck build option

commit dc78af9f027ef21416d664514d0d9d282c56f4b6
Author: Gabriele Giacone <1o5g4r8o at gmail.com>
Date:   Mon Oct 31 20:06:56 2011 +0100

    Force version with make only

commit 3894557979daaa1c843eca1f7cd3effb0eb75f22
Author: Gabriele Giacone <1o5g4r8o at gmail.com>
Date:   Mon Oct 31 18:22:11 2011 +0100

    dpkg-parsechangelog for version.

commit 7e0704c0af13df8b51afd7a0f4c095a4e29902ad
Author: Gabriele Giacone <1o5g4r8o at gmail.com>
Date:   Mon Oct 31 17:47:25 2011 +0100

    Remove empty lines.

commit 3bc4793df95200ef65ed2854c3a6e337782d29fb
Author: Gabriele Giacone <1o5g4r8o at gmail.com>
Date:   Mon Oct 31 17:46:38 2011 +0100

    Add noapidoc build option.

-----------------------------------------------------------------------

Summary of changes:
 debian/changelog            |    3 ++-
 debian/gnash-common.install |    2 --
 debian/gnash-dev.install    |    1 -
 debian/rules                |   16 +++++++++++-----
 4 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index ec1be16..bcb8749 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,8 +3,9 @@ gnash (0.8.10~git20111001-2) UNRELEASED; urgency=low
   * Transition to dh_python2.
   * Fix d/copyright according to DEP-5.
   * Remove dash escaping in manpages (Closes: #640107).
+  * Add noapidoc and nocheck build options.
 
- -- Gabriele Giacone <1o5g4r8o at gmail.com>  Sun, 23 Oct 2011 15:48:29 +0200
+ -- Gabriele Giacone <1o5g4r8o at gmail.com>  Mon, 31 Oct 2011 20:14:06 +0100
 
 gnash (0.8.10~git20111001-1) unstable; urgency=low
 
diff --git a/debian/gnash-common.install b/debian/gnash-common.install
index 0e084ae..5b1fedb 100644
--- a/debian/gnash-common.install
+++ b/debian/gnash-common.install
@@ -1,5 +1,3 @@
-
-
 debian/gnash.png usr/share/pixmaps/
 debian/gnash.xpm usr/share/pixmaps/
 usr/bin/gnash
diff --git a/debian/gnash-dev.install b/debian/gnash-dev.install
index ad132f9..d101f17 100644
--- a/debian/gnash-dev.install
+++ b/debian/gnash-dev.install
@@ -1,4 +1,3 @@
-
 usr/include/gnash
 usr/lib/gnash/libgnashamf.so
 usr/lib/gnash/libgnashbase.so
diff --git a/debian/rules b/debian/rules
index 972469c..0f839c8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,8 +5,8 @@ export DEB_BUILD_HARDENING=1
 DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 
-MAIN_VERSION = $(shell head -n 1 debian/changelog | cut '-d ' -f 2 | sed 's/[()]//g')
-BUILD_VERSION = $(shell head -n 1 debian/changelog | cut '-d ' -f 2 | sed 's/^[()]//' | sed 's/-.*//' | sed 's/~.*//' | sed 's/+.*//')
+MAIN_VERSION = $(shell dpkg-parsechangelog|sed -n '/^Version/{s/Version: \(.*\)/\1/p}')
+BUILD_VERSION = $(shell echo $(MAIN_VERSION)|sed -n 's/\([0-9.]*\)[-+~].*/\1/p')
 
 INFILES   := $(wildcard debian/*.desktop.in)
 OUTFILES  := $(INFILES:.desktop.in=.desktop)
@@ -60,20 +60,26 @@ CONFIGURE_FLAGS = \
 override_dh_auto_configure:
 	./autogen.sh
 	mkdir -p $(OBJDIR)
-	cd $(OBJDIR) && ../configure VERSION="$(BUILD_VERSION)" $(CONFIGURE_FLAGS)
+	cd $(OBJDIR) && ../configure $(CONFIGURE_FLAGS)
 
 override_dh_auto_build: $(OUTFILES)
 	$(MAKE) -C $(OBJDIR) VERSION="$(BUILD_VERSION)"
+ifeq (,$(filter noapidoc,$(DEB_BUILD_OPTIONS)))
 	$(MAKE) -C $(OBJDIR) apidoc
+else
+	mkdir -p $(OBJDIR)/doc/apidoc
+endif
 	cd debian && for i in *.sng; do sng "$$i"; done
 
 override_dh_auto_test:
+ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
 	$(MAKE) -C $(OBJDIR) check
 	$(MAKE) -C $(OBJDIR) anal
+endif
 
 override_dh_auto_install:
-	$(MAKE) -C $(OBJDIR) install VERSION="$(BUILD_VERSION)" DESTDIR=$(CURDIR)/debian/tmp
-	$(MAKE) -C $(OBJDIR) install-plugins VERSION="$(BUILD_VERSION)" DESTDIR=$(CURDIR)/debian/tmp
+	$(MAKE) -C $(OBJDIR) install DESTDIR=$(CURDIR)/debian/tmp
+	$(MAKE) -C $(OBJDIR) install-plugins DESTDIR=$(CURDIR)/debian/tmp
 	dh_installchangelogs NEWS
 
 	# dh_buildinfo output only in gnash-common


hooks/post-receive
-- 
GNU Shockwave Flash (SWF) player