[pkg-wine-party] [SCM] Debian Wine packaging branch, master, updated. wine-1.1.36-1-21525-g92f7e28

Hilko Bengen bengen at debian.org
Sat Jun 9 07:19:44 UTC 2012


The following commit has been merged in the master branch:
commit 8688aa4bb223bb9447953eef0aec43ee31e61bac
Merge: e5448c23d3c23f3528b9eb159d7c6e71b2c0980d 43218aae7cbd90912dcb1e23c0753ea4dcfe31e1
Author: Hilko Bengen <bengen at debian.org>
Date:   Mon Apr 23 00:12:48 2012 +0200

    New upstream release 1.2, released Jul 16, 2010.

diff --combined configure.ac
index e26880d,61f376e..2e05ee9
--- a/configure.ac
+++ b/configure.ac
@@@ -11,17 -11,25 +11,25 @@@ AC_CONFIG_SRCDIR(server/atom.c
  AC_CONFIG_HEADERS(include/config.h)
  AC_CONFIG_AUX_DIR(tools)
  
- dnl autoconf versions before 2.63b don't have AS_VAR_APPEND
+ dnl autoconf versions before 2.63b don't have AS_VAR_APPEND or AS_VAR_IF
  m4_ifdef([AS_VAR_APPEND],,[as_fn_append () { eval $[1]=\$$[1]\$[2]; }
  AC_DEFUN([AS_VAR_APPEND],[as_fn_append $1 $2])])dnl
+ m4_ifdef([AS_VAR_IF],,[AC_DEFUN([AS_VAR_IF],
+ [AS_LITERAL_IF([$1],
+   [AS_IF([test "x$$1" = x""$2], [$3], [$4])],
+   [eval as_val=\$$1
+    AS_IF([test "x$as_val" = x""$2], [$3], [$4])])])])dnl
+ dnl autoconf versions before 2.64 don't have AC_PACKAGE_URL
+ m4_ifdef([AC_PACKAGE_URL],,
+   [AC_DEFINE([PACKAGE_URL], ["http://www.winehq.org"], [Define to the home page for this package.])
+    AC_SUBST([PACKAGE_URL], ["http://www.winehq.org"])])dnl
  
  dnl **** Command-line arguments ****
  
  AC_ARG_ENABLE(win16, AS_HELP_STRING([--disable-win16],[do not include Win16 support]))
  AC_ARG_ENABLE(win64, AS_HELP_STRING([--enable-win64],[build a Win64 emulator on AMD64 (won't run Win32 binaries)]))
  AC_ARG_ENABLE(tests, AS_HELP_STRING([--disable-tests],[do not build the regression tests]))
- AC_ARG_ENABLE(maintainer-mode, AS_HELP_STRING([--enable-maintainer-mode],[enable maintainer-specific build rules]),
-                                ,[AC_SUBST([MAINTAINER_MODE],[\#])])
+ AC_ARG_ENABLE(maintainer-mode, AS_HELP_STRING([--enable-maintainer-mode],[enable maintainer-specific build rules]))
  
  AC_ARG_WITH(alsa,      AS_HELP_STRING([--without-alsa],[do not use the Alsa sound support]),
              [if test "x$withval" = "xno"; then ac_cv_header_sys_asoundlib_h=no; ac_cv_header_alsa_asoundlib_h=no; fi])
@@@ -281,11 -289,37 +289,37 @@@ AC_CHECK_PROGS(RSVG, rsvg, false
  AC_CHECK_PROGS(CONVERT, convert, false)
  AC_CHECK_PROGS(ICOTOOL, icotool, false)
  
- if test "${enable_maintainer_mode+set}" = set
+ if test "x$enable_maintainer_mode" != "xyes"
  then
+   AC_SUBST([MAINTAINER_MODE],[\#])
+ else
    if test "$FONTFORGE" = "false"; then WINE_WARNING([fontforge is missing, fonts can't be rebuilt.]); fi
    if test "$RSVG" = "false"; then WINE_WARNING([rsvg is missing, icons can't be rebuilt.]); fi
-   if test "$CONVERT" = "false"; then WINE_WARNING([imagemagick is missing, icons can't be rebuilt.]); fi
+ 
+   dnl Check the imagemagick version
+   if test "$CONVERT" = false
+   then
+     WINE_WARNING([imagemagick is missing, icons can't be rebuilt.])
+   else
+     AC_MSG_CHECKING([for recent enough imagemagick])
+     convert_version=`convert --version | head -n1`
+     if test "x$convert_version" != "x"
+     then
+       convert_version_major=`expr "$convert_version" : '.* \([[0-9]]*\)\.[[0-9]]*'`
+       convert_version_minor=`expr "$convert_version" : '.* [[0-9]]*\.\([[0-9]]*\)'`
+       if test "$convert_version_major" -eq 6 -a "$convert_version_minor" -lt 6
+       then
+         CONVERT=false
+         WINE_WARNING([imagemagick version 6.6 or newer is needed to rebuild icons.])
+       fi
+     fi
+     if test "$CONVERT" = false
+     then
+       AC_MSG_RESULT([no ($convert_version_major.$convert_version_minor)])
+     else
+       AC_MSG_RESULT([yes ($convert_version_major.$convert_version_minor)])
+     fi
+   fi
  
    dnl Check the icotool version
    if test "$ICOTOOL" = false
@@@ -296,8 -330,8 +330,8 @@@
      icotool_version=`icotool --version | head -n1`
      if test "x$icotool_version" != "x"
      then
-       icotool_version_major=`expr "$icotool_version" : '.* \([[0-9]]*\).[[0-9]]*'`
-       icotool_version_minor=`expr "$icotool_version" : '.* [[0-9]]*.\([[0-9]]*\)'`
+       icotool_version_major=`expr "$icotool_version" : '.* \([[0-9]]*\)\.[[0-9]]*'`
+       icotool_version_minor=`expr "$icotool_version" : '.* [[0-9]]*\.\([[0-9]]*\)'`
        if test "$icotool_version_major" -eq 0 -a "$icotool_version_minor" -lt 29
        then
          ICOTOOL=false
@@@ -337,8 -371,6 +371,6 @@@ AC_SYS_LARGEFILE(
  AC_CHECK_HEADERS(\
  	AL/al.h \
  	AudioToolbox/AudioConverter.h \
- 	AudioToolbox/AudioFile.h \
- 	AudioToolbox/AudioFileStream.h \
  	AudioUnit/AudioUnit.h \
  	Carbon/Carbon.h \
  	CoreAudio/CoreAudio.h \
@@@ -393,6 -425,7 +425,7 @@@
  	machine/cpu.h \
  	machine/limits.h \
  	machine/soundcard.h \
+ 	machine/sysarch.h \
  	mntent.h \
  	mpg123.h \
  	ncurses.h \
@@@ -675,14 -708,6 +708,6 @@@ case $host_os i
      then
          dnl CoreServices needed by AudioUnit
          AC_SUBST(COREAUDIO,"-framework CoreAudio -framework AudioUnit -framework CoreServices -framework AudioToolbox -framework CoreMIDI")
-         ac_save_LIBS="$LIBS"
-         if test "$ac_cv_header_AudioToolbox_AudioFile_h" = "yes"
-         then
-             LIBS="$LIBS $COREAUDIO"
-             AC_CHECK_FUNCS(AudioFileStreamOpen)
-             LIBS="$ac_save_LIBS"
-         fi
-         test "x$ac_cv_func_AudioFileStreamOpen" = xyes || WINE_NOTICE([AudioToolbox version too old, mp3 codec won't be supported.])
      fi
      if test "$ac_cv_header_OpenAL_al_h" = "yes"
      then
@@@ -754,6 -779,13 +779,6 @@@
        WINE_TRY_CFLAGS([-fPIC -Wl,--export-dynamic],
                        [AC_SUBST(LDEXECFLAGS,["-Wl,--export-dynamic"])])
  
 -      WINE_TRY_CFLAGS([-fPIC -Wl,--rpath,\$ORIGIN/../lib],
 -                      [LDRPATH_INSTALL="-Wl,--rpath,\\\$\$ORIGIN/\`\$(RELPATH) \$(bindir) \$(libdir)\`"
 -                       LDRPATH_LOCAL="-Wl,--rpath,\\\$\$ORIGIN/\$(TOPOBJDIR)/libs/wine"],
 -          [WINE_TRY_CFLAGS([-fPIC -Wl,-R,\$ORIGIN/../lib],
 -                           [LDRPATH_INSTALL="-Wl,-R,\\\$\$ORIGIN/\`\$(RELPATH) \$(bindir) \$(libdir)\`"
 -                            LDRPATH_LOCAL="-Wl,-R,\\\$\$ORIGIN/\$(TOPOBJDIR)/libs/wine"])])
 -
        WINE_TRY_CFLAGS([-Wl,--enable-new-dtags],
                        [LDRPATH_INSTALL="$LDRPATH_INSTALL -Wl,--enable-new-dtags"])
  
@@@ -1496,7 -1528,7 +1521,7 @@@ the
  fi
  WINE_NOTICE_WITH(mpg123,[test "x$ac_cv_lib_mpg123_mpg123_feed" != xyes -a x"$ac_cv_header_CoreAudio_CoreAudio_h" != xyes],
                   [libmpg123 ${notice_platform}development files not found (or too old), mp3 codec won't be supported.])
- test "x$ac_cv_lib_mpg123_mpg123_feed" = xyes -o "x$ac_cv_func_AudioFileStreamOpen" = xyes || enable_winemp3_acm=${enable_winemp3_acm:-no}
+ test "x$ac_cv_lib_mpg123_mpg123_feed" = xyes -o "x$ac_cv_header_AudioToolbox_AudioConverter_h" = xyes || enable_winemp3_acm=${enable_winemp3_acm:-no}
  
  dnl **** Check for OpenAL 1.1 ****
  if test "$ac_cv_header_AL_al_h" = "yes"
@@@ -1573,7 -1605,7 +1598,7 @@@ the
    fi
  
    dnl Enable -Werror for maintainer mode
-   if test "${enable_maintainer_mode+set}" = set
+   if test "x$enable_maintainer_mode" = "xyes"
    then
        WINE_TRY_CFLAGS([-Werror])
    fi
@@@ -1727,7 -1759,7 +1752,7 @@@ case $host_os i
  esac
  
  AC_SUBST(MAIN_BINARY,"wine")
- test -z "$with_wine64" || MAIN_BINARY="wine32"
+ test "x$enable_win64" != "xyes" || MAIN_BINARY="wine64"
  
  case $host_cpu in
    *i[[3456789]]86*)
@@@ -2192,6 -2224,7 +2217,7 @@@ WINE_CONFIG_DLL(amstream
  WINE_CONFIG_TEST(dlls/amstream/tests)
  WINE_CONFIG_DLL(appwiz.cpl)
  WINE_CONFIG_DLL(atl,,[atl])
+ WINE_CONFIG_TEST(dlls/atl/tests)
  WINE_CONFIG_DLL(authz)
  WINE_CONFIG_DLL(avicap32,,[avicap32])
  WINE_CONFIG_DLL(avifil32,,[avifil32])
@@@ -2514,6 -2547,7 +2540,7 @@@ WINE_CONFIG_DLL(rsabase
  WINE_CONFIG_DLL(rsaenh,,[rsaenh])
  WINE_CONFIG_TEST(dlls/rsaenh/tests)
  WINE_CONFIG_DLL(rtutils,,[rtutils])
+ WINE_CONFIG_DLL(samlib)
  WINE_CONFIG_DLL(sane.ds)
  WINE_CONFIG_DLL(sccbase)
  WINE_CONFIG_DLL(schannel)
@@@ -2746,13 -2780,13 +2773,13 @@@ dnl Some final makefile rule
  if test -n "$with_wine64"
  then
  WINE_APPEND_RULE([ALL_MAKEFILE_DEPENDS],
- [all: fonts server $with_wine64/loader/wine32
+ [all: fonts server $with_wine64/loader/wine
  fonts server:
  	\$(RM) \$[@] && \$(LN_S) $with_wine64/\$[@] \$[@]
- $with_wine64/loader/wine32:
- 	\$(RM) \$[@] && \$(LN_S) $ac_pwd/loader/wine32 \$[@]
+ $with_wine64/loader/wine:
+ 	\$(RM) \$[@] && \$(LN_S) $ac_pwd/loader/wine \$[@]
  clean::
- 	\$(RM) fonts server $with_wine64/loader/wine32])
+ 	\$(RM) fonts server $with_wine64/loader/wine])
  fi
  
  WINE_APPEND_RULE([ALL_MAKEFILE_DEPENDS],
diff --combined dlls/wineps.drv/Makefile.in
index e1324f5,89f95da..c276ca6
--- a/dlls/wineps.drv/Makefile.in
+++ b/dlls/wineps.drv/Makefile.in
@@@ -90,18 -90,19 +90,19 @@@ RC_SRCS= 
  	wps_Sk.rc \
  	wps_Sv.rc \
  	wps_Tr.rc \
+ 	wps_Uk.rc \
  	wps_Zh.rc
  
  EXTRASUBDIRS = data
  
  @MAKE_DLL_RULES@
  
 -install-ppd:: $(DESTDIR)$(datadir)/wine dummy
 -	$(INSTALL_DATA) $(SRCDIR)/generic.ppd $(DESTDIR)$(datadir)/wine/generic.ppd
 +install-ppd:: $(DESTDIR)$(datadir)/wine$(DATASUFFIX) dummy
 +	$(INSTALL_DATA) $(SRCDIR)/generic.ppd $(DESTDIR)$(datadir)/wine$(DATASUFFIX)/generic.ppd
  
  .PHONY: install-ppd
  
  @WOW64_DISABLE@ install install-lib:: install-ppd
  
  uninstall::
 -	$(RM) $(DESTDIR)$(datadir)/wine/generic.ppd
 +	$(RM) $(DESTDIR)$(datadir)/wine$(DATASUFFIX)/generic.ppd
diff --combined loader/wine.man.in
index 5eb1304,6779b44..06ec278
--- a/loader/wine.man.in
+++ b/loader/wine.man.in
@@@ -87,7 -87,7 +87,7 @@@ processes
  Specifies the path and name of the
  .B wineserver
  binary. If not set, Wine will try to load
 -.BR @bindir@/wineserver ,
 +.BR @dlldir@/wineserver,
  and if this doesn't exist it will then look for a file named
  "wineserver" in the path and in a few other likely locations.
  .TP
@@@ -142,8 -142,9 +142,9 @@@ on all relay messages (API calls)
  .TP
  WINEDEBUG=relay
  will turn on all relay messages. For more control on including or excluding
- functions and dlls from the relay trace look into the [Debug] section
- of the wine configuration file.
+ functions and dlls from the relay trace, look into the
+ .B HKEY_CURRENT_USER\\\\Software\\\\Wine\\\\Debug
+ registry key.
  .PP
  For more information on debugging messages, see the
  .I Running Wine
@@@ -160,8 -161,7 +161,7 @@@ Wine will also look i
  .TP
  .I WINEDLLOVERRIDES
  Defines the override type and load order of dlls used in the loading
- process for any dll. The default is set in the configuration
- file. There are currently two types of libraries that can be loaded
+ process for any dll. There are currently two types of libraries that can be loaded
  into a process' address space: native windows dlls
  .RI ( native ),
  .B wine 
@@@ -205,6 -205,19 +205,19 @@@ the builtin load fails; load shell32 al
  always as native. Oleaut32 will be disabled.
  .RE
  .TP
+ .I WINEARCH
+ Specifies the Windows architecture to support. It can be set either to
+ .B win32
+ (support only 32-bit applications), or to
+ .B win64
+ (support both 64-bit applications and 32-bit ones in WoW64 mode).
+ .br
+ The architecture supported by a given Wine prefix is set at prefix
+ creation time and cannot be changed afterwards. When running with an
+ existing prefix, Wine will refuse to start if
+ .I WINEARCH
+ doesn't match the prefix architecture.
+ .TP
  .I DISPLAY
  Specifies the X11 display to use.
  .TP
@@@ -233,7 -246,7 +246,7 @@@ Th
  .B wine 
  program loader for CUI (console) applications.
  .TP
 -.I @bindir@/wineserver
 +.I @dlldir@/wineserver
  The 
  .B wine 
  server 
diff --combined tools/Makefile.in
index 1d06ccf,a9ec324..012e860
--- a/tools/Makefile.in
+++ b/tools/Makefile.in
@@@ -19,7 -19,8 +19,8 @@@ PROGRAMS = 
  
  MANPAGES = \
  	winemaker.man \
- 	winemaker.de.man
+ 	winemaker.de.man \
+ 	winemaker.fr.man
  
  C_SRCS = \
  	fnt2bdf.c \
@@@ -34,9 -35,10 +35,10 @@@ EXTRASUBDIRS = winap
  INSTALLDIRS = \
  	$(DESTDIR)$(bindir) \
  	$(DESTDIR)$(datadir)/applications \
 -	$(DESTDIR)$(datadir)/wine \
 +	$(DESTDIR)$(datadir)/wine$(DATASUFFIX) \
  	$(DESTDIR)$(mandir)/man$(prog_manext) \
- 	$(DESTDIR)$(mandir)/de.UTF-8/man$(prog_manext)
+ 	$(DESTDIR)$(mandir)/de.UTF-8/man$(prog_manext) \
+ 	$(DESTDIR)$(mandir)/fr.UTF-8/man$(prog_manext)
  
  UPDATE_DESKTOP_DATABASE = update-desktop-database
  
@@@ -69,8 -71,8 +71,8 @@@ wineapploader: wineapploader.i
  	sed -e 's, at bindir\@,$(bindir),g' $(SRCDIR)/wineapploader.in >$@ || ($(RM) $@ && false)
  
  install install-lib:: wine.inf $(INSTALLDIRS)
 -	$(INSTALL_DATA) wine.inf $(DESTDIR)$(datadir)/wine/wine.inf
 -	$(INSTALL_DATA) $(SRCDIR)/l_intl.nls $(DESTDIR)$(datadir)/wine/l_intl.nls
 +	$(INSTALL_DATA) wine.inf $(DESTDIR)$(datadir)/wine$(DATASUFFIX)/wine.inf
 +	$(INSTALL_DATA) $(SRCDIR)/l_intl.nls $(DESTDIR)$(datadir)/wine$(DATASUFFIX)/l_intl.nls
  	$(INSTALL_DATA) $(SRCDIR)/wine.desktop $(DESTDIR)$(datadir)/applications/wine.desktop
  	-$(UPDATE_DESKTOP_DATABASE)
  
@@@ -78,14 -80,16 +80,16 @@@ install install-dev:: $(DESTDIR)$(bindi
  	$(INSTALL_SCRIPT) $(SRCDIR)/winemaker $(DESTDIR)$(bindir)/winemaker
  	$(INSTALL_DATA) winemaker.man $(DESTDIR)$(mandir)/man$(prog_manext)/winemaker.$(prog_manext)
  	$(INSTALL_DATA) winemaker.de.man $(DESTDIR)$(mandir)/de.UTF-8/man$(prog_manext)/winemaker.$(prog_manext)
+ 	$(INSTALL_DATA) winemaker.fr.man $(DESTDIR)$(mandir)/fr.UTF-8/man$(prog_manext)/winemaker.$(prog_manext)
  
  uninstall::
 -	$(RM) $(DESTDIR)$(datadir)/wine/wine.inf \
 -		$(DESTDIR)$(datadir)/wine/l_intl.nls \
 +	$(RM) $(DESTDIR)$(datadir)/wine$(DATASUFFIX)/wine.inf \
 +		$(DESTDIR)$(datadir)/wine$(DATASUFFIX)/l_intl.nls \
  		$(DESTDIR)$(datadir)/applications/wine.desktop \
  		$(DESTDIR)$(bindir)/winemaker \
  		$(DESTDIR)$(mandir)/man$(prog_manext)/winemaker.$(prog_manext) \
- 		$(DESTDIR)$(mandir)/de.UTF-8/man$(prog_manext)/winemaker.$(prog_manext)
+ 		$(DESTDIR)$(mandir)/de.UTF-8/man$(prog_manext)/winemaker.$(prog_manext) \
+ 		$(DESTDIR)$(mandir)/fr.UTF-8/man$(prog_manext)/winemaker.$(prog_manext)
  	-$(UPDATE_DESKTOP_DATABASE)
  
  depend: makedep$(EXEEXT)

-- 
Debian Wine packaging



More information about the pkg-wine-party mailing list