[SCM] libdvdcss-pkg/master: host package version to encapsulate guest package version with debian revision number

[onlyjob at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit c62f140cb7a3bb3b81c1f3f7102a54a0b9edce7b
Author: Dmitry Smirnov <onlyjob at member.fsf.org>
Date:   Sun May 19 20:25:17 2013 +1000

    host package version to encapsulate guest package version with debian revision number

diff --git a/debian/README.source b/debian/README.source
index 433c30a..5be8653 100644
--- a/debian/README.source
+++ b/debian/README.source
@@ -7,9 +7,12 @@ Implementation:
    Upstream sources will be fetched using "uscan". After download
    orig.tar integrity is checked with known md5sum
 
- * Host package version (without debian revision) meant to be an exact
-   match of guest package with debian/watch file inherited from guest
-   package for notifications about new upstream versions.
+ * Host package version (without debian revision) should match version
+   of guest package with debian revision.
+
+ * debian/watch file of a host package meant to be the same as
+   debian/watch of guest package for notifications about new upstream
+   versions.
 
  * Installer is implemented as shell script installed as DPKG
    post-invoke handler.
diff --git a/debian/changelog b/debian/changelog
index 5e43271..25736aa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-libdvd-pkg (1.2.13-1) unstable; urgency=low
+libdvd-pkg (1.2.13-1-1) unstable; urgency=low
 
   * First release (Closes: #687624).
 
diff --git a/debian/rules b/debian/rules
index f78ab3b..f28332a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,8 +7,9 @@
 PKD  = $(abspath $(dir $(MAKEFILE_LIST)))
 PKG  = $(word 2,$(shell dpkg-parsechangelog -l$(PKD)/changelog | grep ^Source))
 PKGG = $(patsubst %-pkg,%,$(PKG))css
-VER = $(shell dpkg-parsechangelog -l$(PKD)/changelog | perl -ne 'print $$1 if m{Version:\s*([0-9.]+)}')
-VERG = $(shell dpkg-parsechangelog -l$(PKGG)/debian/changelog | perl -ne 'print $$1 if m{Version:\s*([0-9.]+(?:\+svn\d+)*)}')
+VER  = $(shell dpkg-parsechangelog -l$(PKD)/changelog | perl -ne 'print $$1 if m{Version:\s+(\d.*)(?:\-\d+.*)};')
+VERG = $(shell dpkg-parsechangelog -l$(PKGG)/debian/changelog | perl -ne 'print $$1 if m{Version:\s+(\d.*)};')
+## check if host package version (without debian revision) match full version of encapsulated guest package
 ifneq ($(VER), $(VERG))
     $(error Error: Packages' version mismatch: host/$(VER) != guest/$(VERG))
 endif

-- 
libdvdcss-pkg packaging