[pkg-wine-party] [SCM] Debian Wine packaging branch, master, updated. wine-1.1.31-1-559-g0a49f78

[Ove Kaaven]

The following commit has been merged in the master branch:
commit 93b0311f1a57645c36d420e643edf9d3f0691b09
Merge: 7fcbf2b47d352d3898844bfd2a15ba97a4ccd771 63ae490890a65ede1d53d594f908b75c03f25119
Author: Ove Kaaven <ovek at arcticnet.no>
Date:   Sat Oct 31 02:55:31 2009 +0100

    Merge branch 'deb/libsuffix'

diff --combined libs/wine/Makefile.in
index e4543a1,74c2cf5..242d5b6
--- a/libs/wine/Makefile.in
+++ b/libs/wine/Makefile.in
@@@ -11,7 -11,7 +11,7 @@@ DEFS      = -D__WINESRC__ -DWINE_UNICOD
  
  VERSION   = 1.0
  SOVERSION = 1
- SONAME    = libwine.so.$(SOVERSION)
+ SONAME    = libwine$(LIBSUFFIX).so.$(SOVERSION)
  DYNAME    = libwine.$(SOVERSION).dylib
  
  INSTALLDIRS = $(DESTDIR)$(libdir)
@@@ -106,26 -106,26 +106,26 @@@ all: $(MODULE) $(MODULE:.dll=.a
  # Special defines needed for config.c
  
  CONFIGDIRS = \
 -	-DBINDIR='"$(bindir)"' \
 +	-DBINDIR='"$(libdir)/wine"' \
  	-DDLLDIR='"$(dlldir)"' \
 -	-DLIB_TO_BINDIR=\"`$(RELPATH) $(libdir) $(bindir)`\" \
 +	-DLIB_TO_BINDIR=\"`$(RELPATH) $(libdir) $(libdir)/wine`\" \
  	-DLIB_TO_DLLDIR=\"`$(RELPATH) $(libdir) $(dlldir)`\" \
 -	-DBIN_TO_DLLDIR=\"`$(RELPATH) $(bindir) $(dlldir)`\" \
 -	-DBIN_TO_DATADIR=\"`$(RELPATH) $(bindir) $(datadir)/wine`\"
 +	-DBIN_TO_DLLDIR=\"`$(RELPATH) $(libdir)/wine $(dlldir)`\" \
 +	-DBIN_TO_DATADIR=\"`$(RELPATH) $(libdir)/wine $(datadir)/wine`\"
  
  config.o: config.c $(RELPATH)
  	$(CC) -c $(ALLCFLAGS) -o $@ $(SRCDIR)/config.c $(CONFIGDIRS)
  
  # Linking rules
  
- libwine.so.$(VERSION): $(OBJS) $(VERSCRIPT) Makefile.in
+ libwine$(LIBSUFFIX).so.$(VERSION): $(OBJS) $(VERSCRIPT) Makefile.in
  	$(LDSHARED) $(OBJS) $(EXTRALIBS) $(LDFLAGS) $(LIBS) -o $@
  
- libwine.so.$(SOVERSION): libwine.so.$(VERSION)
- 	$(RM) $@ && $(LN_S) libwine.so.$(VERSION) $@
+ libwine$(LIBSUFFIX).so.$(SOVERSION): libwine$(LIBSUFFIX).so.$(VERSION)
+ 	$(RM) $@ && $(LN_S) libwine$(LIBSUFFIX).so.$(VERSION) $@
  
- libwine.so: libwine.so.$(SOVERSION)
- 	$(RM) $@ && $(LN_S) libwine.so.$(SOVERSION) $@
+ libwine.so: libwine$(LIBSUFFIX).so.$(SOVERSION)
+ 	$(RM) $@ && $(LN_S) libwine$(LIBSUFFIX).so.$(SOVERSION) $@
  
  libwine.a: wine.def
  	$(DLLTOOL) -l $@ -d $(SRCDIR)/wine.def
@@@ -148,9 -148,9 +148,9 @@@ libwine.dylib: libwine.$(SOVERSION).dyl
  
  .PHONY: install-lib-so install-lib-dll install-lib-dylib install-dev-so install-dev-dll install-dev-dylib
  
- install-lib-so: libwine.so.$(VERSION) $(DESTDIR)$(libdir) dummy
- 	$(INSTALL_PROGRAM) libwine.so.$(VERSION) $(DESTDIR)$(libdir)/libwine.so.$(VERSION)
- 	cd $(DESTDIR)$(libdir) && $(RM) libwine.so.$(SOVERSION) && $(LN_S) libwine.so.$(VERSION) libwine.so.$(SOVERSION)
+ install-lib-so: libwine$(LIBSUFFIX).so.$(VERSION) $(DESTDIR)$(libdir) dummy
+ 	$(INSTALL_PROGRAM) libwine$(LIBSUFFIX).so.$(VERSION) $(DESTDIR)$(libdir)/libwine$(LIBSUFFIX).so.$(VERSION)
+ 	cd $(DESTDIR)$(libdir) && $(RM) libwine$(LIBSUFFIX).so.$(SOVERSION) && $(LN_S) libwine$(LIBSUFFIX).so.$(VERSION) libwine$(LIBSUFFIX).so.$(SOVERSION)
  
  install-lib-dll: libwine.dll $(DESTDIR)$(libdir) dummy
  	$(INSTALL_DATA) libwine.dll $(DESTDIR)$(libdir)/libwine.dll
@@@ -160,7 -160,7 +160,7 @@@ install-lib-dylib: libwine.$(VERSION).d
  	cd $(DESTDIR)$(libdir) && $(RM) libwine.$(SOVERSION).dylib && $(LN_S) libwine.$(VERSION).dylib libwine.$(SOVERSION).dylib
  
  install-dev-so: $(DESTDIR)$(libdir) dummy
- 	cd $(DESTDIR)$(libdir) && $(RM) libwine.so && $(LN_S) libwine.so.$(VERSION) libwine.so
+ 	cd $(DESTDIR)$(libdir) && $(RM) libwine.so && $(LN_S) libwine$(LIBSUFFIX).so.$(VERSION) libwine.so
  
  install-dev-dll: libwine.a $(DESTDIR)$(libdir) dummy
  	$(INSTALL_DATA) libwine.a $(DESTDIR)$(libdir)/libwine.a

-- 
Debian Wine packaging