[pkg-wine-party] [SCM] Debian Wine packaging branch, master, updated. wine-1.1.18-1-329-ge643d1d

[Ove Kaaven]

The following commit has been merged in the master branch:
commit 66dd3dbffe2eee938b897a12289e9fdb53ac2ed3
Author: Ove Kaaven <ovek at arcticnet.no>
Date:   Thu May 21 14:56:55 2009 +0200

    Removed *.dirs files, rely on dh_install (and split.sh) to create directories as needed.

diff --git a/debian/libwine-alsa.dirs b/debian/libwine-alsa.dirs
deleted file mode 100644
index 121f09a..0000000
--- a/debian/libwine-alsa.dirs
+++ /dev/null
@@ -1,5 +0,0 @@
-usr/lib
-usr/lib/wine
-usr/share
-usr/share/doc
-usr/share/doc/libwine-alsa
diff --git a/debian/libwine-arts.dirs b/debian/libwine-arts.dirs
deleted file mode 100644
index 59dbc09..0000000
--- a/debian/libwine-arts.dirs
+++ /dev/null
@@ -1,5 +0,0 @@
-usr/lib
-usr/lib/wine
-usr/share
-usr/share/doc
-usr/share/doc/libwine-arts
diff --git a/debian/libwine-capi.dirs b/debian/libwine-capi.dirs
deleted file mode 100644
index bf849d5..0000000
--- a/debian/libwine-capi.dirs
+++ /dev/null
@@ -1,5 +0,0 @@
-usr/lib
-usr/lib/wine
-usr/share
-usr/share/doc
-usr/share/doc/libwine-capi
diff --git a/debian/libwine-cms.dirs b/debian/libwine-cms.dirs
deleted file mode 100644
index a9de66e..0000000
--- a/debian/libwine-cms.dirs
+++ /dev/null
@@ -1,5 +0,0 @@
-usr/lib
-usr/lib/wine
-usr/share
-usr/share/doc
-usr/share/doc/libwine-cms
diff --git a/debian/libwine-dev.dirs b/debian/libwine-dev.dirs
deleted file mode 100644
index 6702777..0000000
--- a/debian/libwine-dev.dirs
+++ /dev/null
@@ -1,6 +0,0 @@
-usr/lib
-usr/include
-usr/include/wine
-usr/share
-usr/share/doc
-usr/share/doc/libwine-dev
diff --git a/debian/libwine-esd.dirs b/debian/libwine-esd.dirs
deleted file mode 100644
index 7cf9b37..0000000
--- a/debian/libwine-esd.dirs
+++ /dev/null
@@ -1,5 +0,0 @@
-usr/lib
-usr/lib/wine
-usr/share
-usr/share/doc
-usr/share/doc/libwine-esd
diff --git a/debian/libwine-gl.dirs b/debian/libwine-gl.dirs
deleted file mode 100644
index 41c4a13..0000000
--- a/debian/libwine-gl.dirs
+++ /dev/null
@@ -1,5 +0,0 @@
-usr/lib
-usr/lib/wine
-usr/share
-usr/share/doc
-usr/share/doc/libwine-gl
diff --git a/debian/libwine-gphoto2.dirs b/debian/libwine-gphoto2.dirs
deleted file mode 100644
index a713e04..0000000
--- a/debian/libwine-gphoto2.dirs
+++ /dev/null
@@ -1,5 +0,0 @@
-usr/lib
-usr/lib/wine
-usr/share
-usr/share/doc
-usr/share/doc/libwine-gphoto2
diff --git a/debian/libwine-jack.dirs b/debian/libwine-jack.dirs
deleted file mode 100644
index d31965d..0000000
--- a/debian/libwine-jack.dirs
+++ /dev/null
@@ -1,5 +0,0 @@
-usr/lib
-usr/lib/wine
-usr/share
-usr/share/doc
-usr/share/doc/libwine-jack
diff --git a/debian/libwine-ldap.dirs b/debian/libwine-ldap.dirs
deleted file mode 100644
index 9d23f4c..0000000
--- a/debian/libwine-ldap.dirs
+++ /dev/null
@@ -1,5 +0,0 @@
-usr/lib
-usr/lib/wine
-usr/share
-usr/share/doc
-usr/share/doc/libwine-ldap
diff --git a/debian/libwine-nas.dirs b/debian/libwine-nas.dirs
deleted file mode 100644
index e88ed93..0000000
--- a/debian/libwine-nas.dirs
+++ /dev/null
@@ -1,5 +0,0 @@
-usr/lib
-usr/lib/wine
-usr/share
-usr/share/doc
-usr/share/doc/libwine-nas
diff --git a/debian/libwine-oss.dirs b/debian/libwine-oss.dirs
deleted file mode 100644
index 7a68c9b..0000000
--- a/debian/libwine-oss.dirs
+++ /dev/null
@@ -1,5 +0,0 @@
-usr/lib
-usr/lib/wine
-usr/share
-usr/share/doc
-usr/share/doc/libwine-oss
diff --git a/debian/libwine-print.dirs b/debian/libwine-print.dirs
deleted file mode 100644
index cee9ab0..0000000
--- a/debian/libwine-print.dirs
+++ /dev/null
@@ -1,5 +0,0 @@
-usr/lib
-usr/lib/wine
-usr/share
-usr/share/doc
-usr/share/doc/libwine-print
diff --git a/debian/libwine-sane.dirs b/debian/libwine-sane.dirs
deleted file mode 100644
index b4b124f..0000000
--- a/debian/libwine-sane.dirs
+++ /dev/null
@@ -1,5 +0,0 @@
-usr/lib
-usr/lib/wine
-usr/share
-usr/share/doc
-usr/share/doc/libwine-sane
diff --git a/debian/libwine-twain.dirs b/debian/libwine-twain.dirs
deleted file mode 100644
index d8bb9f4..0000000
--- a/debian/libwine-twain.dirs
+++ /dev/null
@@ -1,3 +0,0 @@
-usr/share
-usr/share/doc
-usr/share/doc/libwine-twain
diff --git a/debian/libwine.dirs b/debian/libwine.dirs
deleted file mode 100644
index 857adbe..0000000
--- a/debian/libwine.dirs
+++ /dev/null
@@ -1,7 +0,0 @@
-usr/lib
-usr/lib/wine
-usr/share
-usr/share/doc
-usr/share/doc/libwine
-usr/share/wine
-usr/share/lintian/overrides
diff --git a/debian/rules b/debian/rules
index e050b4c..6292f9a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -305,7 +305,7 @@ binary-arch: install-arch-stamp
 	rm -rf debian/libwine-dbg/usr/lib/debug/usr/bin
 
 	# debhelper 6 has dh_lintian, but I don't want to depend on it yet...
