[Pkg-voip-commits] r1122 - in stun/trunk/debian: . patches

[Kilian Krause]

Author: kilian
Date: 2006-01-03 00:29:09 +0000 (Tue, 03 Jan 2006)
New Revision: 1122

Added:
   stun/trunk/debian/patches/
   stun/trunk/debian/patches/00list
   stun/trunk/debian/patches/fix_non_i386.dpatch
Modified:
   stun/trunk/debian/control
   stun/trunk/debian/rules
Log:
minor cleanups to compile on !i386


Modified: stun/trunk/debian/control
===================================================================
--- stun/trunk/debian/control	2006-01-03 00:21:00 UTC (rev 1121)
+++ stun/trunk/debian/control	2006-01-03 00:29:09 UTC (rev 1122)
@@ -2,7 +2,7 @@
 Section: net
 Priority: optional
 Maintainer: Kilian Krause <kilian at debian.org>
-Build-Depends: debhelper (>= 4.0.0)
+Build-Depends: debhelper (>= 4.0.0), dpatch
 Standards-Version: 3.6.1
 
 Package: stun

Added: stun/trunk/debian/patches/00list
===================================================================
--- stun/trunk/debian/patches/00list	2006-01-03 00:21:00 UTC (rev 1121)
+++ stun/trunk/debian/patches/00list	2006-01-03 00:29:09 UTC (rev 1122)
@@ -0,0 +1 @@
+fix_non_i386

Added: stun/trunk/debian/patches/fix_non_i386.dpatch
===================================================================
--- stun/trunk/debian/patches/fix_non_i386.dpatch	2006-01-03 00:21:00 UTC (rev 1121)
+++ stun/trunk/debian/patches/fix_non_i386.dpatch	2006-01-03 00:29:09 UTC (rev 1122)
@@ -0,0 +1,27 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## fix_non_i386.dpatch by Kilian Krause <kilian at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Remove i386-only code analogous to twinkle
+ at DPATCH@
+--- stun-0.96.orig/stun.cxx
++++ stun-0.96/stun.cxx
+@@ -669,16 +669,8 @@
+       tick = hightick;
+       tick <<= 32;
+       tick |= lowtick;
+-#elif defined(__GNUC__) && ( defined(__i686__) || defined(__i386__) )
+-      asm("rdtsc" : "=A" (tick));
+-#elif defined (__SUNPRO_CC) || defined( __sparc__ )
+-      tick = gethrtime();
+-#elif defined(__MACH__)
+-      int fd=open("/dev/random",O_RDONLY);
+-      read(fd,&tick,sizeof(tick));
+-      closesocket(fd);
+ #else
+-#     error Need some way to seed the random number generator
++      tick = time(NULL);
+ #endif
+       int seed = int(tick);
+ #ifdef WIN32
+


Property changes on: stun/trunk/debian/patches/fix_non_i386.dpatch
___________________________________________________________________
Name: svn:executable
   + *

Modified: stun/trunk/debian/rules
===================================================================
--- stun/trunk/debian/rules	2006-01-03 00:21:00 UTC (rev 1121)
+++ stun/trunk/debian/rules	2006-01-03 00:29:09 UTC (rev 1122)
@@ -9,9 +9,6 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-
-
-
 CFLAGS = -Wall -g
 
 ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
@@ -20,17 +17,10 @@
 	CFLAGS += -O2
 endif
 
-configure: configure-stamp
-configure-stamp:
-	dh_testdir
-	# Add here commands to configure the package.
+include /usr/share/dpatch/dpatch.make
 
-	touch configure-stamp
-
-
 build: build-stamp
-
-build-stamp: configure-stamp 
+build-stamp: patch-stamp 
 	dh_testdir
 
 	# Add here commands to compile the package.
@@ -39,7 +29,8 @@
 
 	touch build-stamp
 
-clean:
+clean: clean-unpatched unpatch
+clean-unpatched:
 	dh_testdir
 	dh_testroot
 	rm -f build-stamp configure-stamp
@@ -73,24 +64,12 @@
 	dh_installchangelogs 
 	dh_installdocs
 	dh_installexamples
-#	dh_install
-#	dh_installmenu
-#	dh_installdebconf	
-#	dh_installlogrotate
-#	dh_installemacsen
-#	dh_installpam
-#	dh_installmime
-#	dh_installinit
-#	dh_installcron
-#	dh_installinfo
+	dh_installinit
 	dh_installman
 	dh_link
 	dh_strip
 	dh_compress
 	dh_fixperms
-#	dh_perl
-#	dh_python
-#	dh_makeshlibs
 	dh_installdeb
 	dh_shlibdeps
 	dh_gencontrol
@@ -98,4 +77,4 @@
 	dh_builddeb
 
 binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install configure
+.PHONY: build clean binary-indep binary-arch binary install