[Pkg-voip-commits] r6074 - in /dahdi-linux/trunk: dahdi/ debian/control debian/control.modules.in debian/dahdi-linux-source.dirs debian/dahdi-source.dirs debian/modulestest debian/rules

Mon Aug 25 13:09:41 UTC 2008

Author: tzafrir-guest
Date: Mon Aug 25 13:09:40 2008
New Revision: 6074

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=6074
Log:
Rename packages: dahdi-source instead of dahdi-linux-source 
(and likewise for the modules.

Added:
    dahdi-linux/trunk/debian/dahdi-source.dirs
      - copied unchanged from r6070, dahdi-linux/trunk/debian/dahdi-linux-source.dirs
Removed:
    dahdi-linux/trunk/dahdi/
    dahdi-linux/trunk/debian/dahdi-linux-source.dirs
Modified:
    dahdi-linux/trunk/debian/control
    dahdi-linux/trunk/debian/control.modules.in
    dahdi-linux/trunk/debian/modulestest
    dahdi-linux/trunk/debian/rules

Modified: dahdi-linux/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-voip/dahdi-linux/trunk/debian/control?rev=6074&op=diff
==============================================================================

--- dahdi-linux/trunk/debian/control (original)
+++ dahdi-linux/trunk/debian/control Mon Aug 25 13:09:40 2008
@@ -22,7 +22,7 @@
  .
  This package includes the minimal userspace parts that are included in 
 
-Package: dahdi-linux-source
+Package: dahdi-source
 Section: devel
 Architecture: all
 Depends: debhelper (>> 4.0), module-assistant (>= 0.8.1), bzip2

Modified: dahdi-linux/trunk/debian/control.modules.in
URL: http://svn.debian.org/wsvn/pkg-voip/dahdi-linux/trunk/debian/control.modules.in?rev=6074&op=diff
==============================================================================
--- dahdi-linux/trunk/debian/control.modules.in (original)
+++ dahdi-linux/trunk/debian/control.modules.in Mon Aug 25 13:09:40 2008
@@ -6,7 +6,7 @@
 Build-Depends: debhelper (>> 3.0.0), bzip2
 Standards-Version: 3.8.0.0
 
-Package: dahdi-linux-modules-_KVERS_
+Package: dahdi-modules-_KVERS_
 Architecture: any
 Provides: dahdi-modules
 Description: DAHDI modules for Linux (kernel _KVERS_).

Modified: dahdi-linux/trunk/debian/modulestest
URL: http://svn.debian.org/wsvn/pkg-voip/dahdi-linux/trunk/debian/modulestest?rev=6074&op=diff
==============================================================================
--- dahdi-linux/trunk/debian/modulestest (original)
+++ dahdi-linux/trunk/debian/modulestest Mon Aug 25 13:09:40 2008
@@ -11,6 +11,9 @@
 # kernel versions: Comma-separated. Use those if you have their
 # kernel-headers/linux-headers packages installed
 #
+
+# PACKAGE is set by svn-buildpackage to "dahdi-linux" . Override that:
+PACKAGE=dahdi
 
 # Full pathes to trees:
 # Use this to provide a full path to a custom kernel tree:

Modified: dahdi-linux/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-voip/dahdi-linux/trunk/debian/rules?rev=6074&op=diff
==============================================================================
--- dahdi-linux/trunk/debian/rules (original)
+++ dahdi-linux/trunk/debian/rules Mon Aug 25 13:09:40 2008
@@ -17,9 +17,10 @@
 
 ## MODULE-ASSISTANT STUFF
 # prefix of the target package name
-PREFIX:=dahdi-linux
+PREFIX:=dahdi
 SKPG:=$(PREFIX)-source
 PACKAGE:=$(PREFIX)-modules
+PACKAGE_SRC:=$(PREFIX)-linux
 # modifieable for experiments or debugging m-a
 MA_DIR ?= /usr/share/modass
 # load generic variable handling
@@ -32,9 +33,9 @@
 DEB_BASE_VERSION:=$(shell echo $(DEBVERSION) | sed -e 's/^.*://' -e 's/-[0-9.]*$$//')
 UPVERSION:=$(shell echo $(DEB_BASE_VERSION) | sed -e 's/~dfsg\(~\|$$\)/\1/' -e 's/~\(rc\|beta\)/-\1/')
 
-UPFILENAME := $(PREFIX)_$(UPVERSION).orig.tar.gz
-FILENAME := $(PREFIX)_$(DEB_BASE_VERSION).orig.tar.gz
-URL := http://downloads.digium.com/pub/telephony/$(PREFIX)/releases/$(PREFIX)-$(UPVERSION).tar.gz
+UPFILENAME := $(PACKAGE_SRC)_$(UPVERSION).orig.tar.gz
+FILENAME := $(PACKAGE_SRC)_$(DEB_BASE_VERSION).orig.tar.gz
+URL := http://downloads.digium.com/pub/telephony/$(PACKAGE_SRC)/releases/$(PACKAGE_SRC)-$(UPVERSION).tar.gz
 
 # If the makefile was properly-writen, there was a good separation 
 # between kernel and userspace. As things stand now I'd like to work
@@ -162,7 +163,7 @@
 	  debian/control.modules.in \
 	  $(TARDIR)/debian/
 	
-	tar cjf debian/$(PREFIX)-source/usr/src/$(PREFIX).tar.bz2 \
+	tar cjf debian/$(SKPG)/usr/src/$(PREFIX).tar.bz2 \
 	  -C $(TARPARDIR) modules
 ifeq (1,$(USE_BRISTUFF))
 	set -e; for module in cwain qozap zaphfc ztgsm; do \
@@ -193,8 +194,6 @@
 binary-arch: build install-arch
 	dh_testdir
 	dh_testroot
-	
-	#install -m644 debian/$(PREFIX).modprobe.d debian/$(PREFIX)/etc/modprobe.d/$(PREFIX)
 	
 	dh_installdocs -a
 	
@@ -221,7 +220,7 @@
 	@@echo "Debian version:          $(DEBVERSION)"
 	@@echo "Upstream version:        $(UPVERSION)"
 
-TARBALL_DIR=../tarballs/$(PREFIX)-$(UPVERSION).tmp
+TARBALL_DIR=../tarballs/$(PACKAGE_SRC)-$(UPVERSION).tmp
 get-orig-source:
 	@@dh_testdir
 	@@[ -d ../tarballs/. ]||mkdir -p ../tarballs
@@ -231,7 +230,7 @@
 	@@mkdir -p $(TARBALL_DIR)/
 	@@cd $(TARBALL_DIR) ; \
 	tar xfz ../$(UPFILENAME)
-	@@rm -rf $(TARBALL_DIR)/$(PREFIX)-$(UPVERSION)/drivers/dahdi/xpp/firmwares/*.hex
+	@@rm -rf $(TARBALL_DIR)/$(PACKAGE_SRC)-$(UPVERSION)/drivers/dahdi/xpp/firmwares/*.hex
 	@@cd $(TARBALL_DIR) ; \
 	tar cfz ../$(FILENAME) *
 	@@echo Cleaning up...


