[pkg-wine-party] [SCM] Debian Wine packaging branch, master, updated. wine-1.1.27-1-446-gaf4a3bb
Ove Kaaven
ovek at arcticnet.no
Sat Aug 22 18:39:43 UTC 2009
The following commit has been merged in the master branch:
commit 10744a56095b40590b00027ce31b9a3bd825b520
Author: Ove Kaaven <ovek at arcticnet.no>
Date: Sat Aug 22 15:26:38 2009 +0200
Install the new pre-built fake DLLs into the Wine packages, following the package split.
To reduce future problems, I now use *.install-modules files to list all DLLs to install,
and then prep-install.sh makes sure all files relevant to that DLL get properly installed.
diff --git a/debian/libwine-bin.install-common b/debian/libwine-bin.install-common
index d53af40..e69de29 100644
--- a/debian/libwine-bin.install-common
+++ b/debian/libwine-bin.install-common
@@ -1,45 +0,0 @@
-debian/tmp/usr/lib/wine/*.cpl.so
-debian/tmp/usr/lib/wine/cacls.exe.so
-debian/tmp/usr/lib/wine/clock.exe.so
-debian/tmp/usr/lib/wine/cmd.exe.so
-debian/tmp/usr/lib/wine/control.exe.so
-debian/tmp/usr/lib/wine/eject.exe.so
-debian/tmp/usr/lib/wine/expand.exe.so
-debian/tmp/usr/lib/wine/explorer.exe.so
-debian/tmp/usr/lib/wine/hh.exe.so
-debian/tmp/usr/lib/wine/icinfo.exe.so
-debian/tmp/usr/lib/wine/iexplore.exe.so
-debian/tmp/usr/lib/wine/lodctr.exe.so
-debian/tmp/usr/lib/wine/msiexec.exe.so
-debian/tmp/usr/lib/wine/notepad.exe.so
-debian/tmp/usr/lib/wine/net.exe.so
-debian/tmp/usr/lib/wine/oleview.exe.so
-debian/tmp/usr/lib/wine/progman.exe.so
-debian/tmp/usr/lib/wine/reg.exe.so
-debian/tmp/usr/lib/wine/regedit.exe.so
-debian/tmp/usr/lib/wine/regsvr32.exe.so
-debian/tmp/usr/lib/wine/rpcss.exe.so
-debian/tmp/usr/lib/wine/rundll32.exe.so
-debian/tmp/usr/lib/wine/secedit.exe.so
-debian/tmp/usr/lib/wine/services.exe.so
-debian/tmp/usr/lib/wine/start.exe.so
-debian/tmp/usr/lib/wine/svchost.exe.so
-debian/tmp/usr/lib/wine/taskmgr.exe.so
-debian/tmp/usr/lib/wine/termsv.exe.so
-debian/tmp/usr/lib/wine/uninstaller.exe.so
-debian/tmp/usr/lib/wine/unlodctr.exe.so
-debian/tmp/usr/lib/wine/wineboot.exe.so
-debian/tmp/usr/lib/wine/winebrowser.exe.so
-debian/tmp/usr/lib/wine/winecfg.exe.so
-debian/tmp/usr/lib/wine/wineconsole.exe.so
-debian/tmp/usr/lib/wine/winedbg.exe.so
-debian/tmp/usr/lib/wine/winedevice.exe.so
-debian/tmp/usr/lib/wine/winefile.exe.so
-debian/tmp/usr/lib/wine/winemenubuilder.exe.so
-debian/tmp/usr/lib/wine/winemine.exe.so
-debian/tmp/usr/lib/wine/winepath.exe.so
-debian/tmp/usr/lib/wine/winhlp32.exe.so
-debian/tmp/usr/lib/wine/winver.exe.so
-debian/tmp/usr/lib/wine/wordpad.exe.so
-debian/tmp/usr/lib/wine/write.exe.so
-debian/tmp/usr/lib/wine/xcopy.exe.so
diff --git a/debian/libwine-bin.install-modules b/debian/libwine-bin.install-modules
new file mode 100644
index 0000000..1568491
--- /dev/null
+++ b/debian/libwine-bin.install-modules
@@ -0,0 +1,46 @@
+*.cpl
+cacls.exe
+clock.exe
+cmd.exe
+control.exe
+eject.exe
+expand.exe
+explorer.exe
+hh.exe
+icinfo.exe
+iexplore.exe
+lodctr.exe
+msiexec.exe
+notepad.exe
+net.exe
+oleview.exe
+progman.exe
+reg.exe
+regedit.exe
+regsvr32.exe
+rpcss.exe
+rundll32.exe
+secedit.exe
+services.exe
+start.exe
+svchost.exe
+taskmgr.exe
+termsv.exe
+uninstaller.exe
+unlodctr.exe
+wineboot.exe
+winebrowser.exe
+winecfg.exe
+wineconsole.exe
+winedbg.exe
+winedevice.exe
+winefile.exe
+winemenubuilder.exe
+winemine.exe
+winepath.exe
+winevdm.exe
+winhlp32.exe
+winver.exe
+wordpad.exe
+write.exe
+xcopy.exe
diff --git a/debian/libwine-bin.install-platform b/debian/libwine-bin.install-platform
deleted file mode 100644
index df29483..0000000
--- a/debian/libwine-bin.install-platform
+++ /dev/null
@@ -1 +0,0 @@
-debian/tmp/usr/lib/wine/winevdm.exe.so
diff --git a/debian/libwine-print.install-common b/debian/libwine-print.install-common
index 9877a7a..e69de29 100644
--- a/debian/libwine-print.install-common
+++ b/debian/libwine-print.install-common
@@ -1 +0,0 @@
-debian/tmp/usr/lib/wine/spoolsv.exe.so
diff --git a/debian/libwine-print.install-modules b/debian/libwine-print.install-modules
new file mode 100644
index 0000000..7b706ca
--- /dev/null
+++ b/debian/libwine-print.install-modules
@@ -0,0 +1 @@
+spoolsv.exe
diff --git a/debian/libwine.install-common b/debian/libwine.install-common
index b36011c..1f32820 100644
--- a/debian/libwine.install-common
+++ b/debian/libwine.install-common
@@ -1,12 +1,4 @@
debian/tmp/usr/lib/libwine*.so.*
-debian/tmp/usr/lib/wine/*.dll.so
-debian/tmp/usr/lib/wine/*.drv.so
-debian/tmp/usr/lib/wine/*.sys.so
-debian/tmp/usr/lib/wine/*.acm.so
-debian/tmp/usr/lib/wine/*.ocx.so
-debian/tmp/usr/lib/wine/*.tlb.so
-debian/tmp/usr/lib/wine/*.ds.so
-debian/tmp/usr/lib/wine/ntoskrnl.exe.so
debian/tmp/usr/lib/wine/wine.bin
debian/tmp/usr/lib/wine/wineserver
debian/tmp/usr/share/wine/generic.ppd
diff --git a/debian/libwine.install-modules b/debian/libwine.install-modules
new file mode 100644
index 0000000..b1be0d2
--- /dev/null
+++ b/debian/libwine.install-modules
@@ -0,0 +1,13 @@
+ntoskrnl.exe
+*.dll
+*.dll16
+*.drv
+*.drv16
+*.sys
+*.vxd
+*.exe16
+*.mod16
+*.acm
+*.ocx
+*.tlb
+*.ds
diff --git a/debian/libwine.install-platform b/debian/libwine.install-platform
index 1d30b1f..7f7eeb6 100644
--- a/debian/libwine.install-platform
+++ b/debian/libwine.install-platform
@@ -1,12 +1,3 @@
-debian/tmp/usr/lib/wine/*.vxd.so
-debian/tmp/usr/lib/wine/*.dll16
-debian/tmp/usr/lib/wine/*.drv16
-debian/tmp/usr/lib/wine/*.exe16
-debian/tmp/usr/lib/wine/*.mod16
-debian/tmp/usr/lib/wine/*.dll16.so
-debian/tmp/usr/lib/wine/*.drv16.so
-debian/tmp/usr/lib/wine/*.exe16.so
-debian/tmp/usr/lib/wine/*.mod16.so
debian/tmp/usr/lib/wine/wine-kthread
debian/tmp/usr/lib/wine/wine-pthread
debian/tmp/usr/lib/wine/wine-preloader
diff --git a/debian/libwine.split b/debian/libwine.split
index f804eb3..a8a4c12 100644
--- a/debian/libwine.split
+++ b/debian/libwine.split
@@ -1,22 +1,22 @@
-libwine-alsa winealsa.drv.so
-libwine-capi capi2032.dll.so
-libwine-cms mscms.dll.so
-libwine-esd wineesd.drv.so
-libwine-gl d3d8.dll.so
-libwine-gl d3d9.dll.so
-libwine-gl d3d10.dll.so
-libwine-gl d3d10core.dll.so
-libwine-gl d3dim.dll.so
-libwine-gl d3drm.dll.so
-libwine-gl d3dx8.dll.so
-libwine-gl d3dx9_*.dll.so
-libwine-gl d3dxof.dll.so
-libwine-gl glu32.dll.so
-libwine-gl opengl32.dll.so
-libwine-gphoto2 gphoto2.ds.so
-libwine-jack winejack.drv.so
-libwine-ldap wldap32.dll.so
-libwine-nas winenas.drv.so
-libwine-oss wineoss.drv.so
-libwine-print wineps.drv.so
-libwine-sane sane.ds.so
+libwine-alsa winealsa.drv
+libwine-capi capi2032.dll
+libwine-cms mscms.dll
+libwine-esd wineesd.drv
+libwine-gl d3d8.dll
+libwine-gl d3d9.dll
+libwine-gl d3d10.dll
+libwine-gl d3d10core.dll
+libwine-gl d3dim.dll
+libwine-gl d3drm.dll
+libwine-gl d3dx8.dll
+libwine-gl d3dx9_*.dll
+libwine-gl d3dxof.dll
+libwine-gl glu32.dll
+libwine-gl opengl32.dll
+libwine-gphoto2 gphoto2.ds
+libwine-jack winejack.drv
+libwine-ldap wldap32.dll
+libwine-nas winenas.drv
+libwine-oss wineoss.drv
+libwine-print wineps.drv
+libwine-sane sane.ds
diff --git a/debian/prep-install.sh b/debian/prep-install.sh
index 3efe35a..f390814 100644
--- a/debian/prep-install.sh
+++ b/debian/prep-install.sh
@@ -33,12 +33,28 @@ function expand_platform
done
}
+function expand_modules
+{
+ if [ ! -f debian/$package.${ext}-modules ]; then
+ return
+ fi
+ while [ -n "$1" ]; do
+ for mod in $(cat debian/$package.${ext}-modules); do
+ for bin in debian/tmp/$1/wine/$mod.so debian/tmp/$1/wine/$mod debian/tmp/$1/wine/fakedlls/$mod; do
+ [ ! -f $bin ] || echo $bin >> debian/$package$SUFFIX.${ext}
+ done
+ done
+ shift
+ done
+}
+
for ext in install links mime config preinst postinst prerm postrm docs manpages lintian-overrides; do
for inst in debian/*.${ext}-common; do
if [ -f "$inst" ]; then
package="$(basename "$inst" .${ext}-common)"
expand_common $LIBDIRS
expand_platform $LIBDIRS
+ expand_modules $LIBDIRS
fi
done
done
diff --git a/debian/split.sh b/debian/split.sh
index a57c2be..948e1e4 100644
--- a/debian/split.sh
+++ b/debian/split.sh
@@ -6,12 +6,18 @@ shift
while [ -n "$1" ]; do
PREFIX="$1"
while read DEST NAME; do
- for bin in debian/$SRC$SUFFIX/$PREFIX/$NAME; do
+ for bin in debian/$SRC$SUFFIX/$PREFIX/$NAME.so; do
if [ -f $bin ]; then
install -d debian/$DEST$SUFFIX/$PREFIX
mv $bin debian/$DEST$SUFFIX/$PREFIX
fi
done
+ for bin in debian/$SRC$SUFFIX/$PREFIX/fakedlls/$NAME; do
+ if [ -f $bin ]; then
+ install -d debian/$DEST$SUFFIX/$PREFIX/fakedlls
+ mv $bin debian/$DEST$SUFFIX/$PREFIX/fakedlls
+ fi
+ done
done < debian/$SRC.split
shift
done
--
Debian Wine packaging
More information about the pkg-wine-party
mailing list