[Pkg-voip-commits] r4951 - in /kphone/trunk/debian: NEWS changelog control rules watch

[msp at alioth.debian.org]

Author: msp
Date: Sat Dec  1 10:02:08 2007
New Revision: 4951

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=4951
Log:
* New Upstream Release
  - Switch to kphoneSI if users still wish to utilise kphone then
  I can recommend the kphone package from etch.
*
* Cleanup get-orig-source target

Added:
    kphone/trunk/debian/NEWS
Modified:
    kphone/trunk/debian/changelog
    kphone/trunk/debian/control
    kphone/trunk/debian/rules
    kphone/trunk/debian/watch

Added: kphone/trunk/debian/NEWS
URL: http://svn.debian.org/wsvn/pkg-voip/kphone/trunk/debian/NEWS?rev=4951&op=file
==============================================================================
--- kphone/trunk/debian/NEWS (added)
+++ kphone/trunk/debian/NEWS Sat Dec  1 10:02:08 2007
@@ -1,0 +1,8 @@
+kphone (2:1.1-1) unstable; urgency=low
+
+With this release Debian GNU/Linux switches upstream to kphoneSI.
+
+For those users who wish to continue with the existing kphone package
+it is recommended that that kphone package from etch be used.
+
+ -- Mark Purcell <msp at debian.org>  Sat, 01 Dec 2007 10:53:05 +0100

Modified: kphone/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/kphone/trunk/debian/changelog?rev=4951&op=diff
==============================================================================
--- kphone/trunk/debian/changelog (original)
+++ kphone/trunk/debian/changelog Sat Dec  1 10:02:08 2007
@@ -1,12 +1,18 @@
-kphone (1:4.2-7) UNRELEASED; urgency=low
-
-  * NOT RELEASED YET
-
+kphone (2:1.1-1) UNRELEASED; urgency=low
+
+  [ Mark Purcell ]
+  * New Upstream Release
+    - Switch to kphoneSI if users still wish to utilise kphone then
+    I can recommend the kphone package from etch.
+  *
+  * Cleanup get-orig-source target
+
+  [ Kilian Krause ]
   * Update menu to "Applications" rather than "Apps"
   * Update FSF address in copyright.
   * Add Homepage field as added in dpkg-dev 1.14.6.
 
- -- Kilian Krause <kilian at debian.org>  Sat, 22 Sep 2007 12:08:46 +0200
+ -- Mark Purcell <msp at debian.org>  Sat, 01 Dec 2007 10:51:05 +0100
 
 kphone (1:4.2-6) unstable; urgency=low
 

Modified: kphone/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-voip/kphone/trunk/debian/control?rev=4951&op=diff
==============================================================================
--- kphone/trunk/debian/control (original)
+++ kphone/trunk/debian/control Sat Dec  1 10:02:08 2007
@@ -9,7 +9,7 @@
 Vcs-Svn: svn://svn.debian.org/pkg-voip/kphone/trunk/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-voip/kphone/?op=log
 
-Package: kphone
+Package: kphoneSI
 Architecture: any
 Depends: ${shlibs:Depends}
 Description: Voice over IP (VoIP) phone application

Modified: kphone/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-voip/kphone/trunk/debian/rules?rev=4951&op=diff
==============================================================================
--- kphone/trunk/debian/rules (original)
+++ kphone/trunk/debian/rules Sat Dec  1 10:02:08 2007
@@ -6,26 +6,15 @@
 
 export QTDIR=/usr/share/qt3
   
-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 := kphone_$(UPVERSION).orig.tar.gz
-URL := http://www.wirlab.net/kphone/kphone-$(UPVERSION).tar.gz
-URL2 := http://ovh.dl.sourceforge.net/kphone/kphone-$(UPVERSION).tar.gz
+FILENAME = $(DEB_SOURCE_PACKAGE)_$(DEB_UPSTREAM_VERSION).orig.tar.gz
+URL = http://ovh.dl.sourceforge.net/$(DEB_SOURCE_PACKAGE)/$(DEB_SOURCE_PACKAGE)SI_$(DEB_UPSTREAM_VERSION).tar.gz
 
 -include /usr/share/cdbs/1/class/autotools.mk
 -include /usr/share/cdbs/1/rules/debhelper.mk
 -include /usr/share/cdbs/1/rules/simple-patchsys.mk
 
-print-version:
-	@@echo "Debian version:          $(DEBVERSION)"
-	@@echo "Upstream version:        $(UPVERSION)"
-
 get-orig-source:
 	@@dh_testdir
 	@@[ -d ../tarballs/. ]||mkdir -p ../tarballs
 	@@echo Downloading $(FILENAME) from $(URL) ...
-	@@wget -N -nv -T10 -t3 -O ../tarballs/$(FILENAME) $(URL) || \
-	@@wget -N -nv -T10 -t3 -O ../tarballs/$(FILENAME) $(URL2) 
-
+	@@wget -N -nv -T10 -t3 -O ../tarballs/$(FILENAME) $(URL) 

Modified: kphone/trunk/debian/watch
URL: http://svn.debian.org/wsvn/pkg-voip/kphone/trunk/debian/watch?rev=4951&op=diff
==============================================================================
--- kphone/trunk/debian/watch (original)
+++ kphone/trunk/debian/watch Sat Dec  1 10:02:08 2007
@@ -1,4 +1,5 @@
 # Site		Directory		Pattern			Version	Script
 # http://www.wirlab.net/kphone/
-version=2
-http://www.wirlab.net/kphone/	kphone-(.*)\.tar.gz	debian	svn-upgrade
+version=3
+#http://www.wirlab.net/kphone/	kphone-(.*)\.tar.gz	debian	svn-upgrade
+http://sf.net/kphone/ kphoneSI_(.*)\.tar\.gz debian svn-upgrade