-	install -m 644 debian/libwine.lintian-overrides debian/libwine/usr/share/lintian/overrides/libwine
+	install -D -m 644 debian/libwine.lintian-overrides debian/libwine/usr/share/lintian/overrides/libwine
 
 	dh_desktop -s
 
diff --git a/debian/split.sh b/debian/split.sh
index 74f359b..2891d1f 100644
--- a/debian/split.sh
+++ b/debian/split.sh
@@ -3,7 +3,10 @@ SRC="$1"
 PREFIX="$2"
 while read DEST NAME; do
   for bin in debian/$SRC/$PREFIX/$NAME; do
-    [ ! -f $bin ] || mv $bin debian/$DEST/$PREFIX
+    if [ -f $bin ]; then
+      install -d debian/$DEST/$PREFIX
+      mv $bin debian/$DEST/$PREFIX
+    fi
   done
 done < debian/$SRC.split
 # return success
diff --git a/debian/wine-bin.dirs b/debian/wine-bin.dirs
deleted file mode 100644
index ab465d9..0000000
--- a/debian/wine-bin.dirs
+++ /dev/null
@@ -1,11 +0,0 @@
-usr/bin
-usr/share
-usr/share/doc
-usr/share/doc/wine-bin
-usr/share/man
-usr/share/man/man1
-usr/share/applications
-usr/share/mime-info
-usr/share/binfmts
-usr/share/pixmaps
-usr/share/wine
diff --git a/debian/wine-utils.dirs b/debian/wine-utils.dirs
deleted file mode 100644
index 8c86273..0000000
--- a/debian/wine-utils.dirs
+++ /dev/null
@@ -1,3 +0,0 @@
-usr/share
-usr/share/doc
-usr/share/doc/wine-utils

-- 
Debian Wine packaging