[Pkg-voip-commits] r2427 - in yxa/trunk/debian: . patches

Mikael Magnusson mikma-guest at costa.debian.org
Mon Sep 25 14:20:25 UTC 2006


Author: mikma-guest
Date: 2006-09-25 14:20:25 +0000 (Mon, 25 Sep 2006)
New Revision: 2427

Removed:
   yxa/trunk/debian/patches/distclean.dpatch
   yxa/trunk/debian/patches/homedomain.dpatch
   yxa/trunk/debian/patches/init-mnesia.dpatch
   yxa/trunk/debian/patches/yaws-fqdn.dpatch
Modified:
   yxa/trunk/debian/changelog
   yxa/trunk/debian/patches/00list
   yxa/trunk/debian/patches/yxa_yaws_makefile.dpatch
   yxa/trunk/debian/rules
   yxa/trunk/debian/yxa.install
Log:
New upstream snapshot, remove patches fixed upstream

Modified: yxa/trunk/debian/changelog
===================================================================
--- yxa/trunk/debian/changelog	2006-09-25 12:47:36 UTC (rev 2426)
+++ yxa/trunk/debian/changelog	2006-09-25 14:20:25 UTC (rev 2427)
@@ -1,4 +1,4 @@
-yxa (0.91-1) UNRELEASED; urgency=low
+yxa (0.91+20060922-1) UNRELEASED; urgency=low
 
   * Initial release (Closes: #377617)
 

Modified: yxa/trunk/debian/patches/00list
===================================================================
--- yxa/trunk/debian/patches/00list	2006-09-25 12:47:36 UTC (rev 2426)
+++ yxa/trunk/debian/patches/00list	2006-09-25 14:20:25 UTC (rev 2427)
@@ -1,10 +1,6 @@
 config
-erlang-otp-rel
-yaws-fqdn
+#erlang-otp-rel
 inet_dns
-distclean
-#init-mnesia
 net_util
-homedomain
 yxa_yaws_makefile
 yxa_yaws

Deleted: yxa/trunk/debian/patches/distclean.dpatch
===================================================================
--- yxa/trunk/debian/patches/distclean.dpatch	2006-09-25 12:47:36 UTC (rev 2426)
+++ yxa/trunk/debian/patches/distclean.dpatch	2006-09-25 14:20:25 UTC (rev 2427)
@@ -1,210 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## distclean.dpatch by  <mikma at users.sourceforge.net>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Add distclean target, cleaning Makefiles, config.log and config.status
-
- at DPATCH@
-diff -urNad yxa-0.91~/Makefile.in yxa-0.91/Makefile.in
---- yxa-0.91~/Makefile.in	2006-01-04 12:42:39.000000000 +0100
-+++ yxa-0.91/Makefile.in	2006-07-10 18:19:55.000000000 +0200
-@@ -40,7 +40,7 @@
- 	src \
- 	yaws/src
- 
--RECURSIVE_TARGETS = all-recursive install-recursive clean-recursive
-+RECURSIVE_TARGETS = all-recursive install-recursive clean-recursive distclean-recursive
- 
- erl_FILES = \
- 	version.erl
-@@ -76,6 +76,12 @@
- 	  $(install_PROGRAM) $$p $(DESTDIR)$(sbindir)/$$f ; \
- 	done
- 
-+distclean: clean distclean-recursive
-+	rm -f Makefile
-+	rm -f config.status
-+	rm -f config.log
-+	rm -f version.erl
-+
- clean: clean-recursive
- 	rm -f core *.core *~
- 	rm -f *.beam newversion.erl.new version.erl.in
-diff -urNad yxa-0.91~/src/Makefile.in yxa-0.91/src/Makefile.in
---- yxa-0.91~/src/Makefile.in	2006-03-03 09:27:34.000000000 +0100
-+++ yxa-0.91/src/Makefile.in	2006-07-10 18:19:32.000000000 +0200
-@@ -117,7 +117,7 @@
- 	transactionlayer \
- 	transportlayer
- 
--RECURSIVE_TARGETS = all-recursive install-recursive clean-recursive
-+RECURSIVE_TARGETS = all-recursive install-recursive clean-recursive distclean-recursive
- 
- all: $(beam_FILES) all-recursive $(boot_FILES) start_ssl.boot
- 
-@@ -138,6 +138,9 @@
- 	  $(install_DATA) $(srcdir)/$$p $(DESTDIR)$(includedir)/$$f ; \
- 	done
- 
-+distclean: clean distclean-recursive
-+	rm -f Makefile
-+
- clean: clean-recursive
- 	rm -f core *.core *~
- 	rm -f *.beam *.script *.start *.boot *.app
-diff -urNad yxa-0.91~/src/config/Makefile.in yxa-0.91/src/config/Makefile.in
---- yxa-0.91~/src/config/Makefile.in	2005-08-30 22:52:43.000000000 +0200
-+++ yxa-0.91/src/config/Makefile.in	2006-07-10 18:19:32.000000000 +0200
-@@ -58,6 +58,9 @@
- 	  $(install_DATA) $(srcdir)/$$p $(DESTDIR)$(includedir)/$$f ; \
- 	done
- 
-+distclean: clean
-+	rm -f Makefile
-+
- clean:
- 	rm -f core *.core *~
- 	rm -f *.beam *.script *.start *.boot *.rel *.app *.script
-diff -urNad yxa-0.91~/src/cpl/Makefile.in yxa-0.91/src/cpl/Makefile.in
---- yxa-0.91~/src/cpl/Makefile.in	2005-08-30 22:52:43.000000000 +0200
-+++ yxa-0.91/src/cpl/Makefile.in	2006-07-10 18:19:32.000000000 +0200
-@@ -76,6 +76,9 @@
- 	  $(install_DATA) $(srcdir)/$$p $(DESTDIR)$(includedir)/$$f ; \
- 	done
- 
-+distclean: clean
-+	rm -f Makefile
-+
- clean:
- 	rm -f core *.core *~
- 	rm -f *.beam *.script *.start *.boot *.rel *.app *.script
-diff -urNad yxa-0.91~/src/database/Makefile.in yxa-0.91/src/database/Makefile.in
---- yxa-0.91~/src/database/Makefile.in	2005-08-30 22:31:25.000000000 +0200
-+++ yxa-0.91/src/database/Makefile.in	2006-07-10 18:19:32.000000000 +0200
-@@ -60,6 +60,9 @@
- 	  $(install_DATA) $(srcdir)/$$p $(DESTDIR)$(includedir)/$$f ; \
- 	done
- 
-+distclean: clean
-+	rm -f Makefile
-+
- clean:
- 	rm -f core *.core *~
- 	rm -f *.beam *.script *.start *.boot *.rel *.app *.script
-diff -urNad yxa-0.91~/src/eldap/Makefile.in yxa-0.91/src/eldap/Makefile.in
---- yxa-0.91~/src/eldap/Makefile.in	2005-08-31 21:36:57.000000000 +0200
-+++ yxa-0.91/src/eldap/Makefile.in	2006-07-10 18:19:32.000000000 +0200
-@@ -54,6 +54,9 @@
- 	  $(install_DATA) $(srcdir)/$$p $(DESTDIR)$(includedir)/$$f ; \
- 	done
- 
-+distclean: clean
-+	rm -f Makefile
-+
- clean:
- 	rm -f core *.core *~
- 	rm -f *.beam *.script *.start *.boot *.rel *.app *.script
-diff -urNad yxa-0.91~/src/event_handler/Makefile.in yxa-0.91/src/event_handler/Makefile.in
---- yxa-0.91~/src/event_handler/Makefile.in	2005-08-30 22:52:43.000000000 +0200
-+++ yxa-0.91/src/event_handler/Makefile.in	2006-07-10 18:19:32.000000000 +0200
-@@ -59,6 +59,9 @@
- 	  $(install_PROGRAM) $$p $(DESTDIR)$(privdir)/$$f ; \
- 	done
- 
-+distclean: clean
-+	rm -f Makefile
-+
- clean:
- 	rm -f core *.core *~
- 	rm -f syslog_c-port *.beam *.script *.start *.boot *.rel *.app *.script
-diff -urNad yxa-0.91~/src/include/Makefile.in yxa-0.91/src/include/Makefile.in
---- yxa-0.91~/src/include/Makefile.in	2005-08-30 22:52:43.000000000 +0200
-+++ yxa-0.91/src/include/Makefile.in	2006-07-10 18:19:32.000000000 +0200
-@@ -53,6 +53,9 @@
- 	  $(install_DATA) $(srcdir)/$$p $(DESTDIR)$(includedir)/$$f ; \
- 	done
- 
-+distclean: clean
-+	rm -f Makefile
-+
- clean:
- 	rm -f core *.core *~
- 	rm -f *.beam *.script *.start *.boot *.rel *.app *.script
-diff -urNad yxa-0.91~/src/local/Makefile.in yxa-0.91/src/local/Makefile.in
---- yxa-0.91~/src/local/Makefile.in	2006-03-03 09:27:34.000000000 +0100
-+++ yxa-0.91/src/local/Makefile.in	2006-07-10 18:19:32.000000000 +0200
-@@ -45,6 +45,9 @@
- 
- install: $(beam_FILES) $(hrl_FILES)
- 
-+distclean: clean
-+	rm -f Makefile
-+
- clean:
- 	rm -f core *.core *~
- 	rm -f *.beam *.script *.start *.boot *.rel *.app *.script
-diff -urNad yxa-0.91~/src/mysql/Makefile.in yxa-0.91/src/mysql/Makefile.in
---- yxa-0.91~/src/mysql/Makefile.in	2005-08-30 22:31:25.000000000 +0200
-+++ yxa-0.91/src/mysql/Makefile.in	2006-07-10 18:19:32.000000000 +0200
-@@ -59,6 +59,9 @@
- 	  $(install_DATA) $(srcdir)/$$p $(DESTDIR)$(includedir)/$$f ; \
- 	done
- 
-+distclean: clean
-+	rm -f Makefile
-+
- clean:
- 	rm -f core *.core *~
- 	rm -f *.beam *.script *.start *.boot *.rel *.app *.script
-diff -urNad yxa-0.91~/src/sipuserdb/Makefile.in yxa-0.91/src/sipuserdb/Makefile.in
---- yxa-0.91~/src/sipuserdb/Makefile.in	2005-08-30 22:52:43.000000000 +0200
-+++ yxa-0.91/src/sipuserdb/Makefile.in	2006-07-10 18:19:32.000000000 +0200
-@@ -61,6 +61,9 @@
- 	  $(install_DATA) $(srcdir)/$$p $(DESTDIR)$(includedir)/$$f ; \
- 	done
- 
-+distclean: clean
-+	rm -f Makefile
-+
- clean:
- 	rm -f core *.core *~
- 	rm -f *.beam *.script *.start *.boot *.rel *.app *.script
-diff -urNad yxa-0.91~/src/transactionlayer/Makefile.in yxa-0.91/src/transactionlayer/Makefile.in
---- yxa-0.91~/src/transactionlayer/Makefile.in	2005-08-30 22:52:43.000000000 +0200
-+++ yxa-0.91/src/transactionlayer/Makefile.in	2006-07-10 18:19:32.000000000 +0200
-@@ -60,6 +60,9 @@
- 	  $(install_DATA) $(srcdir)/$$p $(DESTDIR)$(includedir)/$$f ; \
- 	done
- 
-+distclean: clean
-+	rm -f Makefile
-+
- clean:
- 	rm -f core *.core *~
- 	rm -f *.beam *.script *.start *.boot *.rel *.app *.script
-diff -urNad yxa-0.91~/src/transportlayer/Makefile.in yxa-0.91/src/transportlayer/Makefile.in
---- yxa-0.91~/src/transportlayer/Makefile.in	2006-03-01 13:30:29.000000000 +0100
-+++ yxa-0.91/src/transportlayer/Makefile.in	2006-07-10 18:19:32.000000000 +0200
-@@ -71,6 +71,9 @@
- 	  $(install_DATA) $(srcdir)/$$p $(DESTDIR)$(includedir)/$$f ; \
- 	done
- 
-+distclean: clean
-+	rm -f Makefile
-+
- clean:
- 	rm -f core *.core *~
- 	rm -f *.beam *.script *.start *.boot *.rel *.app *.script
-diff -urNad yxa-0.91~/yaws/src/Makefile.in yxa-0.91/yaws/src/Makefile.in
---- yxa-0.91~/yaws/src/Makefile.in	2005-08-30 22:52:43.000000000 +0200
-+++ yxa-0.91/yaws/src/Makefile.in	2006-07-10 18:19:32.000000000 +0200
-@@ -58,6 +58,9 @@
- 	  $(install_DATA) $(srcdir)/$$p $(DESTDIR)$(includedir)/$$f ; \
- 	done
- 
-+distclean: clean
-+	rm -f Makefile
-+
- clean:
- 	rm -f core *.core *~
- 	rm -f *.beam *.script *.start *.boot *.rel *.app *.script

Deleted: yxa/trunk/debian/patches/homedomain.dpatch
===================================================================
--- yxa/trunk/debian/patches/homedomain.dpatch	2006-09-25 12:47:36 UTC (rev 2426)
+++ yxa/trunk/debian/patches/homedomain.dpatch	2006-09-25 14:20:25 UTC (rev 2427)
@@ -1,117 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## homedomain.dpatch by  <mikma at users.sourceforge.net>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Proxy should not consume SIP requests if the ip address matches one
-## DP: of addresses the proxy listens to but the port doesn't.
-
- at DPATCH@
-diff -urNad yxa-0.91~/src/incomingproxy.erl yxa-0.91/src/incomingproxy.erl
---- yxa-0.91~/src/incomingproxy.erl	2006-09-24 21:19:58.000000000 +0200
-+++ yxa-0.91/src/incomingproxy.erl	2006-09-24 21:20:05.000000000 +0200
-@@ -107,7 +107,7 @@
-     %% Check if the From: address matches our homedomains, and if so
-     %% call verify_homedomain_user() to make sure the user is
-     %% authorized and authenticated to use this From: address
--    case local:homedomain(FromURI#sipurl.host) of
-+    case local:homedomain(FromURI) of
- 	true ->
- 	    case verify_homedomain_user(Request, LogTag, Origin, LogStr) of
- 		true ->
-@@ -289,7 +289,7 @@
-     URL = Request#request.uri,
-     case keylist:fetch('route', Request#request.header) of
- 	[] ->
--	    Loc1 = case local:homedomain(URL#sipurl.host) of
-+	    Loc1 = case local:homedomain(URL) of
- 		       true ->
- 			   case local:is_request_to_this_proxy(Request) of
- 			       true ->
-diff -urNad yxa-0.91~/src/lookup.erl yxa-0.91/src/lookup.erl
---- yxa-0.91~/src/lookup.erl	2006-09-24 21:19:58.000000000 +0200
-+++ yxa-0.91/src/lookup.erl	2006-09-24 21:23:11.000000000 +0200
-@@ -372,7 +372,7 @@
- %%           Reason       = string(), SIP reason phrase
- %%--------------------------------------------------------------------
- lookupdefault(URL) when is_record(URL, sipurl) ->
--    case homedomain(URL#sipurl.host) of
-+    case homedomain(URL) of
- 	true ->
- 	    logger:log(debug, "Lookup: Cannot default-route request to a local domain (~s), aborting",
- 		       [URL#sipurl.host]),
-@@ -456,7 +456,7 @@
- 	    URL = sipurl:parse(URLstr),
- 	    E164User = URL#sipurl.user,
- 	    E164Host = URL#sipurl.host,
--	    IsMe = homedomain(E164Host),
-+	    IsMe = homedomain(URL),
- 	    %% Try to rewrite the userpart of the returned URL into a E164 number
- 	    %% to make sure it is not a loop back to this proxy. If it is a remote
- 	    %% domain, the username comparison test does not have any effect, so
-@@ -577,7 +577,7 @@
- 	    case sipurl:parse_url_with_default_protocol("sip", Res) of
- 		URL when is_record(URL, sipurl) ->
- 		    %% Check if it is a local URL or a remote
--		    case homedomain(URL#sipurl.host) of
-+		    case homedomain(URL) of
- 			true ->
- 			    {proxy, URL};
- 			false ->
-@@ -651,7 +651,7 @@
- is_request_to_this_proxy(Request) when is_record(Request, request) ->
-     {Method, URI, Header} = {Request#request.method, Request#request.uri, Request#request.header},
-     IsOptionsForMe = is_request_to_this_proxy2(Method, URI, Header),
--    IsHomedomain = local:homedomain(URI#sipurl.host),
-+    IsHomedomain = local:homedomain(URI),
-     NoUserpart = (URI#sipurl.user == none),
-     if
- 	IsOptionsForMe == true ->
-@@ -692,6 +692,15 @@
- %% Returns : true | false
- %%--------------------------------------------------------------------
- homedomain(Domain) when is_list(Domain) ->
-+    homedomain2(Domain, any);
-+
-+homedomain(URL) when is_record(URL, sipurl) ->
-+    Port = sipsocket:default_port(URL#sipurl.proto, sipurl:get_port(URL)),
-+    homedomain2(URL#sipurl.host, Port).
-+
-+
-+homedomain2(Domain, Port) when is_list(Domain) ->
-+
-     {ok, HomedomainL} = yxa_config:get_env(homedomain, []),
-     LCdomain = http_util:to_lower(Domain),
-     case lists:member(LCdomain, HomedomainL) of
-@@ -701,10 +710,18 @@
- 	    %% Domain did not match configured sets of homedomain, check against list
- 	    %% of hostnames and also my IP address
- 	    {ok, MyHostnames} = yxa_config:get_env(myhostnames, []),
--	    lists:member(LCdomain, MyHostnames)
--		orelse lists:member(LCdomain, siphost:myip_list())
-+	    (lists:member(LCdomain, MyHostnames)
-+	     orelse lists:member(LCdomain, siphost:myip_list()))
-+		andalso case Port of
-+			    any ->
-+				true;
-+			    Port1 ->
-+				MyPorts = sipsocket:get_all_listenports(),
-+				lists:member(Port1, MyPorts)
-+			end
-     end.
- 
-+
- %%--------------------------------------------------------------------
- %% Function: get_remote_party_number(User, Header, DstHost)
- %%           User    = string(), SIP authentication username
-diff -urNad yxa-0.91~/src/siplocation.erl yxa-0.91/src/siplocation.erl
---- yxa-0.91~/src/siplocation.erl	2006-09-24 21:19:58.000000000 +0200
-+++ yxa-0.91/src/siplocation.erl	2006-09-24 21:20:05.000000000 +0200
-@@ -147,7 +147,7 @@
-     logger:log(debug, "~p: REGISTER ~p", [AppName, sipurl:print(URL)]),
-     %% RFC 3261 chapter 10.3 - Processing REGISTER Request - step 1
-     %% check if this registrar handles the domain the request wants to register for
--    case local:homedomain(URL#sipurl.host) of
-+    case local:homedomain(URL) of
- 	true ->
- 	    register_require_supported(Request, LogStr, THandler, LogTag, AppName);
- 	false ->

Deleted: yxa/trunk/debian/patches/init-mnesia.dpatch
===================================================================
--- yxa/trunk/debian/patches/init-mnesia.dpatch	2006-09-25 12:47:36 UTC (rev 2426)
+++ yxa/trunk/debian/patches/init-mnesia.dpatch	2006-09-25 14:20:25 UTC (rev 2427)
@@ -1,19 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## init-mnesia.dpatch by  <mikma at users.sourceforge.net>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Make it possible to use remote Mnesia db
-
- at DPATCH@
-diff -urNad yxa-0.91~/scripts/init.sh.in yxa-0.91/scripts/init.sh.in
---- yxa-0.91~/scripts/init.sh.in	2006-01-02 12:47:15.000000000 +0100
-+++ yxa-0.91/scripts/init.sh.in	2006-07-10 23:33:10.000000000 +0200
-@@ -84,7 +84,7 @@
-     command="bootstrap"
- else
-     name="$PROGRAMNAME"
--    mnesiadir="$MNESIABASE/$PROGRAMNAME"
-+#    mnesiadir="$MNESIABASE/$PROGRAMNAME"
- fi
- 
- exit_now=0

Deleted: yxa/trunk/debian/patches/yaws-fqdn.dpatch
===================================================================
--- yxa/trunk/debian/patches/yaws-fqdn.dpatch	2006-09-25 12:47:36 UTC (rev 2426)
+++ yxa/trunk/debian/patches/yaws-fqdn.dpatch	2006-09-25 14:20:25 UTC (rev 2427)
@@ -1,56 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## yaws-fqdn.dpatch by  <mikma at users.sourceforge.net>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Lookup FQDN using gethostbyname
-
- at DPATCH@
-diff -urNad yxa-0.91~/yaws/src/yxa_yaws_util.erl yxa-0.91/yaws/src/yxa_yaws_util.erl
---- yxa-0.91~/yaws/src/yxa_yaws_util.erl	2006-08-01 10:41:07.000000000 +0200
-+++ yxa-0.91/yaws/src/yxa_yaws_util.erl	2006-08-01 11:13:08.000000000 +0200
-@@ -43,6 +43,7 @@
- %% Include files
- %%--------------------------------------------------------------------
- -include("phone.hrl").
-+-include_lib("kernel/include/inet.hrl").
- 
- 
- %%====================================================================
-@@ -373,15 +374,35 @@
-     {ok, MyHostname} = my_hostname(),
-     "incomingproxy@" ++ MyHostname.
- 
-+%%--------------------------------------------------------------------
-+%% Function: get_fqdn(H)
-+%%           H = string(), host name
-+%% Descrip.: Get the FQDN (Fully Qualified Domain Name)
-+%% Returns : {ok, FQDN} | {error, Reason}, FQDN = string()
-+%%--------------------------------------------------------------------
-+get_fqdn(Hostname) ->
-+    case inet:gethostbyname(Hostname) of
-+	{error, What} ->
-+	    logger:log(debug, "Resolver: Error ~p when resolving local hostname", [What]),
-+	    {error, What};
-+	{ok, HostEnt} when is_record(HostEnt, hostent) ->
-+	    {ok, HostEnt#hostent.h_name}
-+    end.
-+
- %% part of get_incomingproxy_nodename/0, inet:gethostname/0 without the
- %% domain-name removing part.
- %% Returns : {ok, Hostname}, Hostname = string()
- my_hostname() ->
-     case inet_udp:open(0, []) of
-         {ok, Socket} ->
--            {ok, Res} = inet:gethostname(Socket),
-+            {ok, Hostname} = inet:gethostname(Socket),
-             inet_udp:close(Socket),
--            {ok, Res};
-+	    case get_fqdn(Hostname) of
-+		{error, What} ->
-+		    {ok, Hostname};
-+		{ok, FQDN} ->
-+		    {ok, FQDN}
-+	    end;
-         _ ->
-             {ok, "nohost.nodomain"}
-     end.

Modified: yxa/trunk/debian/patches/yxa_yaws_makefile.dpatch
===================================================================
--- yxa/trunk/debian/patches/yxa_yaws_makefile.dpatch	2006-09-25 12:47:36 UTC (rev 2426)
+++ yxa/trunk/debian/patches/yxa_yaws_makefile.dpatch	2006-09-25 14:20:25 UTC (rev 2427)
@@ -5,9 +5,9 @@
 ## DP: No description.
 
 @DPATCH@
-diff -urNad yxa-0.91~/yaws/src/Makefile.in yxa-0.91/yaws/src/Makefile.in
---- yxa-0.91~/yaws/src/Makefile.in	2006-08-04 00:48:29.000000000 +0200
-+++ yxa-0.91/yaws/src/Makefile.in	2006-08-04 00:51:06.000000000 +0200
+diff -urNad yxa-0.91+20060922~/yaws/src/Makefile.in yxa-0.91+20060922/yaws/src/Makefile.in
+--- yxa-0.91+20060922~/yaws/src/Makefile.in	2006-09-25 15:41:55.000000000 +0200
++++ yxa-0.91+20060922/yaws/src/Makefile.in	2006-09-25 15:43:22.000000000 +0200
 @@ -18,6 +18,13 @@
  builddir = @builddir@
  local_file = @local_file@
@@ -36,7 +36,7 @@
  	yxa_yaws_util.erl
  
  imported_hrl_FILES = \
-@@ -41,17 +52,23 @@
+@@ -41,17 +53,23 @@
  
  yxa_hrl_FILES = $(imported_hrl_FILES) $(hrl_FILES)
  
@@ -63,7 +63,16 @@
  	  $(install_DATA) $$p $(DESTDIR)$(beamdir)/$$f ; \
  	done
  	for p in $(hrl_FILES); do \
-@@ -73,4 +90,10 @@
+@@ -63,7 +81,7 @@
+ 
+ clean:
+ 	rm -f core *.core *~
+-	rm -f *.beam *.script *.start *.boot *.rel *.app *.script
++	rm -f *.beam *.script *.start *.boot *.app *.script
+ 	rm -f *.o ktrace.out erl_crash.dump
+ 
+ $(beam_FILES): $(yxa_hrl_FILES)
+@@ -73,4 +91,10 @@
  .SUFFIXES: .c .o .hrl .beam .erl .boot .rel .rel-in .app .app-in
  
  .erl.beam:

Modified: yxa/trunk/debian/rules
===================================================================
--- yxa/trunk/debian/rules	2006-09-25 12:47:36 UTC (rev 2426)
+++ yxa/trunk/debian/rules	2006-09-25 14:20:25 UTC (rev 2427)
@@ -37,7 +37,7 @@
 endif
 
 FILENAME := yxa_$(UPVERSION).orig.tar.gz
-SHA1SUM := 4317dd4f94f0350d373384f13262804d2d2e4216
+SHA1SUM := 72c54db19a02e8b888fe991139746bd55da176c4
 
 config: patch config-stamp
 config-stamp: configure

Modified: yxa/trunk/debian/yxa.install
===================================================================
--- yxa/trunk/debian/yxa.install	2006-09-25 12:47:36 UTC (rev 2426)
+++ yxa/trunk/debian/yxa.install	2006-09-25 14:20:25 UTC (rev 2427)
@@ -1,4 +1,8 @@
 debian/tmp/usr/lib/yxa
 debian/tmp/usr/sbin/* /usr/lib/yxa/bin
-yaws/docroot/* /usr/share/yxa/www
+yaws/docroot/*.yaws /usr/share/yxa/www
+yaws/docroot/HEAD /usr/share/yxa/www
+yaws/docroot/BOTTOM /usr/share/yxa/www
+yaws/docroot/style.css /usr/share/yxa/www
+yaws/docroot/pix/*.png /usr/share/yxa/www/pix
 debian/yxa_yaws /usr/lib/yxa/bin




More information about the Pkg-voip-commits mailing list