Bug 584894 - Move libpng to media/libpng. r=khuey

--HG--
rename : modules/libimg/png/CHANGES => media/libpng/CHANGES
rename : modules/libimg/png/LICENSE => media/libpng/LICENSE
rename : modules/libimg/png/MOZCHANGES => media/libpng/MOZCHANGES
rename : modules/libimg/png/Makefile.in => media/libpng/Makefile.in
rename : modules/libimg/png/README => media/libpng/README
rename : modules/libimg/png/crashtests/374810-1.html => media/libpng/crashtests/374810-1.html
rename : modules/libimg/png/crashtests/crashtests.list => media/libpng/crashtests/crashtests.list
rename : modules/libimg/png/libpng.txt => media/libpng/libpng.txt
rename : modules/libimg/png/mozpngconf.h => media/libpng/mozpngconf.h
rename : modules/libimg/png/png.c => media/libpng/png.c
rename : modules/libimg/png/png.h => media/libpng/png.h
rename : modules/libimg/png/pngconf.h => media/libpng/pngconf.h
rename : modules/libimg/png/pngerror.c => media/libpng/pngerror.c
rename : modules/libimg/png/pngget.c => media/libpng/pngget.c
rename : modules/libimg/png/pngmem.c => media/libpng/pngmem.c
rename : modules/libimg/png/pngpread.c => media/libpng/pngpread.c
rename : modules/libimg/png/pngpriv.h => media/libpng/pngpriv.h
rename : modules/libimg/png/pngread.c => media/libpng/pngread.c
rename : modules/libimg/png/pngrio.c => media/libpng/pngrio.c
rename : modules/libimg/png/pngrtran.c => media/libpng/pngrtran.c
rename : modules/libimg/png/pngrutil.c => media/libpng/pngrutil.c
rename : modules/libimg/png/pngset.c => media/libpng/pngset.c
rename : modules/libimg/png/pngtrans.c => media/libpng/pngtrans.c
rename : modules/libimg/png/pngwio.c => media/libpng/pngwio.c
rename : modules/libimg/png/pngwrite.c => media/libpng/pngwrite.c
rename : modules/libimg/png/pngwtran.c => media/libpng/pngwtran.c
rename : modules/libimg/png/pngwutil.c => media/libpng/pngwutil.c

configure.in

@@ -1298,7 +1298,7 @@ MOZ_ZLIB_LIBS='$(call EXPAND_LIBNAME_PATH,mozz,$(DEPTH)/modules/zlib/src)'
 MOZ_BZ2_CFLAGS=
 MOZ_BZ2_LIBS='$(call EXPAND_LIBNAME_PATH,bz2,$(DEPTH)/modules/libbz2/src)'
 MOZ_PNG_CFLAGS=
-MOZ_PNG_LIBS='$(call EXPAND_LIBNAME_PATH,mozpng,$(DEPTH)/modules/libimg/png)'
+MOZ_PNG_LIBS='$(call EXPAND_LIBNAME_PATH,mozpng,$(DEPTH)/media/libpng)'
 
 MOZ_JS_STATIC_LIBS='$(call EXPAND_LIBNAME_PATH,js_static,$(LIBXUL_DIST)/lib)'
 MOZ_JS_SHARED_LIBS='$(call EXPAND_LIBNAME_PATH,mozjs,$(LIBXUL_DIST)/lib)'
@@ -2292,7 +2292,7 @@ ia64*-hpux*)
         fi
     fi
     MOZ_JPEG_LIBS='$(call EXPAND_LIBNAME_PATH,jpeg32$(VERSION_NUMBER),$(DEPTH)/media/libjpeg)'
-    MOZ_PNG_LIBS='$(call EXPAND_LIBNAME_PATH,png,$(DEPTH)/modules/libimg/png)'
+    MOZ_PNG_LIBS='$(call EXPAND_LIBNAME_PATH,png,$(DEPTH)/media/libpng)'
     AC_DEFINE(HAVE_SNPRINTF)
     AC_DEFINE(_WINDOWS)
     AC_DEFINE(WIN32)

media/libpng/Makefile.in

@@ -35,7 +35,7 @@
 #
 # ***** END LICENSE BLOCK *****
 
-DEPTH		= ../../..
+DEPTH		= ../..
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@

testing/crashtest/crashtests.list

@@ -59,6 +59,6 @@ include ../../widget/src/cocoa/crashtests/crashtests.list
 include ../../widget/src/gtk2/crashtests/crashtests.list
 include ../../widget/src/crashtests/crashtests.list
 
-include ../../modules/libimg/png/crashtests/crashtests.list
+include ../../media/libpng/crashtests/crashtests.list
 
 include ../../xpcom/string/crashtests/crashtests.list

toolkit/toolkit-makefiles.sh

@@ -1004,7 +1004,7 @@ fi
 
 if [ ! "$SYSTEM_PNG" ]; then
   add_makefiles "
-    modules/libimg/png/Makefile
+    media/libpng/Makefile
   "
 fi
 

toolkit/toolkit-tiers.mk

@@ -158,7 +158,7 @@ tier_platform_dirs += \
 endif
 
 ifndef MOZ_NATIVE_PNG
-tier_platform_dirs += modules/libimg/png
+tier_platform_dirs += media/libpng
 endif
 
 tier_platform_dirs	+= \

tools/relic/relic

@@ -285,7 +285,7 @@ _g_skip_dirs = [
     
     # The following are not supposed to be relicensed, but they do have a
     # few files in we care about (like makefiles)
-    "modules/libimg/png",
+    "media/libpng",
     "modules/zlib",
     "gc/boehm",
     "other-licenses",