[pkg-wine-party] [SCM] Debian Wine packaging branch, master, updated. wine-1.1.24-1-618-gc8c5acb

Ove Kaaven ovek at arcticnet.no
Sat Jul 11 18:02:54 UTC 2009 

The following commit has been merged in the master branch:
commit 0e885c184522fa799fdbbbb083f3dd9bbc2cad28
Author: Ove Kaaven <ovek at arcticnet.no>
Date:   Sat Jul 11 18:00:16 2009 +0200

    Moved all winelib programs in wine-utils to libwine-bin and wine-bin.
    Moved all development utilities in wine-utils to libwine-dev.
    Moved all remaining utilities in wine-utils to wine-bin.
    Deleted the wine-utils package.

diff --git a/debian/control.in b/debian/control.in
index dc82a33..a373f43 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -36,7 +36,7 @@ Vcs-Git: git://git.debian.org/git/pkg-wine/wine.git
 
 Package: wine
 Architecture: i386 hurd-i386 kfreebsd-i386 netbsd-i386 amd64 kfreebsd-amd64 powerpc hurd-powerpc kfreebsd-powerpc netbsd-powerpc sparc hurd-sparc kfreebsd-sparc netbsd-sparc
-Depends: wine-bin (= ${binary:Version}), wine-utils (= ${binary:Version}),
+Depends: wine-bin (= ${binary:Version}),
  libwine-alsa (= ${binary:Version}) [i386 amd64 powerpc sparc] | libwine-oss (= ${binary:Version}) | libwine-esd (= ${binary:Version}) | libwine-jack (= ${binary:Version}) | libwine-nas (= ${binary:Version}),
  libwine-gl (= ${binary:Version}), libwine-print (= ${binary:Version}), libwine-sane (= ${binary:Version}),
  libwine-cms (= ${binary:Version}), libwine-gphoto2 (= ${binary:Version}), libwine-ldap (= ${binary:Version})
@@ -53,7 +53,7 @@ Architecture: i386 hurd-i386 kfreebsd-i386 netbsd-i386 amd64 kfreebsd-amd64 powe
 Depends: ${shlibs:Depends}, libwine-bin (= ${binary:Version}), x11-utils | xbase-clients (>= 4.0) | xcontrib
 Suggests: libwine-print, libwine-gl
 Conflicts: binfmt-support (<< 1.1.2)
-Replaces: libwine (<< 0.0.20010216), wine-utils (<< 1.0-rc4-1), wine (<< 0.9.35)
+Replaces: libwine (<< 0.0.20010216), wine-utils (<< 1.1.25-1), wine (<< 0.9.35)
 Description: Windows API implementation - binary loader
  Wine is a free MS-Windows API implementation.
  This is still a work in progress and many applications may still not work.
@@ -76,8 +76,7 @@ Package: libwine-dev
 Architecture: i386 hurd-i386 kfreebsd-i386 netbsd-i386 amd64 kfreebsd-amd64 powerpc hurd-powerpc kfreebsd-powerpc netbsd-powerpc sparc hurd-sparc kfreebsd-sparc netbsd-sparc
 Section: libdevel
 Depends: libwine (= ${binary:Version}), libc6-dev, libc6-dev-i386 [amd64 kfreebsd-amd64]
-Replaces: libwine (<< 0.0.20010216)
-Recommends: wine-utils
+Replaces: libwine (<< 0.0.20010216), wine-utils (<< 1.1.25-1)
 Suggests: wine-doc
 Description: Windows API implementation - development files
  Wine is a free MS-Windows API implementation.
@@ -112,7 +111,7 @@ Package: libwine-bin
 Section: libs
 Architecture: i386 hurd-i386 kfreebsd-i386 netbsd-i386 amd64 kfreebsd-amd64 powerpc hurd-powerpc kfreebsd-powerpc netbsd-powerpc sparc hurd-sparc kfreebsd-sparc netbsd-sparc
 Depends: ${shlibs:Depends}
-Replaces: wine-bin (<< 1.1.25-1)
+Replaces: wine-bin (<< 1.1.25-1), wine-utils (<< 1.1.25-1)
 Description: Windows API implementation - system services
  Wine is a free MS-Windows API implementation.
  This is still a work in progress and many applications may still not work.
@@ -243,16 +242,3 @@ Description: Windows API implementation - scanner module
  .
  This package contains a TWAIN interface that allows Windows applications
  to communicate with scanners supported by SANE.
-
-Package: wine-utils
-Architecture: i386 hurd-i386 kfreebsd-i386 netbsd-i386 amd64 kfreebsd-amd64 powerpc hurd-powerpc kfreebsd-powerpc netbsd-powerpc sparc hurd-sparc kfreebsd-sparc netbsd-sparc
-Depends: ${shlibs:Depends}, wine-bin (= ${binary:Version})
-Replaces: libwine-dev (<< 0.0.20010216)
-Description: Windows API implementation - utilities
- Wine is a free MS-Windows API implementation.
- This is still a work in progress and many applications may still not work.
- .
- This package provides many of the Wine utilities, both 
- for compiling source using winelib and for running Wine. This
- package is not strictly necessary.
-
diff --git a/debian/libwine-bin.install-common b/debian/libwine-bin.install-common
index ba711bf..d53af40 100644
--- a/debian/libwine-bin.install-common
+++ b/debian/libwine-bin.install-common
@@ -1,14 +1,20 @@
 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
