[Pkg-voip-commits] r7494 - in /openr2/trunk/debian: changelog control copyright rules

[tzafrir-guest at alioth.debian.org]

Author: tzafrir-guest
Date: Tue Aug 11 10:41:56 2009
New Revision: 7494

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=7494
Log:
* New upstream release: 1.2.0-RC1
* A "dfsg" tarball for removing upstream debian/ dir for now.
* Maintained by pkg-voip, and add myself as uploader.
* A get-orig-source target

Modified:
    openr2/trunk/debian/changelog
    openr2/trunk/debian/control
    openr2/trunk/debian/copyright
    openr2/trunk/debian/rules

Modified: openr2/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/openr2/trunk/debian/changelog?rev=7494&op=diff
==============================================================================
--- openr2/trunk/debian/changelog (original)
+++ openr2/trunk/debian/changelog Tue Aug 11 10:41:56 2009
@@ -1,4 +1,4 @@
-openr2 (1.2.0-2) unstable; urgency=low
+openr2 (1.2.0~rc1~dfsg-1) unstable; urgency=low
 
   [ Alexandre Cavalcante Alencar ]
   * Initial release (Closes: #524118)
@@ -6,4 +6,7 @@
   [ Victor Seva ]
   * Fix debian/watch
 
- -- Alexandre Cavalcante Alencar <alexandre.alencar at gmail.com>  Mon, 13 Apr 2009 14:34:00 -0300
+  [ Tzafrir Cohen ]
+  * "dfsg" tarball for stripping upstream debian/ directory. 
+
+ -- Tzafrir Cohen <tzafrir.cohen at xorcom.com>  Tue, 11 Aug 2009 13:38:18 +0300

Modified: openr2/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-voip/openr2/trunk/debian/control?rev=7494&op=diff
==============================================================================
--- openr2/trunk/debian/control (original)
+++ openr2/trunk/debian/control Tue Aug 11 10:41:56 2009
@@ -1,6 +1,8 @@
 Source: openr2
 Priority: extra
-Maintainer: Alexandre Cavalcante Alencar <alexandre.alencar at gmail.com>
+Maintainer: Debian VoIP Team <pkg-voip-maintainers at lists.alioth.debian.org>
+Uploaders: Alexandre Cavalcante Alencar <alexandre.alencar at gmail.com>,
+ Tzafrir Cohen <tzafrir.cohen at xorcom.com>
 # It could depend on 'dahdi-source | zaptel-source' but getting run-time 
 # deps would be more complicated
 Build-Depends: debhelper (>= 7), autotools-dev, dahdi-source
@@ -34,6 +36,6 @@
  Underwood, the user has the option to provide a MF interface to use his own
  MF R2 tone generation and detection so the library will use them when needed,
  that's why this library does not depend directly on spandsp, libteletone or
- zaptel for tone generation and detection (depends on zaptel for ABCD bits and
+ dahdi for tone generation and detection (depends on dahdi for ABCD bits and
  general media transmission though)
 

Modified: openr2/trunk/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-voip/openr2/trunk/debian/copyright?rev=7494&op=diff
==============================================================================
--- openr2/trunk/debian/copyright (original)
+++ openr2/trunk/debian/copyright Tue Aug 11 10:41:56 2009
@@ -13,6 +13,9 @@
 
 
 Summary: Most files are under the terms of LGPL2.1+ . Some under LPGL2.1
+
+Tarball is currently renamed to be "dfsg" merely due to the presence of 
+a debian/ subdirectory and not due to any copyright/licensing issues.
 
 License:
 

Modified: openr2/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-voip/openr2/trunk/debian/rules?rev=7494&op=diff
==============================================================================
--- openr2/trunk/debian/rules (original)
+++ openr2/trunk/debian/rules Tue Aug 11 10:41:56 2009
@@ -31,6 +31,17 @@
  awk '{if (match($$0,/[0-9]+\.[0-9]+\.[0-9]+$$/)) print substr($$0,RSTART)}'`
 major=`ls src/.libs/lib*.so.* | \
  awk '{if (match($$0,/\.so\.[0-9]+$$/)) print substr($$0,RSTART+4)}'`
+
+PACKAGE:=openr2
+DEBVERSION:=$(shell head -n 1 debian/changelog \
+		    | sed -e 's/^[^(]*(\([^)]*\)).*/\1/')
+DEB_NOEPOCH_VERSION:=$(shell echo $(DEBVERSION) | cut -d':' -f 2)
+DEB_SRC_VERSION:=$(shell echo $(DEB_NOEPOCH_VERSION) | sed -e 's/-[0-9.]*$$//')
+UPVERSION:=$(shell echo $(DEB_SRC_VERSION) | sed -e 's/[.~]dfsg//' -e 's/~\(\(rc\|beta\)[0-9]\)/\1/')
+
+FILENAME := $(PACKAGE)_$(DEB_SRC_VERSION).orig.tar.gz
+UPFILENAME := $(PACKAGE)_$(UPVERSION).orig.tar.gz
+URL := http://openr2.googlecode.com/files/$(PACKAGE)-$(UPVERSION).tar.gz
 
 config.status: configure
 	dh_testdir
@@ -102,5 +113,26 @@
 	dh_md5sums
 	dh_builddeb
 
+print-version:
+	@@echo "Debian version:          $(DEBVERSION)"
+	@@echo "Upstream version:        $(UPVERSION)"
+
+TMP_TARBALL_DIR=../tarballs/$(PACKAGE)-$(UPVERSION).tmp
+TMP_TARBALL_TOP=$(TMP_TARBALL_DIR)/$(PACKAGE)-$(UPVERSION)
+get-orig-source:
+	@@dh_testdir
+	@@[ -d ../tarballs/. ]||mkdir -p ../tarballs
+	@@echo Downloading $(UPFILENAME) from $(URL) ...
+	@@wget -nv -T10 -t3 -O ../tarballs/$(UPFILENAME) $(URL)
+	@@echo Repacking as DFSG-free...
+	@@mkdir -p $(TMP_TARBALL_DIR)
+	@@cd $(TMP_TARBALL_DIR) ; \
+	tar xfz ../$(UPFILENAME) 
+	@@rm -rf  $(TMP_TARBALL_TOP)/debian
+	@@cd $(TMP_TARBALL_DIR) ; \
+	tar cfz ../$(FILENAME) *
+	@@echo Cleaning up...
+	@@$(RM) -rf $(TMP_TARBALL_DIR)
+
 binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install 
+.PHONY: build clean binary-indep binary-arch binary install print-version get-orig-source