[Pkg-voip-commits] r4412 - in openh323-titan/trunk/debian: . patches

[kilian at alioth.debian.org]

Author: kilian
Date: 2007-09-06 10:00:46 +0000 (Thu, 06 Sep 2007)
New Revision: 4412

Removed:
   openh323-titan/trunk/debian/patches/ixjlid.h.dpatch
Modified:
   openh323-titan/trunk/debian/patches/00list
   openh323-titan/trunk/debian/rules
Log:
fix build.


Modified: openh323-titan/trunk/debian/patches/00list
===================================================================
--- openh323-titan/trunk/debian/patches/00list	2007-09-06 09:43:12 UTC (rev 4411)
+++ openh323-titan/trunk/debian/patches/00list	2007-09-06 10:00:46 UTC (rev 4412)
@@ -4,5 +4,4 @@
 notrace
 printon_with_notrace
 ixjuser.h
-ixjlid.h
-pwlib_versioned_plugins
+#pwlib_versioned_plugins

Deleted: openh323-titan/trunk/debian/patches/ixjlid.h.dpatch
===================================================================
--- openh323-titan/trunk/debian/patches/ixjlid.h.dpatch	2007-09-06 09:43:12 UTC (rev 4411)
+++ openh323-titan/trunk/debian/patches/ixjlid.h.dpatch	2007-09-06 10:00:46 UTC (rev 4412)
@@ -1,18 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## ixjlid.h.dpatch by Kilian Krause <kilian at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Fix compilation of IXJ on Ubuntu
-
- at DPATCH@
-diff -urN openh323.old/include/ixjlid.h openh323-1.18.0.dfsg/include/ixjlid.h
---- openh323.old/include/ixjlid.h	2006-03-02 12:12:52.000000000 +0100
-+++ openh323-1.18.0.dfsg/include/ixjlid.h	2006-12-26 13:55:31.000000000 +0100
-@@ -274,7 +274,6 @@
- 
- #ifdef P_LINUX
- #include <linux/telephony.h>
--#include <linux/compiler.h>
- #include <linux/ixjuser.h>
- #endif
- 

Modified: openh323-titan/trunk/debian/rules
===================================================================
--- openh323-titan/trunk/debian/rules	2007-09-06 09:43:12 UTC (rev 4411)
+++ openh323-titan/trunk/debian/rules	2007-09-06 10:00:46 UTC (rev 4412)
@@ -40,8 +40,8 @@
 UPVERSION := $(shell echo $(DEBVERSION) | sed -e 's/^.*://' -e 's/-[0-9.]*$$//' -e 's/.dfsg$$//')
 URLVERSION := $(shell echo $(DEBVERSION) | sed -e 's/^.*://' -e 's/-[0-9.]*$$//' -e 's/.dfsg$$//' -e 's/\./_/g')
 
-FILENAME := openh323_$(UPVERSION).dfsg.orig.tar.gz
-UPFILENAME := openh323_$(UPVERSION).orig.tar.gz
+FILENAME := openh323-titan_$(UPVERSION)~dfsg.orig.tar.gz
+UPFILENAME := openh323-titan_$(UPVERSION).orig.tar.gz
 URL := http://www.voxgratia.org/releases/openh323-v$(URLVERSION)-src-tar.gz
 
 include /usr/share/dpatch/dpatch.make
@@ -99,12 +99,13 @@
 	#$(MAKE) $(MAKE_BUILD_PARAM) -C samples/simple clean 
 	#$(RM) -rf samples/simple/obj_*
 	# save it to install in package later...
-	
+	cp debian/libopenh323-dev.docs debian/$(PACKAGE)-dev.docs
 	touch build-arch-stamp
 
 build-indep: build-indep-stamp
 build-indep-stamp:
 	$(MAKE) $(MAKE_BUILD_PARAM) docs
+	cp debian/libopenh323-doc.docs debian/$(PACKAGE)-doc.docs
 	touch build-indep-stamp
 
 clean: clean-patched unpatch
@@ -137,7 +138,6 @@
 	dh_testroot
 	dh_clean -k -i
 	dh_installdirs -i
-	cp debian/libopenh323-doc.docs debian/$(PACKAGE)-doc.docs
 
 install-arch:
 	dh_testdir
@@ -179,7 +179,6 @@
 	ln -s ../../include/openh323/version.h debian/libopenh323-dev/usr/share/openh323/
 	ln -s ../../include/openh323 debian/libopenh323-dev/usr/share/openh323/include
 	ln -s ../../lib debian/libopenh323-dev/usr/share/openh323/
-	cp debian/libopenh323-dev.docs debian/$(PACKAGE)-dev.docs
 
 #	doc
 	cp debian/libopenh323.docs debian/$(PACKAGE).docs