Rename upnp_intel to upnp

First this is a fork of the old intel code, and then we only have one
upnp module now

configure.ac

@@ -3681,8 +3681,8 @@ PKG_ENABLE_MODULES_VLC([JACK], [jack access_jack], [jack], [JACK audio I/O modul
 dnl
 dnl UPnP Plugin (Intel SDK)
 dnl
-PKG_ENABLE_MODULES_VLC([UPNP], [upnp_intel], [libupnp], [Intel UPnp SDK],[auto])
-VLC_ADD_CXXFLAGS([upnp_intel],[${UPNP_CFLAGS}])
+PKG_ENABLE_MODULES_VLC([UPNP], [upnp], [libupnp], [Intel UPnp SDK],[auto])
+VLC_ADD_CXXFLAGS([upnp],[${UPNP_CFLAGS}])
 
 dnl
 dnl  Interface plugins

modules/LIST

@@ -330,7 +330,7 @@ $Id$
  * ty: TY demuxer
  * udev: udev probing module
  * ugly_resampler: Ugly audio resampler
- * upnp_intel: Intel SDL UPNP discovery
+ * upnp: libupnpn UPNP service discovery
  * v4l2: Video 4 Linux 2 input module
  * vc1: VC-1 Video demuxer
  * vcd: input module for accessing Video CDs

modules/services_discovery/Modules.am

 SOURCES_sap = sap.c
-SOURCES_upnp_intel = upnp_intel.cpp upnp_intel.hpp
+SOURCES_upnp = upnp.cpp upnp.hpp
 SOURCES_bonjour = bonjour.c
 SOURCES_podcast = podcast.c
 SOURCES_mtp = mtp.c

modules/services_discovery/upnp_intel.cpp → modules/services_discovery/upnp.cpp

 /*****************************************************************************
- * Upnp_intel.cpp :  UPnP discovery module (Intel SDK)
+ * Upnp_intel.cpp :  UPnP discovery module (libupnp)
  *****************************************************************************
  * Copyright (C) 2004-2008 the VideoLAN team
  * $Id$
@@ -33,7 +33,7 @@
 # include "config.h"
 #endif
 
-#include "upnp_intel.hpp"
+#include "upnp.hpp"
 
 #include <vlc_plugin.h>
 #include <vlc_services_discovery.h>

modules/services_discovery/upnp_intel.hpp → modules/services_discovery/upnp.hpp

 /*****************************************************************************
- * Upnp_intel.hpp :  UPnP discovery module (Intel SDK) header
+ * Upnp.hpp :  UPnP discovery module (libupnp) header
  *****************************************************************************
  * Copyright (C) 2004-2008 the VideoLAN team
  * $Id$