[pkg-wine-party] [SCM] Debian Wine packaging branch, master, updated. wine-1.1.32-1-655-gb15233c

[Ove Kaaven]

The following commit has been merged in the master branch:
commit 67f2579d8fe925fb2a61adc862b1cca9763165f0
Author: Ove Kaaven <ovek at arcticnet.no>
Date:   Sat Nov 14 21:21:33 2009 +0100

    Add proper package suffixes to the installed reportbug control files.

diff --git a/debian/bug/wine-bin/control b/debian/bug/wine-bin/control
deleted file mode 100644
index 541b246..0000000
--- a/debian/bug/wine-bin/control
+++ /dev/null
@@ -1 +0,0 @@
-Report-With: libwine
diff --git a/debian/bug/wine/control b/debian/bug/wine/control
deleted file mode 100644
index 541b246..0000000
--- a/debian/bug/wine/control
+++ /dev/null
@@ -1 +0,0 @@
-Report-With: libwine
diff --git a/debian/clean-install.sh b/debian/clean-install.sh
index 7cf7a2c..1661f29 100644
--- a/debian/clean-install.sh
+++ b/debian/clean-install.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 SUFFIX="$1"
 
-for ext in install links mime config preinst postinst prerm postrm docs manpages lintian-overrides; do
+for ext in install links mime config preinst postinst prerm postrm docs manpages lintian-overrides bugcontrol; do
   for inst in debian/*.${ext}-common; do
     package="$(basename "$inst" .${ext}-common)"
     rm -f debian/$package$SUFFIX.${ext}
diff --git a/debian/prep-install.sh b/debian/prep-install.sh
index 6326a7d..4ad3930 100644
--- a/debian/prep-install.sh
+++ b/debian/prep-install.sh
@@ -62,7 +62,7 @@ function expand_modules
   done
 }
 
-for ext in install links mime config preinst postinst prerm postrm docs manpages lintian-overrides; do
+for ext in install links mime config preinst postinst prerm postrm docs manpages lintian-overrides bugcontrol; do
   for inst in debian/*.${ext}-common; do
     if [ -f "$inst" ]; then
       package="$(basename "$inst" .${ext}-common)"
diff --git a/debian/rules b/debian/rules
index 05f9acd..26af0a1 100755
--- a/debian/rules
+++ b/debian/rules
@@ -381,6 +381,12 @@ binary-arch: install-arch-stamp
 	 install -D -m 644 "$$fn" "debian/$$sfn/usr/share/lintian/overrides/$$sfn"; \
 	done
 
+	# install reportbug control files
+	for fn in debian/*.bugcontrol; do \
+	 sfn="`basename "$$fn" .bugcontrol`"; \
+	 install -D -m 644 "$$fn" "debian/$$sfn/usr/share/bug/$$sfn/control"; \
+	done
+
 	dh_desktop -s
 
 	dh_compress -s
diff --git a/debian/wine-bin.bugcontrol-common b/debian/wine-bin.bugcontrol-common
new file mode 100644
index 0000000..2803dc1
--- /dev/null
+++ b/debian/wine-bin.bugcontrol-common
@@ -0,0 +1 @@
+Report-With: libwine at SUFFIX@
diff --git a/debian/wine-bin.install-common b/debian/wine-bin.install-common
index f16f500..e0bf2c3 100644
--- a/debian/wine-bin.install-common
+++ b/debian/wine-bin.install-common
@@ -24,4 +24,3 @@ debian/tmp/usr/share/wine/wine.inf
 debian/uninstaller.desktop usr/share/applications
 debian/winecfg.desktop usr/share/applications
 programs/winemenubuilder/wine*.xpm usr/share/pixmaps
-debian/bug/wine-bin usr/share/bug
diff --git a/debian/wine.bugcontrol-common b/debian/wine.bugcontrol-common
new file mode 100644
index 0000000..2803dc1
--- /dev/null
+++ b/debian/wine.bugcontrol-common
@@ -0,0 +1 @@
+Report-With: libwine at SUFFIX@
diff --git a/debian/wine.install-common b/debian/wine.install-common
deleted file mode 100644
index d90ddca..0000000
--- a/debian/wine.install-common
+++ /dev/null
@@ -1 +0,0 @@
-debian/bug/wine usr/share/bug

-- 
Debian Wine packaging