[Pkg-voip-commits] r4854 - in /siproxd/trunk/debian: changelog copyright rules

[msp at alioth.debian.org]

Author: msp
Date: Wed Nov 21 11:38:52 2007
New Revision: 4854

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=4854
Log:
* Remove debian/patches/pidopt.diff; included upstream
* cleanup debian/copyright
* debian/rules cleanup get-orig-source using cdbs variables

Modified:
    siproxd/trunk/debian/changelog
    siproxd/trunk/debian/copyright
    siproxd/trunk/debian/rules

Modified: siproxd/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/siproxd/trunk/debian/changelog?rev=4854&op=diff
==============================================================================
--- siproxd/trunk/debian/changelog (original)
+++ siproxd/trunk/debian/changelog Wed Nov 21 11:38:52 2007
@@ -10,9 +10,11 @@
   [ Mark Purcell ]
   * debian/rules switch to simple-patchsys.mk
   * Rework openlogger-2.diff
-  * debian/patches/pidopt.diff included upstream
-
- -- Mark Purcell <msp at debian.org>  Wed, 21 Nov 2007 06:59:11 +0000
+  * Remove debian/patches/pidopt.diff; included upstream
+  * cleanup debian/copyright
+  * debian/rules cleanup get-orig-source using cdbs variables
+
+ -- Mark Purcell <msp at debian.org>  Wed, 21 Nov 2007 11:38:07 +0000
 
 siproxd (1:0.5.13-1) unstable; urgency=low
 

Modified: siproxd/trunk/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-voip/siproxd/trunk/debian/copyright?rev=4854&op=diff
==============================================================================
--- siproxd/trunk/debian/copyright (original)
+++ siproxd/trunk/debian/copyright Wed Nov 21 11:38:52 2007
@@ -1,12 +1,36 @@
 This package was debianized by Dan Weber <dan at mirrorlynx.com> on
 Sun, 15 Feb 2004 11:09:36 -0500.
 
-It was downloaded from http://www.ries.ch.vu/siproxd/
+It was downloaded from <url://example.com>
 
-Upstream Author: Thomas Ries <tries at users.sourceforge.net>
+Upstream Author: 
 
-Copyright:
+    Thomas Ries <tries at users.sourceforge.net>
 
-This is copyrighted 100% percent under the GPL.
-The license can be found on any debian system located
-in /usr/share/common-licenses/GPL
+Copyright: 
+
+    Copyright (C) 2002-2007  Thomas Ries <tries at gmx.net>
+    Copyright (C) 2005-2007 Hans Carlos Hofmann <labtop-carlos at hchs.de>
+
+License:
+
+    Siproxd is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This package is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+ 
+    You should have received a copy of the GNU General Public License
+    along with this package; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+
+On Debian systems, the complete text of the GNU General
+Public License can be found in `/usr/share/common-licenses/GPL'.
+
+The Debian packaging is licensed under the GPL, see above.
+	(C) 2004, Dan Weber <dan at mirrorlynx.com> and
+	(C) 2007, Debian pkg-voip-maintainers team.

Modified: siproxd/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-voip/siproxd/trunk/debian/rules?rev=4854&op=diff
==============================================================================
--- siproxd/trunk/debian/rules (original)
+++ siproxd/trunk/debian/rules Wed Nov 21 11:38:52 2007
@@ -1,6 +1,9 @@
 #!/usr/bin/make -f
 
 #Copyright Dan Weber <dan at mirrorlynx.com> 2004
+
+FILENAME := siproxd_$(DEB_UPSTREAM_VERSION).orig.tar.gz
+URL := http://switch.dl.sourceforge.net/siproxd/siproxd-$(DEB_UPSTREAM_VERSION).tar.gz
 
 -include /usr/share/cdbs/1/rules/simple-patchsys.mk
 -include /usr/share/cdbs/1/rules/debhelper.mk
@@ -9,13 +12,6 @@
 export DH_VERBOSE=1
 DEB_CONFIGURE_EXTRA_FLAGS :=--with-libosip-prefix=/usr
 DEB_CONFIGURE_SCRIPT_ENV += LDFLAGS="-lnss_dns"
-
-DEBVERSION:=$(shell head -n 1 debian/changelog \
-		    | sed -e 's/^[^(]*(\([^)]*\)).*/\1/')
-UPVERSION:=$(shell echo $(DEBVERSION) | sed -e 's/^.*://' -e 's/-[0-9.]*$$//' -e 's/.dfsg$$//')
-
-FILENAME := siproxd_$(UPVERSION).orig.tar.gz
-URL := http://switch.dl.sourceforge.net/siproxd/siproxd-$(UPVERSION).tar.gz
 
 clean::
 	dh_clean debian/man/siproxd.8
@@ -28,10 +24,6 @@
 	chmod 644 -v debian/siproxd/etc/siproxd.conf
 	rm -f debian/siproxd/etc/siproxd_passwd.cfg
 
-print-version:
-	@@echo "Debian version:          $(DEBVERSION)"
-	@@echo "Upstream version:        $(UPVERSION)"
-
 get-orig-source:
 	@@dh_testdir
 	@@[ -d ../tarballs/. ]||mkdir -p ../tarballs