Author: ishikawa Date: 2003-06-13 07:29:19 -0500 (Fri, 13 Jun 2003) New Revision: 195
Added: branches/4.3.0/sid/debian/patches/909_debian_piclib_support.diff Modified: branches/4.3.0/sid/debian/MANIFEST.alpha branches/4.3.0/sid/debian/MANIFEST.i386 branches/4.3.0/sid/debian/MANIFEST.sparc branches/4.3.0/sid/debian/changelog branches/4.3.0/sid/debian/control branches/4.3.0/sid/debian/patches/003_linux.cf_and_xfree86.cf.diff branches/4.3.0/sid/debian/patches/004_imake_manpage_handling_overhaul.diff Log: xlibs-pic-dev reintegrate - xlibs-pic package rename to xlibs-pic-dev - add xlibs-pic-dev entry into debian/control - piclib_support.diff reintegrate as 909_debian_piclib_support.diff - update patch #003 disable StaticNeedsPicForShared to compile normal static library without PIC flag - adapt #004 above change - update MANIFEST.{alpha,i386,sparc} Added: branches/4.3.0/sid/debian/patches/909_debian_piclib_support.diff ============================================================================== --- branches/4.3.0/sid/debian/patches/909_debian_piclib_support.diff 2003-06-13 07:34:38 UTC (rev 194) +++ branches/4.3.0/sid/debian/patches/909_debian_piclib_support.diff 2003-06-13 12:29:19 UTC (rev 195) @@ -0,0 +1,267 @@ +This patch by Matthieu Herrb, Branden Robinson, ISHIKAWA Mutsumi, and +LaMont Jones. + +Submitted as #5381. Apparently rejected. Edited since then to PICify +Xinerama and libxkbfile as well. + +(Updated for XFree86 4.3.0 at Jun, 12 2003) + +diff -urN xc.orig/config/cf/Imake.rules xc/config/cf/Imake.rules +--- xc.orig/config/cf/Imake.rules 2003-06-12 20:08:46.000000000 +0900 ++++ xc/config/cf/Imake.rules 2003-06-12 20:14:17.000000000 +0900 +@@ -2608,6 +2608,20 @@ + + + /* ++ * Rule to build libXXX_pic.a from PIC objects for a library ++ */ ++#ifndef PicLibraryTarget ++#define PicLibraryTarget(libname,objlist) @@\ ++AllTarget(LibraryTargetNameSuffix(libname,_pic)) @@\ ++ @@\ ++LibraryTargetNameSuffix(libname,_pic): objlist $(EXTRALIBRARYDEPS) @@\ ++ RemoveFile($@) @@\ ++ MakeLibrary($@,objlist) @@\ ++ RanLibrary($@) @@\ ++ _LinkBuildLibrary($@) ++#endif /* PicLibraryTarget */ ++ ++/* + * SubdirLibraryRule - + */ + #ifndef SubdirLibraryRule +diff -urN xc.orig/config/cf/Library.tmpl xc/config/cf/Library.tmpl +--- xc.orig/config/cf/Library.tmpl 2003-02-21 14:30:20.000000000 +0900 ++++ xc/config/cf/Library.tmpl 2003-06-12 20:17:02.000000000 +0900 +@@ -3,7 +3,7 @@ + * that Imakefiles in the various library subtrees will need. + * + * Before including this, you must set the following boolean variables: +- * DoNormalLib, DoSharedLib, DoDebugLib, DoProfileLib ++ * DoNormalLib, DoSharedLib, DoDebugLib, DoProfileLib, DoPicLib + * + * To get automatic generation of standard rules, also set the variables: + * LibName, SoRev, HasSharedData, and optionally HugeLibrary and IncSubdir. +@@ -52,8 +52,15 @@ + SHLIBGLOBALSFLAGS = ShlibGlobalsFlags + #endif + ++/* ++ * Some libraries may not define DoPicLib ++ */ ++#ifndef DoPicLib ++# define DoPicLib NO ++#endif ++ + #ifndef LibraryCplusplusOptions +-# if DoSharedLib && defined(SharedLibraryCplusplusOptions) ++# if (DoSharedLib || DoPicLib) && defined(SharedLibraryCplusplusOptions) + # define LibraryCplusplusOptions SharedLibraryCplusplusOptions + # else + # define LibraryCplusplusOptions DefaultCplusplusOptions +@@ -85,14 +92,14 @@ + + #ifndef CplusplusSource + # ifndef LibraryCcCmd +-# if DoSharedLib && defined(SharedLibraryCcCmd) ++# if (DoSharedLib || DoPicLib) && defined(SharedLibraryCcCmd) + # define LibraryCcCmd SharedLibraryCcCmd + # else + # define LibraryCcCmd CcCmd + # endif + # endif + # ifndef LibraryCCOptions +-# if DoSharedLib && defined(SharedLibraryCCOptions) ++# if (DoSharedLib || DoPicLib) && defined(SharedLibraryCCOptions) + # define LibraryCCOptions SharedLibraryCCOptions + # else + # define LibraryCCOptions DefaultCCOptions +@@ -121,7 +128,7 @@ + #else + # ifndef CrossCompileDir + # ifndef LibraryCplusplusCmd +-# if DoSharedLib && defined(SharedLibraryCplusplusCmd) ++# if (DoSharedLib || DoPicLib) && defined(SharedLibraryCplusplusCmd) + # define LibraryCplusplusCmd SharedLibraryCplusplusCmd + # else + # define LibraryCplusplusCmd CplusplusCmd +@@ -129,7 +136,7 @@ + # endif + # else + # ifndef CrossLibraryCplusplusCmd +-# if DoSharedLib && defined(SharedLibraryCplusplusCmd) ++# if (DoSharedLib || DoPicLib) && defined(SharedLibraryCplusplusCmd) + # define CrossLibraryCplusplusCmd Concat3(CrossCompileDir,/,StripPath(SharedLibraryCplusplusCmd)) + # else + # define CrossLibraryCplusplusCmd Concat3(CrossCompileDir,/,StripPath(CplusplusCmd)) +@@ -138,7 +145,7 @@ + # endif + + # ifndef LibraryCplusplusOptions +-# if DoSharedLib && defined(SharedLibraryCplusplusOptions) ++# if (DoSharedLib || DoPicLib) && defined(SharedLibraryCplusplusOptions) + # define LibraryCplusplusOptions SharedLibraryCplusplusOptions + # else + # define LibraryCplusplusOptions DefaultCplusplusOptions +@@ -202,14 +209,14 @@ + # define _NormalObjCplusplusCompile(options) $(_NULLCMD_) + # define _NormalCleanDir() $(_NULLCMD_) + #else +-# if DoSharedLib && SeparateSharedCompile ++# if (DoSharedLib || DoPicLib) && SeparateSharedCompile + # define _NormalLibMkdir() _LibMkdir(unshared) + # define _NormalObjCompile(options) UnsharedLibObjCompile(options) + # define _NormalObjCplusplusCompile(options) UnsharedLibObjCplusplusCompile(options) + # define _NormalCleanDir() LibCleanDir(unshared) + # else + # define _NormalLibMkdir() $(_NULLCMD_) +-# if !DoSharedLib && defined(IncludeSharedObjectInNormalLib) ++# if (!DoSharedLib && !DoPicLib) && defined(IncludeSharedObjectInNormalLib) + # define _NormalObjCompile(options) NormalRelocLibObjCompile(options) + # else + # define _NormalObjCompile(options) NormalLibObjCompile(options) +@@ -219,7 +226,7 @@ + # endif + #endif + +-#if !DoSharedLib || (DoNormalLib && !SeparateSharedCompile) ++#if !DoSharedLib && !DoPicLib || (DoNormalLib && !SeparateSharedCompile) + # define _SharedObjCompile(options) $(_NULLCMD_) + # define _SharedObjCplusplusCompile(options) $(_NULLCMD_) + #else +@@ -501,6 +508,12 @@ + InstallLibrary($(LIBNAME)_d,$(USRLIBDIR)) + # endif + # endif ++# if DoPicLib ++PicLibraryTarget($(LIBNAME),$(OBJS)) ++# if !defined(LibInstall) || LibInstall ++InstallLibrary($(LIBNAME)_pic,$(USRLIBDIR)) ++# endif ++# endif + # if DoExtraLib && defined(ExtraLibRules) + ExtraLibraryTarget($(LIBNAME),$(SoRev),$(OBJS) $(EXTRAUNSHAREDOBJS)) + # if !defined(LibInstall) || LibInstall +diff -urN xc.orig/config/cf/X11.tmpl xc/config/cf/X11.tmpl +--- xc.orig/config/cf/X11.tmpl 2003-06-12 20:08:48.000000000 +0900 ++++ xc/config/cf/X11.tmpl 2003-06-12 20:14:17.000000000 +0900 +@@ -1652,6 +1652,9 @@ + #ifndef BuildLibPathVar + #define BuildLibPathVar LD_LIBRARY_PATH + #endif ++#ifndef PicLibXxf86vm ++#define PicLibXxf86vm YES ++#endif + #endif + #endif + #ifdef BuildLibPathVar +@@ -2533,6 +2536,12 @@ + #else + ProjectUnsharedLibReferences(XAUTH,Xau,$(XAUTHSRC),$(USRLIBDIR)) + #endif ++#ifndef PicLibXxf86dga ++#define PicLibXxf86dga YES ++#endif ++#ifndef PicLibXv ++#define PicLibXv YES ++#endif + #endif + + #ifndef SharedLibXdmcp +@@ -2559,6 +2568,9 @@ + #else + ProjectUnsharedLibReferences(XDMCP,Xdmcp,$(XDMCPLIBSRC),$(USRLIBDIR)) + #endif ++#ifndef PicLibXvMC ++#define PicLibXvMC YES ++#endif + #endif + + #ifndef SharedLibXmu +@@ -2745,6 +2757,9 @@ + #else + ProjectUnsharedLibReferences(XAW6,Xaw,$(AWIDGET6SRC),XBuildLibDir) + #endif ++#ifndef PicLibXinerama ++#define PicLibXinerama YES ++#endif + #endif + + #ifndef SharedLibXi +diff -urN xc.orig/lib/Xinerama/Imakefile xc/lib/Xinerama/Imakefile +--- xc.orig/lib/Xinerama/Imakefile 2003-01-04 11:48:24.000000000 +0900 ++++ xc/lib/Xinerama/Imakefile 2003-06-12 20:14:17.000000000 +0900 +@@ -4,6 +4,7 @@ + #define DoSharedLib SharedLibXinerama + #define DoDebugLib DebugLibXinerama + #define DoProfileLib ProfileLibXinerama ++#define DoPicLib PicLibXinerama + #define LibName Xinerama + #define SoRev SOXINERAMAREV + #define LibHeaders NO +diff -urN xc.orig/lib/Xv/Imakefile xc/lib/Xv/Imakefile +--- xc.orig/lib/Xv/Imakefile 2003-01-04 11:48:24.000000000 +0900 ++++ xc/lib/Xv/Imakefile 2003-06-12 20:14:17.000000000 +0900 +@@ -4,6 +4,7 @@ + #define DoSharedLib SharedLibXv + #define DoDebugLib DebugLibXv + #define DoProfileLib ProfileLibXv ++#define DoPicLib PicLibXv + #define LibName Xv + #define SoRev SOXVREV + #define LibHeaders NO +diff -urN xc.orig/lib/XvMC/Imakefile xc/lib/XvMC/Imakefile +--- xc.orig/lib/XvMC/Imakefile 2002-10-16 09:37:33.000000000 +0900 ++++ xc/lib/XvMC/Imakefile 2003-06-12 20:14:17.000000000 +0900 +@@ -4,6 +4,7 @@ + #define DoSharedLib SharedLibXvMC + #define DoDebugLib DebugLibXvMC + #define DoProfileLib ProfileLibXvMC ++#define DoPicLib PicLibXvMC + #define LibName XvMC + #define SoRev SOXVMCREV + #define LibHeaders NO +diff -urN xc.orig/lib/XvMC/hw/i810/Imakefile xc/lib/XvMC/hw/i810/Imakefile +--- xc.orig/lib/XvMC/hw/i810/Imakefile 2002-10-31 03:42:57.000000000 +0900 ++++ xc/lib/XvMC/hw/i810/Imakefile 2003-06-12 20:14:17.000000000 +0900 +@@ -3,6 +3,7 @@ + #define DoSharedLib SharedLibXvMC + #define DoDebugLib DebugLibXvMC + #define DoProfileLib ProfileLibXvMC ++#define DoPicLib PicLibXvMC + #define LibName I810XvMC + #define SoRev SOXVMCREV + #define LibHeaders NO +diff -urN xc.orig/lib/Xxf86dga/Imakefile xc/lib/Xxf86dga/Imakefile +--- xc.orig/lib/Xxf86dga/Imakefile 2003-01-04 11:48:25.000000000 +0900 ++++ xc/lib/Xxf86dga/Imakefile 2003-06-12 20:14:17.000000000 +0900 +@@ -4,6 +4,7 @@ + #define DoExtraLib SharedLibXxf86dga + #define DoDebugLib DebugLibXxf86dga + #define DoProfileLib ProfileLibXxf86dga ++#define DoPicLib PicLibXxf86dga + #define LibName Xxf86dga + #define SoRev SOXXF86DGAREV + #define LibHeaders NO +diff -urN xc.orig/lib/Xxf86vm/Imakefile xc/lib/Xxf86vm/Imakefile +--- xc.orig/lib/Xxf86vm/Imakefile 2003-01-04 11:48:25.000000000 +0900 ++++ xc/lib/Xxf86vm/Imakefile 2003-06-12 20:14:17.000000000 +0900 +@@ -4,6 +4,7 @@ + #define DoExtraLib SharedLibXxf86vm + #define DoDebugLib DebugLibXxf86vm + #define DoProfileLib ProfileLibXxf86vm ++#define DoPicLib PicLibXxf86vm + #define LibName Xxf86vm + #define SoRev SOXXF86VMREV + #define LibHeaders NO +diff -urN xc.orig/lib/xkbfile/Imakefile xc/lib/xkbfile/Imakefile +--- xc.orig/lib/xkbfile/Imakefile 2001-08-28 02:40:59.000000000 +0900 ++++ xc/lib/xkbfile/Imakefile 2003-06-12 20:14:17.000000000 +0900 +@@ -10,6 +10,7 @@ + #define DoExtraLib NO + #define DoDebugLib NO + #define DoProfileLib NO ++#define DoPicLib YES + #define HasSharedData NO + #define LibName xkbfile + #define SoRev SOXKBFILEREV Modified: branches/4.3.0/sid/debian/patches/004_imake_manpage_handling_overhaul.diff ============================================================================== --- branches/4.3.0/sid/debian/patches/004_imake_manpage_handling_overhaul.diff 2003-06-13 07:34:38 UTC (rev 194) +++ branches/4.3.0/sid/debian/patches/004_imake_manpage_handling_overhaul.diff 2003-06-13 12:29:19 UTC (rev 195) @@ -299,13 +299,13 @@ +++ xc/config/cf/linux.cf Mon Jan 13 17:23:31 2003 @@ -155,6 +155,7 @@ # define BuildHtmlManPages NO - # define StaticNeedsPicForShared YES + # define StaticNeedsPicForShared NO /* We provides PIC static libraries by other way */ # define KernelVersionInBanner YES +# define ProjectManSuffix x /* The TT/Meltho fonts are all under non-free licenses. */ # define BuildTrueTypeFonts NO # define BuildBethMarduthoFonts NO -@@ -968,26 +968,6 @@ +@@ -968,26 +969,6 @@ # define ConnectionFlags -DUNIXCONN -DTCPCONN #endif Modified: branches/4.3.0/sid/debian/patches/003_linux.cf_and_xfree86.cf.diff ============================================================================== --- branches/4.3.0/sid/debian/patches/003_linux.cf_and_xfree86.cf.diff 2003-06-13 07:34:38 UTC (rev 194) +++ branches/4.3.0/sid/debian/patches/003_linux.cf_and_xfree86.cf.diff 2003-06-13 12:29:19 UTC (rev 195) @@ -81,7 +81,7 @@ # define SpecsDocDirs CTEXT GL ICCCM X11 Xext Xv i18n xterm # define BuildRman NO # define BuildHtmlManPages NO -+# define StaticNeedsPicForShared YES ++# define StaticNeedsPicForShared NO /* We provides PIC static libraries by other way */ +# define KernelVersionInBanner YES +/* The TT/Meltho fonts are all under non-free licenses. */ +# define BuildTrueTypeFonts NO Modified: branches/4.3.0/sid/debian/MANIFEST.i386 ============================================================================== --- branches/4.3.0/sid/debian/MANIFEST.i386 2003-06-13 07:34:38 UTC (rev 194) +++ branches/4.3.0/sid/debian/MANIFEST.i386 2003-06-13 12:29:19 UTC (rev 195) @@ -5923,6 +5923,7 @@ usr/X11R6/lib/libGLU.so.1.3 usr/X11R6/lib/libGLw.a usr/X11R6/lib/libI810XvMC.a +usr/X11R6/lib/libI810XvMC_pic.a usr/X11R6/lib/libICE.a usr/X11R6/lib/libICE.so.6.3 usr/X11R6/lib/libOSMesa.a @@ -5947,6 +5948,7 @@ usr/X11R6/lib/libXi.a usr/X11R6/lib/libXi.so.6.0 usr/X11R6/lib/libXinerama.a +usr/X11R6/lib/libXinerama_pic.a usr/X11R6/lib/libXmu.a usr/X11R6/lib/libXmu.so.6.2 usr/X11R6/lib/libXmuu.a @@ -5965,10 +5967,14 @@ usr/X11R6/lib/libXv.a usr/X11R6/lib/libXv.so.1.0 usr/X11R6/lib/libXvMC.a +usr/X11R6/lib/libXvMC_pic.a +usr/X11R6/lib/libXv_pic.a usr/X11R6/lib/libXxf86dga.a +usr/X11R6/lib/libXxf86dga_pic.a usr/X11R6/lib/libXxf86misc.a usr/X11R6/lib/libXxf86rush.a usr/X11R6/lib/libXxf86vm.a +usr/X11R6/lib/libXxf86vm_pic.a usr/X11R6/lib/libdps.a usr/X11R6/lib/libdps.so.1.0 usr/X11R6/lib/libdpstk.a @@ -5980,6 +5986,7 @@ usr/X11R6/lib/libpsres.so.1.0 usr/X11R6/lib/libxf86config.a usr/X11R6/lib/libxkbfile.a +usr/X11R6/lib/libxkbfile_pic.a usr/X11R6/lib/libxkbui.a usr/X11R6/lib/libxrx.so.6.3 usr/X11R6/lib/modules/codeconv/libARABIC.a Modified: branches/4.3.0/sid/debian/changelog ============================================================================== --- branches/4.3.0/sid/debian/changelog 2003-06-13 07:34:38 UTC (rev 194) +++ branches/4.3.0/sid/debian/changelog 2003-06-13 12:29:19 UTC (rev 195) @@ -34,6 +34,9 @@ - xlibs{,-dbg,-dev}.*, shlibs*: drop Xrender and Xcursor related entry - debian/control: add Build-Depends: libxrender-dev, libxcursor-dev + * xlibs-pic package rename to xlibs-pic-dev + - reintegrate piclib_support.diff (patch #909) + * debian/control: - Change all references to libstdc++5-dev to be libstdc++5-dev | libstdc++-dev, allowing libstdc++5-3.3-dev to satisfy Modified: branches/4.3.0/sid/debian/control ============================================================================== --- branches/4.3.0/sid/debian/control 2003-06-13 07:34:38 UTC (rev 194) +++ branches/4.3.0/sid/debian/control 2003-06-13 12:29:19 UTC (rev 195) @@ -826,6 +826,29 @@ and pixmap image files commonly used by X clients, including a set of cursor themes. +Package: xlibs-pic-dev +Section: libdevel +Architecture: any +Depends: xlibs-dev (= ${Source-Version}), libc6-dev +Provides: xlibs-pic +Description: X Window System client extension library PIC archives + xlibs-pic-dev provides PIC archives (static libraries with PIC information) + of some of the libraries in xlibs-dev that are available in xlibs-dev as + static objects. + . + These archives are available for use *only* for linking into objects which + will be accessed using the dlopen() function, such as plugin modules for + applications. + . + The libraries available in PIC archive form include: + - libI810XvMC + - libXinerama + - libXv + - libXvMC + - libXxf86dga + - libXxf86vm + - libxkbfile + Package: xmh Priority: extra Section: mail Modified: branches/4.3.0/sid/debian/MANIFEST.alpha ============================================================================== --- branches/4.3.0/sid/debian/MANIFEST.alpha 2003-06-13 07:34:38 UTC (rev 194) +++ branches/4.3.0/sid/debian/MANIFEST.alpha 2003-06-13 12:29:19 UTC (rev 195) @@ -5922,6 +5922,7 @@ usr/X11R6/lib/libGLU.so.1.3 usr/X11R6/lib/libGLw.a usr/X11R6/lib/libI810XvMC.a +usr/X11R6/lib/libI810XvMC_pic.a usr/X11R6/lib/libICE.a usr/X11R6/lib/libICE.so.6.3 usr/X11R6/lib/libOSMesa.a @@ -5946,6 +5947,7 @@ usr/X11R6/lib/libXi.a usr/X11R6/lib/libXi.so.6.0 usr/X11R6/lib/libXinerama.a +usr/X11R6/lib/libXinerama_pic.a usr/X11R6/lib/libXmu.a usr/X11R6/lib/libXmu.so.6.2 usr/X11R6/lib/libXmuu.a @@ -5964,10 +5966,14 @@ usr/X11R6/lib/libXv.a usr/X11R6/lib/libXv.so.1.0 usr/X11R6/lib/libXvMC.a +usr/X11R6/lib/libXvMC_pic.a +usr/X11R6/lib/libXv_pic.a usr/X11R6/lib/libXxf86dga.a +usr/X11R6/lib/libXxf86dga_pic.a usr/X11R6/lib/libXxf86misc.a usr/X11R6/lib/libXxf86rush.a usr/X11R6/lib/libXxf86vm.a +usr/X11R6/lib/libXxf86vm_pic.a usr/X11R6/lib/libdps.a usr/X11R6/lib/libdps.so.1.0 usr/X11R6/lib/libdpstk.a @@ -5979,6 +5985,7 @@ usr/X11R6/lib/libpsres.so.1.0 usr/X11R6/lib/libxf86config.a usr/X11R6/lib/libxkbfile.a +usr/X11R6/lib/libxkbfile_pic.a usr/X11R6/lib/libxkbui.a usr/X11R6/lib/libxrx.so.6.3 usr/X11R6/lib/modules/codeconv/libARABIC.a Modified: branches/4.3.0/sid/debian/MANIFEST.sparc ============================================================================== --- branches/4.3.0/sid/debian/MANIFEST.sparc 2003-06-13 07:34:38 UTC (rev 194) +++ branches/4.3.0/sid/debian/MANIFEST.sparc 2003-06-13 12:29:19 UTC (rev 195) @@ -5921,6 +5921,7 @@ usr/X11R6/lib/libGLU.so.1.3 usr/X11R6/lib/libGLw.a usr/X11R6/lib/libI810XvMC.a +usr/X11R6/lib/libI810XvMC_pic.a usr/X11R6/lib/libICE.a usr/X11R6/lib/libICE.so.6.3 usr/X11R6/lib/libOSMesa.a @@ -5945,6 +5946,7 @@ usr/X11R6/lib/libXi.a usr/X11R6/lib/libXi.so.6.0 usr/X11R6/lib/libXinerama.a +usr/X11R6/lib/libXinerama_pic.a usr/X11R6/lib/libXmu.a usr/X11R6/lib/libXmu.so.6.2 usr/X11R6/lib/libXmuu.a @@ -5963,10 +5965,14 @@ usr/X11R6/lib/libXv.a usr/X11R6/lib/libXv.so.1.0 usr/X11R6/lib/libXvMC.a +usr/X11R6/lib/libXvMC_pic.a +usr/X11R6/lib/libXv_pic.a usr/X11R6/lib/libXxf86dga.a +usr/X11R6/lib/libXxf86dga_pic.a usr/X11R6/lib/libXxf86misc.a usr/X11R6/lib/libXxf86rush.a usr/X11R6/lib/libXxf86vm.a +usr/X11R6/lib/libXxf86vm_pic.a usr/X11R6/lib/libdps.a usr/X11R6/lib/libdps.so.1.0 usr/X11R6/lib/libdpstk.a @@ -5978,6 +5984,7 @@ usr/X11R6/lib/libpsres.so.1.0 usr/X11R6/lib/libxf86config.a usr/X11R6/lib/libxkbfile.a +usr/X11R6/lib/libxkbfile_pic.a usr/X11R6/lib/libxkbui.a usr/X11R6/lib/libxrx.so.6.3 usr/X11R6/lib/modules/codeconv/libARABIC.a -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]