@@ -18,6 +24,7 @@ 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
@@ -25,9 +32,14 @@ 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-dev.install-common b/debian/libwine-dev.install-common
index ae91f75..1d9472f 100644
--- a/debian/libwine-dev.install-common
+++ b/debian/libwine-dev.install-common
@@ -4,15 +4,20 @@ debian/tmp/usr/lib/wine/*.def
 debian/tmp/usr/bin/widl
 debian/tmp/usr/bin/winebuild
 debian/tmp/usr/bin/winecpp
+debian/tmp/usr/bin/winedump
 debian/tmp/usr/bin/winegcc
 debian/tmp/usr/bin/wineg++
+debian/tmp/usr/bin/winemaker
 debian/tmp/usr/bin/wmc
 debian/tmp/usr/bin/wrc
 debian/tmp/usr/include
 debian/tmp/usr/share/man/man1/widl.1
 debian/tmp/usr/share/man/man1/winebuild.1
+debian/tmp/usr/share/man/man1/winedump.1
 debian/tmp/usr/share/man/man1/winegcc.1
 debian/tmp/usr/share/man/man1/wineg++.1
+debian/tmp/usr/share/man/man1/winemaker.1
 debian/tmp/usr/share/man/man1/wmc.1
 debian/tmp/usr/share/man/man1/wrc.1
 debian/tmp/usr/share/man/man3
+debian/tmp/usr/share/doc/wine/README.winedump usr/share/doc/libwine-dev
diff --git a/debian/wine-bin.install-common b/debian/wine-bin.install-common
index 5bb285e..68a4b5a 100644
--- a/debian/wine-bin.install-common
+++ b/debian/wine-bin.install-common
@@ -1,14 +1,21 @@
+debian/tmp/usr/bin/fnt2bdf
 debian/tmp/usr/bin/msiexec
+debian/tmp/usr/bin/notepad
 debian/tmp/usr/bin/regedit
 debian/tmp/usr/bin/regsvr32
 debian/tmp/usr/bin/wine
+debian/tmp/usr/bin/wine-font-convert
 debian/tmp/usr/bin/wineboot
 debian/tmp/usr/bin/winecfg
+debian/tmp/usr/bin/winedbg
 debian/tmp/usr/bin/wineconsole
+debian/tmp/usr/bin/winefile
+debian/tmp/usr/bin/winemine 
 debian/tmp/usr/bin/winepath
 debian/tmp/usr/bin/wineprefixcreate
 debian/tmp/usr/share/binfmts
 debian/tmp/usr/share/man/man1/wine.1
+debian/tmp/usr/share/man/man1/winedbg.1
 debian/tmp/usr/share/man/man1/wineprefixcreate.1
 debian/tmp/usr/share/man/*/man1/wine.1
 debian/tmp/usr/share/mime-info
diff --git a/debian/wine-bin.manpages-common b/debian/wine-bin.manpages-common
index 25ff057..d9db5df 100644
--- a/debian/wine-bin.manpages-common
+++ b/debian/wine-bin.manpages-common
@@ -1,6 +1,11 @@
+debian/fnt2bdf.man
+debian/notepad.man
 debian/regedit.man
 debian/regsvr32.man
 debian/wine-auto.man
+debian/wine-font-convert.man
 debian/wineboot.man
 debian/winecfg.man
+debian/winefile.man
+debian/winemine.man
 debian/winepath.man
diff --git a/debian/wine-utils.install-common b/debian/wine-utils.install-common
deleted file mode 100644
index 8ab3aa9..0000000
--- a/debian/wine-utils.install-common
+++ /dev/null
@@ -1,24 +0,0 @@
-debian/tmp/usr/bin/fnt2bdf
-debian/tmp/usr/bin/notepad
-debian/tmp/usr/bin/winedbg
-debian/tmp/usr/bin/winedump
-debian/tmp/usr/bin/winefile
-debian/tmp/usr/bin/winemaker
-debian/tmp/usr/bin/winemine
-debian/tmp/usr/bin/wine-font-convert
-debian/tmp/usr/lib/wine/clock.exe.so
-debian/tmp/usr/lib/wine/control.exe.so
-debian/tmp/usr/lib/wine/icinfo.exe.so
-debian/tmp/usr/lib/wine/notepad.exe.so
-debian/tmp/usr/lib/wine/oleview.exe.so
-debian/tmp/usr/lib/wine/progman.exe.so
-debian/tmp/usr/lib/wine/taskmgr.exe.so
-debian/tmp/usr/lib/wine/winedbg.exe.so
-debian/tmp/usr/lib/wine/winefile.exe.so
-debian/tmp/usr/lib/wine/winemine.exe.so
-debian/tmp/usr/lib/wine/winver.exe.so
-debian/tmp/usr/lib/wine/wordpad.exe.so
-debian/tmp/usr/share/man/man1/winedbg.1
-debian/tmp/usr/share/man/man1/winedump.1
-debian/tmp/usr/share/man/man1/winemaker.1
-debian/tmp/usr/share/doc/wine/README.winedump usr/share/doc/wine-utils
diff --git a/debian/wine-utils.manpages-common b/debian/wine-utils.manpages-common
deleted file mode 100644
index 15919e1..0000000
--- a/debian/wine-utils.manpages-common
+++ /dev/null
@@ -1,5 +0,0 @@
-debian/fnt2bdf.man
-debian/notepad.man
-debian/winefile.man
-debian/winemine.man
-debian/wine-font-convert.man

-- 
Debian Wine packaging

More information about the pkg-wine-party mailing list