[Pkg-voip-commits] [asterisk] 01/01: Remove res/pjproject from the source tarball

[Jeremy Lainé]

This is an automated email from the git hooks/post-receive script.

sharky pushed a commit to branch master
in repository asterisk.

commit 825e3a6683ad59ccaef23f6e8b34e70fe07c5b05
Author: Jeremy Lainé <jeremy.laine at m4x.org>
Date:   Thu Oct 3 09:10:10 2013 +0200

    Remove res/pjproject from the source tarball
---
 debian/changelog |    6 ++++++
 debian/rules     |    3 ++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index cd81e21..383cbb6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+asterisk (1:11.5.1~dfsg1-1) UNRELEASED; urgency=low
+
+  * Remove res/pjproject from the source tarball (Closes: #725210).
+
+ -- Jeremy Lainé <jeremy.laine at m4x.org>  Thu, 03 Oct 2013 09:07:13 +0200
+
 asterisk (1:11.5.1~dfsg-2) unstable; urgency=low
 
   [ Jeremy Lainé ]
diff --git a/debian/rules b/debian/rules
index 742dc44..d1a03b6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -56,7 +56,7 @@ endif
 DEBVERSION:=$(shell dpkg-parsechangelog | sed -n -e 's/Version: //p')
 DEB_NOEPOCH_VERSION:=$(shell echo $(DEBVERSION) | cut -d':' -f 2)
 DEB_SRC_VERSION:=$(shell echo $(DEB_NOEPOCH_VERSION) | sed -e 's/-[^-]\+$$//')
-UPVERSION:=$(shell echo $(DEB_SRC_VERSION) | sed -e 's/[.~]dfsg//' -e 's/~\(\(rc\|beta\)[0-9]\)/-\1/')
+UPVERSION:=$(shell echo $(DEB_SRC_VERSION) | sed -e 's/[.~]dfsg[0-9]*//' -e 's/~\(\(rc\|beta\)[0-9]\)/-\1/')
 
 FILENAME := asterisk_$(DEB_SRC_VERSION).orig.tar.gz
 UPFILENAME := asterisk_$(UPVERSION).orig.tar.gz
@@ -181,6 +181,7 @@ get-orig-source:
 	@rm -rf $(TMP_TARBALL_TOP)/doc/Asterisk-Admin-Guide/
 	@rm -rf $(TMP_TARBALL_TOP)/doc/Asterisk-Admin-Guide.pdf
 	@rm -rf $(TMP_TARBALL_TOP)/codecs/ilbc
+	@rm -rf $(TMP_TARBALL_TOP)/res/pjproject
 	# While we're at it: remove some generated files that will become
 	# invalid:
 	@rm -rf $(TMP_TARBALL_TOP)/*/.makeopts

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-voip/asterisk.git