[Pkg-voip-commits] r1981 - in asterisk-addons/trunk/debian: . patches

[Tzafrir Cohen]

Author: tzafrir-guest
Date: 2006-06-29 16:44:20 +0000 (Thu, 29 Jun 2006)
New Revision: 1981

Removed:
   asterisk-addons/trunk/debian/patches/ooh323c_destdir.dpatch
Modified:
   asterisk-addons/trunk/debian/changelog
   asterisk-addons/trunk/debian/patches/00list
   asterisk-addons/trunk/debian/patches/nomarch.dpatch
Log:
* New upstream release.
* ooh323c_destdir.dpatch: removed, as applied by upstream.
* nomarch.dpatch: updated for new version

Modified: asterisk-addons/trunk/debian/changelog
===================================================================
--- asterisk-addons/trunk/debian/changelog	2006-06-29 12:50:04 UTC (rev 1980)
+++ asterisk-addons/trunk/debian/changelog	2006-06-29 16:44:20 UTC (rev 1981)
@@ -1,4 +1,4 @@
-asterisk-addons (1.2.2-1) UNRELEASED; urgency=low
+asterisk-addons (1.2.3-1) UNRELEASED; urgency=low
 
   * NOT YET RELEASED
   * New upstream release
@@ -6,8 +6,12 @@
   * Remove old unused patches and fix building on i386 with amd64 kernel.
   * call the upstream changelog a changelog
 
- -- Kilian Krause <kilian at debian.org>  Sun, 30 Apr 2006 17:09:15 +0200
+  [Tzafrir Cohen]
+  * ooh323c_destdir.dpatch: removed, as applied by upstream.
+  * nomarch.dpatch: updated for new version
 
+ -- Tzafrir Cohen <tzafrir.cohen at xorcom.com>  Thu, 29 Jun 2006 18:52:46 +0300
+
 asterisk-addons (1.2.1-1) unstable; urgency=low
 
   * New upstream release (1.2.1)

Modified: asterisk-addons/trunk/debian/patches/00list
===================================================================
--- asterisk-addons/trunk/debian/patches/00list	2006-06-29 12:50:04 UTC (rev 1980)
+++ asterisk-addons/trunk/debian/patches/00list	2006-06-29 16:44:20 UTC (rev 1981)
@@ -1,2 +1 @@
-ooh323c_destdir
 nomarch.dpatch

Modified: asterisk-addons/trunk/debian/patches/nomarch.dpatch
===================================================================
--- asterisk-addons/trunk/debian/patches/nomarch.dpatch	2006-06-29 12:50:04 UTC (rev 1980)
+++ asterisk-addons/trunk/debian/patches/nomarch.dpatch	2006-06-29 16:44:20 UTC (rev 1981)
@@ -16,7 +16,7 @@
 -# You must have GCC 3.4 to use k8, otherwise use athlon
 -PROC=k8
 -#PROC=athlon
--OPTIONS+=-m64
+-#OPTIONS+=-m64
 -endif
  ifeq ($(PROC),sparc64)
  #The problem with sparc is the best stuff is in newer versions of gcc (post 3.0) only.

Deleted: asterisk-addons/trunk/debian/patches/ooh323c_destdir.dpatch
===================================================================
--- asterisk-addons/trunk/debian/patches/ooh323c_destdir.dpatch	2006-06-29 12:50:04 UTC (rev 1980)
+++ asterisk-addons/trunk/debian/patches/ooh323c_destdir.dpatch	2006-06-29 16:44:20 UTC (rev 1981)
@@ -1,20 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## ooh323c_destdir.dpatch by  <tzafrir.cohen at xorcom.com>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: teach a makefile that is sort-of automake-made what DESTDIR is
-## -- applied upstream in 1.2 branch
-
- at DPATCH@
-diff -urNad asterisk-addons-1.2.1/asterisk-ooh323c/Makefile.in /tmp/dpep.L0z4b1/asterisk-addons-1.2.1/asterisk-ooh323c/Makefile.in
---- asterisk-addons-1.2.1/asterisk-ooh323c/Makefile.in	2005-11-29 20:51:27.000000000 +0200
-+++ /tmp/dpep.L0z4b1/asterisk-addons-1.2.1/asterisk-ooh323c/Makefile.in	2006-01-03 00:16:27.000000000 +0200
-@@ -1235,7 +1235,7 @@
- 	$(MAKE) "CFLAGS = -g -DGNU -D_GNU_SOURCE -D_REENTRANT" all
- 
- install: 
--	cp .libs/libchan_h323.so.1.0.1 /usr/lib/asterisk/modules/chan_ooh323.so
-+	cp .libs/libchan_h323.so.1.0.1 $(DESTDIR)/usr/lib/asterisk/modules/chan_ooh323.so
- 
- sample:
- 	cp h323.conf.sample /etc/asterisk/ooh323.conf