[Pkg-voip-commits] r9918 - in /asterisk/branches/experimental/debian: changelog patches/menuselect_cflags

[paravoid at alioth.debian.org]

Author: paravoid
Date: Thu Jul 19 12:49:38 2012
New Revision: 9918

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=9918
Log:
Update to asterisk 10.6.1

Modified:
    asterisk/branches/experimental/debian/changelog
    asterisk/branches/experimental/debian/patches/menuselect_cflags

Modified: asterisk/branches/experimental/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/branches/experimental/debian/changelog?rev=9918&op=diff
==============================================================================
--- asterisk/branches/experimental/debian/changelog (original)
+++ asterisk/branches/experimental/debian/changelog Thu Jul 19 12:49:38 2012
@@ -1,12 +1,13 @@
-asterisk (1:10.5.2~dfsg-1) UNRELEASED; urgency=low
+asterisk (1:10.6.1~dfsg-1) UNRELEASED; urgency=low
 
   * New major upstream release.
     - Drop patch kfreebsd, fixed upstream.
     - Drop patch httpd_port, never affected 10.x.
+    - Adapt patch menuselect_cflags, partially merged.
   * Do not ship app_meetme.so and app_dahdibarge.so, deprecated by upstream.
     - Also remove them from asterisk-dahdi's full description.
 
- -- Faidon Liambotis <paravoid at debian.org>  Tue, 10 Jul 2012 04:04:41 +0300
+ -- Faidon Liambotis <paravoid at debian.org>  Thu, 19 Jul 2012 14:51:19 +0300
 
 asterisk (1:1.8.13.0~dfsg-1) unstable; urgency=high
 

Modified: asterisk/branches/experimental/debian/patches/menuselect_cflags
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/branches/experimental/debian/patches/menuselect_cflags?rev=9918&op=diff
==============================================================================
--- asterisk/branches/experimental/debian/patches/menuselect_cflags (original)
+++ asterisk/branches/experimental/debian/patches/menuselect_cflags Thu Jul 19 12:49:38 2012
@@ -30,56 +30,3 @@
  
  menuselect/menuselect: menuselect/makeopts
  	+$(MAKE_MENUSELECT) menuselect
---- a/menuselect/Makefile
-+++ b/menuselect/Makefile
-@@ -22,7 +22,7 @@ endif
- 
- # Basic set of sources and flags/libraries/includes
- OBJS:=menuselect.o strcompat.o
--CFLAGS:=-g -c -D_GNU_SOURCE -Wall
-+CFLAGS+=-g -c -D_GNU_SOURCE -Wall
- 
- ifeq ($(MENUSELECT_DEBUG),yes)
-   CFLAGS += -DMENUSELECT_DEBUG
-@@ -64,14 +64,14 @@ all: $(ALL_TGTS)
- $(OBJS) $(C_OBJS) $(N_OBJS) $(G_OBJS) $(M_OBJS): autoconfig.h menuselect.h
- 
- makeopts autoconfig.h: autoconfig.h.in makeopts.in
--	@./configure $(CONFIGURE_SILENT) CC= LD= AR= CFLAGS=
-+	@./configure $(CONFIGURE_SILENT)
- 
- $(ALL_TGTS): mxml/libmxml.a
- 
- ifdef C_OBJS
- menuselect_curses.o: CFLAGS+=$(C_INCLUDE)
- cmenuselect: $(OBJS) $(C_OBJS)
--	$(CC) -o $@ $^ $(C_LIBS)
-+	$(CC) $(LDFLAGS) -o $@ $^ $(C_LIBS)
- else
- cmenuselect:
- endif
-@@ -79,7 +79,7 @@ endif
- ifdef G_OBJS
- menuselect_gtk.o: CFLAGS+=$(G_INCLUDE)
- gmenuselect: $(OBJS) $(G_OBJS)
--	$(CC) -o $@ $^ $(G_LIBS)
-+	$(CC) $(LDFLAGS) -o $@ $^ $(G_LIBS)
- else
- gmenuselect:
- endif
-@@ -87,13 +87,13 @@ endif
- ifdef N_OBJS
- menuselect_newt.o: CFLAGS+=$(N_INCLUDE)
- nmenuselect: $(OBJS) $(N_OBJS)
--	$(CC) -o $@ $^ $(N_LIBS)
-+	$(CC) $(LDFLAGS) -o $@ $^ $(N_LIBS)
- else
- nmenuselect:
- endif
- 
- menuselect: $(OBJS) $(M_OBJS)
--	$(CC) -o $@ $^ $(M_LIBS)
-+	$(CC) $(LDFLAGS) -o $@ $^ $(M_LIBS)
- 
- mxml/libmxml.a:
- 	@if test ! -f mxml/Makefile ; then cd mxml && ./configure ; fi