Bug#761574: wine: Please merge the Debian packaging

Sun, 14 Sep 2014 10:03:53 -0700 

Source: wine
Version: 1.6.2-8
Severity: wishlist
Tags: patch

Hi,

please merge the Debian packaging of wine and wine-development. Both
versions could profit if any change, feedback and bugreport for one
version would influence the other one, too.

I saw this clearly while working on the alternatives system which
naturally brings both versions closer together.

See also our discussion in the alternatives bugreport (#758291).

I think there is enough time to fix any regressions before the freeze,
since the wine-development packaging already had some testing.


The attached patch allows to use current wine-development packaging for
wine stable by just changing the changelog and running debian/rules once.

Of course this still allows to do different things in both versions if
necessary.

If you look at it you'll see that the changes are quite minimal:

- debian/rules: handling of both versions
- patches: naturally they have to be adapted. This is the biggest part
  of the patch,
- changelog: modified version for stable
- control.in (especially stable only transitional breaks/replaces and
  transitional packages)


You'll find everything in my git repository at
https://github.com/jre-wine/wine in the branches
"master1.7.26-2_merged-packaging" and
"debian/wine-1.6.2-8_merged-packaging".


Greets
jre

diff --git a/debian/changelog b/debian/changelog
index 20ca599..736704a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,158 @@
-wine-development (1.7.26-3) UNRELEASED; urgency=medium
-
+wine-development (1.7.26-3jre0) UNRELEASED; urgency=medium
+
+  * control.in:
+    - Fix lintian P:pre-depends-directly-on-multiarch-support.
+      Drop dependency on wine-doc.
+      (closes: #761461).
+  * Add merged Debian packaging.
+    - Based on wine-development 1.7.26-2 + 1.7.26-3-DEBSUFFIX-proposal.
+    - The single steps I took can be seen in the branch masterUnifiedPackaging.
+    - This allows one to use exactly the same debian/ folder for
+      wine-development and wine (wine stable branch), only the first
+      d/changelog entry has to be adjusted and debian/rules be run once.
+    - For a clean solution two different changelogs might be maintained (see
+      below for stable changelog entries).
+    - Care has to be taken to close bugs in the correct version.
+    - VERSION ("-development" or empty) and DEBSUFFIX ("-development" or
+      "-stable") are used to distinguish between stable and development wine.
+    - Necessary differences between the two versions are tagged either #stable#
+      or #development# within the files. d/rules will then enable the correct
+      lines.
+    - Use as much as possible of current wine-development packaging, including
+      removal of old parts from the wine (stable) packaging. Beneath other
+      changes this means for wine stable:
+      - Rename wine32|64-dev-tools to wine32|64-tools, added transitional
+        packages.
+      - Add preloader packages.
+      - Replace architecture any-amd64 with amd64.
+      - Drop build-dependencies:
+        - autotools-dev
+        - kfreebsd-kernel-headers [kfreebsd-any]
+        - file
+      - Add build-dependencies:
+        - gettext
+        - libgettextpo-dev
+        - libtiff-dev
+        - libpcap-dev
+        - freebsd-glue [kfreebsd-any]
+        - ocl-icd-opencl-dev
+    - Patches:
+      - Build d/patches/series from series.in (as requisite of d/control).
+      - Use different patches if necessary.
+    - d/watch:
+      - Build from watch.in (as requisite of d/control).
+      - Watch for odd versions only in wine development.
+    - debian/rules: Add d/changelog and d/rules as requisites of d/control.
+
+    - TODO:
+      - gitignore: Add d/patches/series and d/watch.
+      - I haven't tested the import script. Of course it might be modified for
+        a new workflow.
+
+
+  The following entries are only for stable wine:
+  ===============================================
+  * Make transitional packages deborphan compliant (closes: #760696).
+
+  * Modified changelog since last merge (for use in wine stable):
+
+  wine-development (1.7.26-3jre0)
   * Add alternatives system for wine, the wineapploader links and the manpages.
   * Introduce DEBSUFFIX (either -development or -stable) in d/rules.
 
- -- jre <jre.wine...@gmail.com>  Thu, 11 Sep 2014 02:15:20 +0200
+  wine-development (1.7.26-2)
+  * Install manpages, thanks jre.
+  * Build debug package on amd64.
+  * Call wine-development from desktop launchers.
+
+  wine-development (1.7.26-1)
+  * Call wine-development instead of wine from the winegcc shell script.
+
+  wine-development (1.7.25-1)
+  * Update the git repository.
+  * Fix typo in README.debian.
+  * Simplify wineapploader.
+
+  wine-development (1.7.24-5)
+  * Fix wine-preloader installation path.
+
+  wine-development (1.7.24-4)
+  * Add some information about WINEDEBUG to README.debian.
+  * Correctly call suffixed wine launcher in wineapploader.
+
+  wine-development (1.7.24-3)
+  * Clarify multiarch instructions.
+  * Append version suffix to wineapploader scripts.
+  * Add ncurses and freetype dependencies to wine32.
+  * Use -development instead of -unstable in wineapploader.
+
+  wine-development (1.7.24-2)
+  * Remove wine-gecko recommendation.
+
+  wine-development (1.7.23-1)
+  * Link against freebsd-glue on kfreebsd.
+
+  wine-development (1.7.22-1)
+  * Update debian/copyright to format 1.0.
+  * Add upstream signing key for uscan download verification.
+  * Disable gstreamer since 1.0 support is not yet available.
+  * Rename source package to better match the upstream naming scheme.
+  * Remove some of the automatically generated files from the upstream tarball.
+
+  wine-unstable (1.7.16-2)
+  * Use WINEDEBUG=-all by default.
+  * Recommmend libasound2-plugins.
+  * Remove winbind and antivirus suggestions.
+  * Fix addon search paths.
+  * Fix symlinks to wine-wrapper.
+
+  wine-unstable (1.7.16-1)
+  * Use /usr/share/wine-gecko as the default search path for wine-gecko files.
+  * Use wine-unstable instead of wine in wine-wrapper.
+  * Change wine-gecko dependency to a recommendation.
+  * Remove transitional packages.
+  * Disable external downloading.
+
+  wine-unstable (1.7.15-1)
+  * Move /usr/bin/wine to /usr/bin/wine-unstable.
+  * Fix paths to binaries in helper script.
+
+  wine-unstable (1.7.14-4)
+  * Build against gstreamer 1.0.
+  * Install binaries to /usr/lib/wine-unstable.
+  * Check for system.reg in wine-wrapper.
+
+  wine-unstable (1.7.14-3)
+  * wine32-unstable also needs to conflict with wine32.
+  * Ensure all replaced packages are marked with "Breaks" relationships
+    too (thanks to Andreas Beckmann for pointing out that this is
+    required, see #739386).
+
+  wine-unstable (1.7.14-2)
+  * Install header files in /usr/include/wine-unstable.
+  * Until we implement full side-by-side installation with the stable wine
+    packages, have wine-unstable conflict with wine and wine64-unstable
+    with wine64.
+  * Install README.winedump as a file in the appropriate, suffixed doc
+    directory.
+  * Build-depend on gettext and libgettextpo-dev to enable PO rebuild
+    support in the development tools.
+  * Build-depend on libosmesa6-dev to enable offscreen OpenGL rendering.
+  * Build-depend on libgstreamer-plugins-base0.10-dev to enable
+    gstreamer support.
+
+  wine-unstable (1.7.14-1)
+  * Replace libgphoto2-2-dev build dependency with libgphoto2-dev
+
+  wine-unstable (1.7.12-1)
+  * Support freetype >= 2.5.1.
+
+  wine-unstable (1.7.0-1)
+  * Switch to the wine-unstable branch.
+  * Track the unstable branch in debian/watch.
+  * Incorporate changes from the stable branch.
+
+ -- jre <jre.wine...@gmail.com>  Sun, 14 Sep 2014 03:50:53 +0200
 
 wine-development (1.7.26-2) unstable; urgency=medium
 
diff --git a/debian/control.in b/debian/control.in
index 405ac02..9c8c6fc 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -56,6 +56,10 @@ Build-Depends:
  freebsd-glue [kfreebsd-any],
  prelink [linux-any],
  ocl-icd-opencl-dev,
+#stable# libcapi20-dev (>= 1:3.3.0.20041024-2) [linux-any],
+#stable# libgphoto2-dev,
+#stable# libgstreamer-plugins-base0.10-dev,
+#stable# libsane-dev,
 Standards-Version: 3.9.5
 Homepage: http://www.winehq.org/
 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-wine/wine.git
@@ -70,7 +74,24 @@ Suggests:
  binfmt-support,
  ttf-mscorefonts-installer,
 Breaks:
- wine (<< 1.6.2-9),
+#development# wine (<< 1.6.2-9),
+#stable# wine32 (<< 1.6.1-8),
+#stable# wine64 (<< 1.6.1-8),
+#stable# wine-bin (<< 1.6.1-1),
+#stable# wine64-bin (<< 1.6.1-1),
+#stable# libwine (<< 1.6.1-1),
+#stable# libwine-bin (<< 1.6.1-1),
+#stable# libwine-dev (<< 1.6.1-1),
+#stable# wine-utils (<< 1.1.25-1),
+#stable#Replaces:
+#stable# wine32 (<< 1.6.1-8),
+#stable# wine64 (<< 1.6.1-8),
+#stable# wine-bin (<< 1.6.1-1),
+#stable# wine64-bin (<< 1.6.1-1),
+#stable# libwine (<< 1.6.1-1),
+#stable# libwine-bin (<< 1.6.1-1),
+#stable# libwine-dev (<< 1.6.1-1),
+#stable# wine-utils (<< 1.1.25-1),
 Description: Windows API implementation - standard suite
  Wine is a free MS-Windows API implementation.
  This is still a work in progress and many applications may still not work.
@@ -86,10 +107,19 @@ Depends:
  x11-utils,
  libncurses5,
  libfreetype6,
+#stable# libwine-gecko-2.21
 Recommends:
  libasound2-plugins,
 Suggests:
  wine32VERSION-preloader,
+#stable#Breaks:
+#stable# wine (<< 1.6.1-9),
+#stable# wine-bin (<< 1.5.31-1),
+#stable# libwine-bin (<< 1.5.31-1),
+#stable#Replaces:
+#stable# wine (<< 1.6.1-9),
+#stable# wine-bin (<< 1.5.31-1),
+#stable# libwine-bin (<< 1.5.31-1),
 Description: Windows API implementation - 32-bit binary loader
  Wine is a free MS-Windows API implementation.
  This is still a work in progress and many applications may still not work.
@@ -102,6 +132,11 @@ Depends:
  ${misc:Depends},
  ${shlibs:Depends},
  x11-utils,
+#stable# libwine-gecko-2.21
+#stable#Breaks:
+#stable# wine (<< 1.6.1-9),
+#stable#Replaces:
+#stable# wine (<< 1.6.1-9),
 Recommends:
  libasound2-plugins,
  wine32VERSION (>= ${source:Version}),
@@ -150,6 +185,12 @@ Description: Windows API implementation - 32-bit developer tools
  This is still a work in progress and many applications may still not work.
  .
  This package provides wine's 32-bit developer tools.
+#stable#Breaks:
+#stable# libwine-dev (<< 1.5.31-1),
+#stable# wine32-dev-tools (<< 1.6.2-9),
+#stable#Replaces:
+#stable# libwine-dev (<< 1.5.31-1),
+#stable# wine32-dev-tools (<< 1.6.2-9),
 
 Package: wine64VERSION-tools
 Architecture: amd64
@@ -163,6 +204,12 @@ Description: Windows API implementation - 64-bit developer tools
  This is still a work in progress and many applications may still not work.
  .
  This package provides wine's 64-bit developer tools.
+#stable#Breaks:
+#stable# libwine-dev (<< 1.5.31-1),
+#stable# wine64-dev-tools (<< 1.6.2-9),
+#stable#Replaces:
+#stable# libwine-dev (<< 1.5.31-1),
+#stable# wine64-dev-tools (<< 1.6.2-9),
 
 Package: libwineVERSION-dev
 Architecture: amd64 any-i386 any-powerpc
@@ -216,8 +263,239 @@ Suggests:
  wine-doc,
 Pre-Depends:
  ${misc:Pre-Depends},
+#stable#Breaks:
+#stable# libwine-alsa    (<< 1.5.7-3),
+#stable# libwine-bin     (<< 1.5.7-3),
+#stable# libwine-capi    (<< 1.5.7-3),
+#stable# libwine-cms     (<< 1.5.7-3),
+#stable# libwine-gl      (<< 1.5.7-3),
+#stable# libwine-gphoto2 (<< 1.5.7-3),
+#stable# libwine-ldap    (<< 1.5.7-3),
+#stable# libwine-openal  (<< 1.5.7-3),
+#stable# libwine-oss     (<< 1.5.7-3),
+#stable# libwine-sane    (<< 1.5.7-3),
+#stable# wine-bin        (<< 1.5.31-1),
+#stable#Replaces:
+#stable# libwine-alsa    (<< 1.5.7-3),
+#stable# libwine-bin     (<< 1.5.7-3),
+#stable# libwine-capi    (<< 1.5.7-3),
+#stable# libwine-cms     (<< 1.5.7-3),
+#stable# libwine-gl      (<< 1.5.7-3),
+#stable# libwine-gphoto2 (<< 1.5.7-3),
+#stable# libwine-ldap    (<< 1.5.7-3),
+#stable# libwine-openal  (<< 1.5.7-3),
+#stable# libwine-oss     (<< 1.5.7-3),
+#stable# libwine-sane    (<< 1.5.7-3),
+#stable# wine-bin        (<< 1.5.31-1),
 Description: Windows API implementation - library
  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 the wine library.
+
+#stable#Package: wine-bin
+#stable#Section: oldlibs
+#stable#Priority: extra
+#stable#Architecture: any-i386 any-powerpc
+#stable#Pre-Depends: dpkg (>= 1.17.5)
+#stable#Depends:
+#stable# ${misc:Depends},
+#stable# wine32 (>= ${binary:Version}),
+#stable#Description: Windows API implementation - transitional package
+#stable# Wine is a free MS-Windows API implementation.
+#stable# This is still a work in progress and many applications may still not work.
+#stable# .
+#stable# This is a transitional package and can be safely removed.
+#stable#
+#stable#Package: wine64-bin
+#stable#Section: oldlibs
+#stable#Priority: extra
+#stable#Architecture: any-amd64
+#stable#Depends:
+#stable# ${misc:Depends},
+#stable# wine64 (>= ${binary:Version}),
+#stable#Description: Windows API implementation - transitional package
+#stable# Wine is a free MS-Windows API implementation.
+#stable# This is still a work in progress and many applications may still not work.
+#stable# .
+#stable# This is a transitional package and can be safely removed.
+#stable#
+#stable#Package: libwine-alsa
+#stable#Section: oldlibs
+#stable#Priority: extra
+#stable#Architecture: any-i386 any-powerpc
+#stable#Depends:
+#stable# ${misc:Depends},
+#stable# libwine (>= ${binary:Version})
+#stable#Description: Windows API implementation - transitional package
+#stable# Wine is a free MS-Windows API implementation.
+#stable# This is still a work in progress and many applications may still not work.
+#stable# .
+#stable# This is a transitional package and can be safely removed.
+#stable#
+#stable#Package: libwine-bin
+#stable#Architecture: any-i386 any-powerpc
+#stable#Section: oldlibs
+#stable#Priority: extra
+#stable#Pre-Depends: dpkg (>= 1.17.5)
+#stable#Depends:
+#stable# ${misc:Depends},
+#stable# libwine (>= ${binary:Version})
+#stable#Description: Windows API implementation - transitional package
+#stable# Wine is a free MS-Windows API implementation.
+#stable# This is still a work in progress and many applications may still not work.
+#stable# .
+#stable# This is a transitional package and can be safely removed.
+#stable#
+#stable#Package: libwine-capi
+#stable#Section: oldlibs
+#stable#Priority: extra
+#stable#Architecture: i386 powerpc
+#stable#Multi-Arch: same
+#stable#Depends:
+#stable# ${misc:Depends},
+#stable# libwine (>= ${binary:Version})
+#stable#Description: Windows API implementation - transitional package
+#stable# Wine is a free MS-Windows API implementation.
+#stable# This is still a work in progress and many applications may still not work.
+#stable# .
+#stable# This is a transitional package and can be safely removed.
+#stable#
+#stable#Package: libwine-cms
+#stable#Section: oldlibs
+#stable#Priority: extra
+#stable#Architecture: any-i386 any-powerpc
+#stable#Multi-Arch: same
+#stable#Depends:
+#stable# ${misc:Depends},
+#stable# libwine (>= ${binary:Version})
+#stable#Description: Windows API implementation - transitional package
+#stable# Wine is a free MS-Windows API implementation.
+#stable# This is still a work in progress and many applications may still not work.
+#stable# .
+#stable# This is a transitional package and can be safely removed.
+#stable#
+#stable#Package: libwine-gl
+#stable#Section: oldlibs
+#stable#Priority: extra
+#stable#Architecture: any-i386 any-powerpc
+#stable#Multi-Arch: same
+#stable#Depends:
+#stable# ${misc:Depends},
+#stable# libwine (>= ${binary:Version})
+#stable#Description: Windows API implementation - transitional package
+#stable# Wine is a free MS-Windows API implementation.
+#stable# This is still a work in progress and many applications may still not work.
+#stable# .
+#stable# This is a transitional package and can be safely removed.
+#stable#
+#stable#Package: libwine-gphoto2
+#stable#Section: oldlibs
+#stable#Priority: extra
+#stable#Architecture: any-i386 any-powerpc
+#stable#Depends:
+#stable# ${misc:Depends},
+#stable# libwine (>= ${binary:Version})
+#stable#Description: Windows API implementation - transitional package
+#stable# Wine is a free MS-Windows API implementation.
+#stable# This is still a work in progress and many applications may still not work.
+#stable# .
+#stable# This is a transitional package and can be safely removed.
+#stable#
+#stable#Package: libwine-ldap
+#stable#Section: oldlibs
+#stable#Priority: extra
+#stable#Architecture: any-i386 any-powerpc
+#stable#Multi-Arch: same
+#stable#Depends:
+#stable# ${misc:Depends},
+#stable# libwine (>= ${binary:Version})
+#stable#Description: Windows API implementation - transitional package
+#stable# Wine is a free MS-Windows API implementation.
+#stable# This is still a work in progress and many applications may still not work.
+#stable# .
+#stable# This is a transitional package and can be safely removed.
+#stable#
+#stable#Package: libwine-openal
+#stable#Section: oldlibs
+#stable#Priority: extra
+#stable#Architecture: any-i386 any-powerpc
+#stable#Multi-Arch: same
+#stable#Depends:
+#stable# ${misc:Depends},
+#stable# libwine (>= ${binary:Version})
+#stable#Description: Windows API implementation - transitional package
+#stable# Wine is a free MS-Windows API implementation.
+#stable# This is still a work in progress and many applications may still not work.
+#stable# .
+#stable# This is a transitional package and can be safely removed.
+#stable#
+#stable#Package: libwine-oss
+#stable#Section: oldlibs
+#stable#Priority: extra
+#stable#Architecture: any-i386 any-powerpc
+#stable#Multi-Arch: same
+#stable#Depends:
+#stable# ${misc:Depends},
+#stable# libwine (>= ${binary:Version})
+#stable#Description: Windows API implementation - transitional package
+#stable# Wine is a free MS-Windows API implementation.
+#stable# This is still a work in progress and many applications may still not work.
+#stable# .
+#stable# This is a transitional package and can be safely removed.
+#stable#
+#stable#Package: libwine-print
+#stable#Section: oldlibs
+#stable#Priority: extra
+#stable#Architecture: any-i386 any-powerpc
+#stable#Multi-Arch: same
+#stable#Depends:
+#stable# ${misc:Depends},
+#stable# libwine (>= ${binary:Version})
+#stable#Description: Windows API implementation - transitional package
+#stable# Wine is a free MS-Windows API implementation.
+#stable# This is still a work in progress and many applications may still not work.
+#stable# .
+#stable# This is a transitional package and can be safely removed.
+#stable#
+#stable#Package: libwine-sane
+#stable#Section: oldlibs
+#stable#Priority: extra
+#stable#Architecture: any-i386 any-powerpc
+#stable#Multi-Arch: same
+#stable#Depends:
+#stable# ${misc:Depends},
+#stable# libwine (>= ${binary:Version})
+#stable#Description: Windows API implementation - transitional package
+#stable# Wine is a free MS-Windows API implementation.
+#stable# This is still a work in progress and many applications may still not work.
+#stable# .
+#stable# This is a transitional package and can be safely removed.
+#stable#
+#stable#Package: wine32-dev-tools
+#stable#Architecture: any-i386 any-powerpc
+#stable#Section: oldlibs
+#stable#Priority: extra
+#stable#Multi-Arch: same
+#stable#Depends:
+#stable# ${misc:Depends},
+#stable# wine32-tools (>= ${binary:Version})
+#stable#Description: Windows API implementation - transitional package
+#stable# Wine is a free MS-Windows API implementation.
+#stable# This is still a work in progress and many applications may still not work.
+#stable# .
+#stable# This is a transitional package and can be safely removed.
+#stable#
+#stable#Package: wine64-dev-tools
+#stable#Architecture: amd64
+#stable#Section: oldlibs
+#stable#Priority: extra
+#stable#Multi-Arch: same
+#stable#Depends:
+#stable# ${misc:Depends},
+#stable# wine64-tools (>= ${binary:Version})
+#stable#Description: Windows API implementation - transitional package
+#stable# Wine is a free MS-Windows API implementation.
+#stable# This is still a work in progress and many applications may still not work.
+#stable# .
+#stable# This is a transitional package and can be safely removed.
diff --git a/debian/patches/makefile-development.patch b/debian/patches/makefile-development.patch
new file mode 100644
index 0000000..23f5eb7
--- /dev/null
+++ b/debian/patches/makefile-development.patch
@@ -0,0 +1,25 @@
+description: don't append wine to the default path settings
+author: Michael Gilbert <mgilb...@debian.org>
+
+--- a/configure.ac
++++ b/configure.ac
+@@ -669,7 +669,7 @@ AC_CHECK_HEADERS([libprocstat.h],,,
+ 
+ dnl **** Check for working dll ****
+ 
+-AC_SUBST(dlldir,"\${libdir}/wine")
++AC_SUBST(dlldir,"\${libdir}")
+ AC_SUBST(DLLPREFIX,"")
+ AC_SUBST(DLLFLAGS,"-D_REENTRANT")
+ AC_SUBST(LDRPATH_INSTALL,"")
+--- a/Make.vars.in
++++ b/Make.vars.in
+@@ -8,7 +8,7 @@ datarootdir     = @datarootdir@
+ datadir         = @datadir@
+ mandir          = @mandir@
+ fontdir         = ${datadir}/wine/fonts
+-includedir      = @includedir@/wine
++includedir      = @includedir@
+ dlldir          = @dlldir@
+ fakedlldir      = ${dlldir}/fakedlls
+ top_srcdir      = @top_srcdir@
diff --git a/debian/patches/makefile.patch b/debian/patches/makefile.patch
index 23f5eb7..5ef6441 100644
--- a/debian/patches/makefile.patch
+++ b/debian/patches/makefile.patch
@@ -1,25 +1,16 @@
 description: don't append wine to the default path settings
 author: Michael Gilbert <mgilb...@debian.org>
 
---- a/configure.ac
-+++ b/configure.ac
-@@ -669,7 +669,7 @@ AC_CHECK_HEADERS([libprocstat.h],,,
- 
- dnl **** Check for working dll ****
- 
--AC_SUBST(dlldir,"\${libdir}/wine")
-+AC_SUBST(dlldir,"\${libdir}")
- AC_SUBST(DLLPREFIX,"")
- AC_SUBST(DLLFLAGS,"-D_REENTRANT")
- AC_SUBST(LDRPATH_INSTALL,"")
 --- a/Make.vars.in
 +++ b/Make.vars.in
-@@ -8,7 +8,7 @@ datarootdir     = @datarootdir@
- datadir         = @datadir@
+@@ -9,8 +9,8 @@
+ infodir         = @infodir@
  mandir          = @mandir@
- fontdir         = ${datadir}/wine/fonts
+ fontdir         = $(datadir)/wine/fonts
 -includedir      = @includedir@/wine
-+includedir      = @includedir@
- dlldir          = @dlldir@
- fakedlldir      = ${dlldir}/fakedlls
+-dlldir          = @libdir@/wine
++includedir      = @includedir@/
++dlldir          = @libdir@/
+ fakedlldir      = $(dlldir)/fakedlls
  top_srcdir      = @top_srcdir@
+ top_builddir    = @top_builddir@
diff --git a/debian/patches/manpages-development.patch b/debian/patches/manpages-development.patch
new file mode 100644
index 0000000..65c00a9
--- /dev/null
+++ b/debian/patches/manpages-development.patch
@@ -0,0 +1,222 @@
+description: fix various manpage issues
+author: Michael Gilbert <mgilb...@debian.org>
+
+--- wine.orig/loader/wine.de.UTF-8.man.in	2014-01-25 23:56:57.583665161 -0500
++++ wine/loader/wine.de.UTF-8.man.in	2014-01-25 23:56:57.567665161 -0500
+@@ -71,7 +71,7 @@
+ .IR wineserver .
+ genutzt. Alle
+ .B wine
+--Prozesse, die den gleichen
++\-Prozesse, die den gleichen
+ .B wineserver
+ nutzen (z.B. Prozesse desselben Nutzers) teilen sich bestimmte Objekte
+ wie die Registry, Arbeitsspeicher und die Konfigurationsdateien.  Mit
+@@ -79,14 +79,14 @@
+ .I WINEPREFIX
+ beim Starten verschiedener
+ .B wine
+--Prozesse ist es möglich, eine Anzahl vollkommen unabhängiger
++\-Prozesse ist es möglich, eine Anzahl vollkommen unabhängiger
+ .B wine
+--Prozesse zu starten.
++\-Prozesse zu starten.
+ .TP
+ .I WINESERVER
+ Gibt den Ort der
+ .B wineserver
+--Anwendung an. Wenn diese Variable nicht gesetzt ist, wird versucht,
++\-Anwendung an. Wenn diese Variable nicht gesetzt ist, wird versucht,
+ .B @bindir@/wineserver
+ zu laden. Wenn auch dies nicht funktioniert, sucht
+ .B wine
+@@ -95,7 +95,7 @@
+ .I WINELOADER
+ Gibt den Ort der
+ .B wine
+--Anwendung an, die genutzt wird, um Windows-Programme zu laden. Wenn
++\-Anwendung an, die genutzt wird, um Windows-Programme zu laden. Wenn
+  diese Variable nicht gesetzt ist, wird versucht,
+ .B @bindir@/wineserver
+ zu laden. Wenn auch dies nicht funktioniert, wird in $PATH und anderen
+@@ -118,7 +118,7 @@
+ nicht angegeben ist, werden alle Debugmeldungen dieses Kanals
+ ausgegeben. Jeder Kanal gibt Meldungen einer bestimmten
+ .BR wine .
+--Komponente aus. Das folgende Zeichen kann entweder + oder - sein, je
++\-Komponente aus. Das folgende Zeichen kann entweder + oder - sein, je
+ nachdem ob der Kanal ein- oder ausgeschaltet werden soll.  Wenn keine
+ .I Klasse
+ angegeben ist, kann das führende + weggelassen werden. In WINEDEBUG
+@@ -143,7 +143,7 @@
+ .TP
+ WINEDEBUG=relay
+ schaltet alle Relay-Nachrichten an. Für mehr Kontrolle über die im
+-Relaytrace angezeigten DLLs und Funktionen siehe den [Debug]-Abschnitt
++Relaytrace angezeigten DLLs und Funktionen siehe den Debug-Abschnitt
+ der Wine-Konfigurationsdatei.
+ .PP
+ Für mehr Informationen zu den Debug-Meldungen siehe den Abschnitt
+@@ -166,7 +166,7 @@
+ .RI ( native ),
+ und
+ .B wine
+--interne DLLs
++\-interne DLLs
+ .RI ( builtin ).
+ Der Typ kann mit dem ersten Buchstaben abgekürzt werden
+ .RI ( n ", " b ).
+@@ -231,22 +231,22 @@
+ .I @bindir@/wine
+ Der
+ .B wine
+--Programmstarter
++\-Programmstarter
+ .TP
+ .I @bindir@/wineconsole
+ Der
+ .B wine
+--Programmstarter für Konsolenapplikationen (CLI)
++\-Programmstarter für Konsolenapplikationen (CLI)
+ .TP
+ .I @bindir@/wineserver
+ Der
+ .B wine
+--Server
++\-Server
+ .TP
+ .I @bindir@/winedbg
+ Der
+ .B wine
+--Debugger
++\-Debugger
+ .TP
+ .I @dlldir@
+ Der Ordner mit den gemeinsamen DLLs von
+@@ -290,7 +290,7 @@
+ .I http://wiki.winehq.org/Bugs
+ im
+ .B wine
+--Quellcode, um zu sehen, welche Informationen benötigt werden.
++\-Quellcode, um zu sehen, welche Informationen benötigt werden.
+ .PP
+ Probleme und Hinweise mit/zu dieser Manpage können auch auf
+ .I http://bugs.winehq.org
+@@ -307,7 +307,7 @@
+ .PP
+ WineHQ, die Hauptseite der
+ .B wine
+--Entwicklung, befindet sich auf
++\-Entwicklung, befindet sich auf
+ .IR http://www.winehq.org .
+ Diese Website bietet viele Informationen und Ressourcen zu
+ .BR wine .
+@@ -316,7 +316,7 @@
+ .B wine
+ können Sie sich als Abonnement bei der
+ .B wine
+--Mailingliste auf
++\-Mailingliste auf
+ .I http://www.winehq.org/forums
+ eintragen.
+ .SH "SIEHE AUCH"
+--- wine.orig/loader/wine.pl.UTF-8.man.in	2014-01-25 23:56:57.583665161 -0500
++++ wine/loader/wine.pl.UTF-8.man.in	2014-01-25 23:56:57.567665161 -0500
+@@ -263,8 +263,8 @@
+ Napędy DOS również są określone przez dowiązania symboliczne; Dla przykładu jeżeli napęd D:
+ odpowiadałby napędowi CDROM zamontowanemu w /mnt/cdrom, miałbyś dowiązanie symboliczne
+ $WINEPREFIX/dosdevices/d: -> /mnt/cdrom. Urządzenia Uniksowe odpowiadające
+-napędom DOS mogą być określone w ten sam sposób, z użyciem '::' zamiast
+-':'. Tak więc dla poprzedniego przykładu, jeżeli urządzenie CDROM byłoby zamontowane
++napędom DOS mogą być określone w ten sam sposób, z użyciem '::' zamiast.
++Tak więc dla poprzedniego przykładu, jeżeli urządzenie CDROM byłoby zamontowane
+ z /dev/hdc, to odpowiadające dowiązanie symboliczne wyglądałoby następująco
+ $WINEPREFIX/dosdevices/d:: -> /dev/hdc.
+ .SH AUTORZY
+--- wine.orig/programs/winedbg/winedbg.man.in	2014-01-25 23:56:57.583665161 -0500
++++ wine/programs/winedbg/winedbg.man.in	2014-01-25 23:56:57.567665161 -0500
+@@ -60,7 +60,7 @@
+ .IP \fB--command\ \fIstring\fR
+ \fBwinedbg\fR will execute the command \fIstring\fR as if it was keyed on
+ winedbg command line, and then will exit. This can be handy for
+-getting the pid of running processes (winedbg --command "info proc").
++getting the pid of running processes (winedbg \-\-command "info proc").
+ .IP \fB--file\ \fIfilename\fR
+ \fBwinedbg\fR will execute the list of commands contained in file
+ filename as if they were keyed on winedbg command line, and then
+--- wine.orig/tools/winemaker.de.UTF-8.man.in	2014-01-25 23:56:57.583665161 -0500
++++ wine/tools/winemaker.de.UTF-8.man.in	2014-01-25 23:57:06.303665140 -0500
+@@ -58,7 +58,7 @@
+ Groß-/Kleinschreibweise austauschen.
+ .PP
+ - Winemaker wird ebenso andere, exotischere Probleme wie die Benutzung von
+-'#pragma pack', 'afxres.h' in nicht-MFC-Projekten und mehr untersuchen.
++in nicht-MFC-Projekten und mehr untersuchen.
+ Sollte etwas ungwöhnliches vorkommen, wird Winemaker Sie warnen.
+ .PP
+ - Winemaker kann eine ganze Verzeichnisstruktur auf einmal durchsuchen,
+@@ -193,13 +193,13 @@
+ .PP
+ Ein typischer Winemaker Aufruf:
+ .PP
+-$ winemaker --lower-uppercase -DSTRICT .
++$ winemaker \-\-lower-uppercase \-DSTRICT .
+ .PP
+ Damit scannt Winemaker das aktuelle Verzeichnis und die Unterverzeichnisse nach
+ Quellcodedateien. Jede Datei und jedes Verzeichnis, das ganz in Großbuchstaben
+ geschrieben ist, wird in Kleinbuchstaben umbenannt. Danach werden alle Quellcodedateien
+ an die Kompilierung mit Winelib angepasst und Makefiles erzeugt.
+-'-DSTRICT' gibt an, dass das STRICT-Makro gesetzt sein muss, um diesen Quellcode
++\-DSTRICT gibt an, dass das STRICT-Makro gesetzt sein muss, um diesen Quellcode
+ zu kompilieren. Letztendlich wird Winemaker die globale Makefile erzeugen.
+ .PP
+ Der nächste Schritt wäre dann:
+@@ -212,7 +212,7 @@
+ .PP
+ Bei einem MFC-basierten Projekt sollten Sie stattdessen folgenden Befehl ausführen:
+ .PP
+-$ winemaker --lower-uppercase --mfc .
++$ winemaker \-\-lower-uppercase \-\-mfc .
+ .br
+ $ make
+ .PP
+--- wine.orig/tools/winemaker.fr.UTF-8.man.in	2014-01-25 23:56:57.583665161 -0500
++++ wine/tools/winemaker.fr.UTF-8.man.in	2014-01-25 23:56:57.567665161 -0500
+@@ -211,7 +211,7 @@
+ .B winemaker
+ :
+ .PP
+-$ winemaker --lower-uppercase -DSTRICT .
++$ winemaker \-\-lower-uppercase \-DSTRICT .
+ .PP
+ Recherche des fichiers sources dans le répertoire courant et ses
+ sous-répertoires. Quand un fichier ou répertoire a un nom composé
+@@ -232,7 +232,7 @@
+ Pour un projet utilisant les MFC, vous devriez plutôt exécuter les commandes
+ suivantes\ :
+ .PP
+-$ winemaker --lower-uppercase --mfc .
++$ winemaker \-\-lower-uppercase \-\-mfc .
+ .br
+ $ make
+ .PP
+--- wine.orig/server/wineserver.de.UTF-8.man.in	2014-01-25 23:56:57.583665161 -0500
++++ wine/server/wineserver.de.UTF-8.man.in	2014-01-25 23:56:57.567665161 -0500
+@@ -62,7 +62,7 @@
+ .B wineserver
+ seine Daten ablegt (Standardmäßig in \fI$HOME/.wine\fR). Alle
+ .B wine
+--Prozesse, die den selben
++\-Prozesse, die den selben
+ .B wineserver
+ verwenden (z.B. vom selben Benutzer), teilen sich u.a. die selbe Registry,
+ gemeinsamen Speicher und Kernelobjekte.
+@@ -74,7 +74,7 @@
+ .I WINESERVER
+ Gibt den Pfad und Namen der
+ .B wineserver
+--Binärdatei an, die automatisch von \fBwine\fR gestartet wird. Ist diese
++\-Binärdatei an, die automatisch von \fBwine\fR gestartet wird. Ist diese
+ Variable nicht gesetzt, wird \fBwine\fR versuchen,
+ .IR @bindir@/wineserver
+ zu laden. Existiert dieser Pfad nicht, wird nach einer Datei namens
diff --git a/debian/patches/manpages.patch b/debian/patches/manpages.patch
index 65c00a9..19d1ca2 100644
--- a/debian/patches/manpages.patch
+++ b/debian/patches/manpages.patch
@@ -1,8 +1,10 @@
 description: fix various manpage issues
 author: Michael Gilbert <mgilb...@debian.org>
 
---- wine.orig/loader/wine.de.UTF-8.man.in	2014-01-25 23:56:57.583665161 -0500
-+++ wine/loader/wine.de.UTF-8.man.in	2014-01-25 23:56:57.567665161 -0500
+Index: wine/loader/wine.de.man.in
+===================================================================
+--- wine.orig/loader/wine.de.man.in	2014-01-25 23:56:57.583665161 -0500
++++ wine/loader/wine.de.man.in	2014-01-25 23:56:57.567665161 -0500
 @@ -71,7 +71,7 @@
  .IR wineserver .
  genutzt. Alle
@@ -120,8 +122,10 @@ author: Michael Gilbert <mgilb...@debian.org>
  .I http://www.winehq.org/forums
  eintragen.
  .SH "SIEHE AUCH"
---- wine.orig/loader/wine.pl.UTF-8.man.in	2014-01-25 23:56:57.583665161 -0500
-+++ wine/loader/wine.pl.UTF-8.man.in	2014-01-25 23:56:57.567665161 -0500
+Index: wine/loader/wine.pl.man.in
+===================================================================
+--- wine.orig/loader/wine.pl.man.in	2014-01-25 23:56:57.583665161 -0500
++++ wine/loader/wine.pl.man.in	2014-01-25 23:56:57.567665161 -0500
 @@ -263,8 +263,8 @@
  Napędy DOS również są określone przez dowiązania symboliczne; Dla przykładu jeżeli napęd D:
  odpowiadałby napędowi CDROM zamontowanemu w /mnt/cdrom, miałbyś dowiązanie symboliczne
@@ -133,6 +137,8 @@ author: Michael Gilbert <mgilb...@debian.org>
  z /dev/hdc, to odpowiadające dowiązanie symboliczne wyglądałoby następująco
  $WINEPREFIX/dosdevices/d:: -> /dev/hdc.
  .SH AUTORZY
+Index: wine/programs/winedbg/winedbg.man.in
+===================================================================
 --- wine.orig/programs/winedbg/winedbg.man.in	2014-01-25 23:56:57.583665161 -0500
 +++ wine/programs/winedbg/winedbg.man.in	2014-01-25 23:56:57.567665161 -0500
 @@ -60,7 +60,7 @@
@@ -144,8 +150,10 @@ author: Michael Gilbert <mgilb...@debian.org>
  .IP \fB--file\ \fIfilename\fR
  \fBwinedbg\fR will execute the list of commands contained in file
  filename as if they were keyed on winedbg command line, and then
---- wine.orig/tools/winemaker.de.UTF-8.man.in	2014-01-25 23:56:57.583665161 -0500
-+++ wine/tools/winemaker.de.UTF-8.man.in	2014-01-25 23:57:06.303665140 -0500
+Index: wine/tools/winemaker.de.man.in
+===================================================================
+--- wine.orig/tools/winemaker.de.man.in	2014-01-25 23:56:57.583665161 -0500
++++ wine/tools/winemaker.de.man.in	2014-01-25 23:57:06.303665140 -0500
 @@ -58,7 +58,7 @@
  Groß-/Kleinschreibweise austauschen.
  .PP
@@ -180,8 +188,10 @@ author: Michael Gilbert <mgilb...@debian.org>
  .br
  $ make
  .PP
---- wine.orig/tools/winemaker.fr.UTF-8.man.in	2014-01-25 23:56:57.583665161 -0500
-+++ wine/tools/winemaker.fr.UTF-8.man.in	2014-01-25 23:56:57.567665161 -0500
+Index: wine/tools/winemaker.fr.man.in
+===================================================================
+--- wine.orig/tools/winemaker.fr.man.in	2014-01-25 23:56:57.583665161 -0500
++++ wine/tools/winemaker.fr.man.in	2014-01-25 23:56:57.567665161 -0500
 @@ -211,7 +211,7 @@
  .B winemaker
  :
@@ -200,8 +210,10 @@ author: Michael Gilbert <mgilb...@debian.org>
  .br
  $ make
  .PP
---- wine.orig/server/wineserver.de.UTF-8.man.in	2014-01-25 23:56:57.583665161 -0500
-+++ wine/server/wineserver.de.UTF-8.man.in	2014-01-25 23:56:57.567665161 -0500
+Index: wine/server/wineserver.de.man.in
+===================================================================
+--- wine.orig/server/wineserver.de.man.in	2014-01-25 23:56:57.583665161 -0500
++++ wine/server/wineserver.de.man.in	2014-01-25 23:56:57.567665161 -0500
 @@ -62,7 +62,7 @@
  .B wineserver
  seine Daten ablegt (Standardmäßig in \fI$HOME/.wine\fR). Alle
diff --git a/debian/patches/printer-resolution-development.patch b/debian/patches/printer-resolution-development.patch
new file mode 100644
index 0000000..08a5215
--- /dev/null
+++ b/debian/patches/printer-resolution-development.patch
@@ -0,0 +1,13 @@
+description: set default printer resolution to 600dpi
+
+--- a/dlls/winspool.drv/generic.ppd
++++ b/dlls/winspool.drv/generic.ppd
+@@ -101,7 +101,7 @@
+ 
+ *OpenUI *Resolution/Output Resolution: PickOne
+ *OrderDependency: 20 AnySetup *Resolution
+-*DefaultResolution: 300dpi
++*DefaultResolution: 600dpi
+ *Resolution 150dpi/150 DPI: "<</HWResolution[150 150]>>setpagedevice"
+ *Resolution 300dpi/300 DPI: "<</HWResolution[300 300]>>setpagedevice"
+ *Resolution 600dpi/600 DPI: "<</HWResolution[600 600]>>setpagedevice"
diff --git a/debian/patches/printer-resolution.patch b/debian/patches/printer-resolution.patch
index ccc68f5..f657e88 100644
--- a/debian/patches/printer-resolution.patch
+++ b/debian/patches/printer-resolution.patch
@@ -1,8 +1,8 @@
 description: set default printer resolution to 600dpi
 author: Ralf E-Mail <anonymous272...@gmail.com>
 
---- a/dlls/winspool.drv/generic.ppd
-+++ b/dlls/winspool.drv/generic.ppd
+--- a/dlls/wineps.drv/generic.ppd
++++ b/dlls/wineps.drv/generic.ppd
 @@ -101,7 +101,7 @@
  
  *OpenUI *Resolution/Output Resolution: PickOne
diff --git a/debian/patches/series b/debian/patches/series
index 3de8b9c..6d2077f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,12 +1,13 @@
-makefile.patch
-manpages.patch
+makefile-development.patch
+manpages-development.patch
 gitignore.patch
 
-printer-resolution.patch
+printer-resolution-development.patch
 
-winegcc.patch
+winegcc-development.patch
 wineapploader.patch
 
 winemenubuilder.patch
 no-download.patch
 addons-path.patch
+
diff --git a/debian/patches/series.in b/debian/patches/series.in
new file mode 100644
index 0000000..61a2160
--- /dev/null
+++ b/debian/patches/series.in
@@ -0,0 +1,13 @@
+makefileVERSION.patch
+manpagesVERSION.patch
+#development#gitignore.patch
+
+printer-resolutionVERSION.patch
+
+winegccVERSION.patch
+wineapploader.patch
+
+winemenubuilder.patch
+no-download.patch
+addons-path.patch
+
diff --git a/debian/patches/wineapploader.patch b/debian/patches/wineapploader.patch
index d8dfa5b..1eb3870 100644
--- a/debian/patches/wineapploader.patch
+++ b/debian/patches/wineapploader.patch
@@ -10,7 +10,7 @@ author: Michael Gilbert <mgilb...@debian.org>
 -appname=`basename "$0" .exe`.exe
 +app=$(basename "$0" .exe)
 +name=$(echo $app | cut -d- -f1)
-+suffix=$(basename $(dirname $(readlink -f $(which $0))) | sed s/wine//)
++suffix=$(basename $(dirname $(readlink -f $0)) | sed s/wine//)
 +appname=$name.exe
  
  # first try explicit WINELOADER
diff --git a/debian/patches/winegcc-development.patch b/debian/patches/winegcc-development.patch
new file mode 100644
index 0000000..1c9c232
--- /dev/null
+++ b/debian/patches/winegcc-development.patch
@@ -0,0 +1,14 @@
+description: call wine-development instead of wine from the winegcc shell script
+author: Michael Gilbert <mgilb...@debian.org>
+
+--- a/tools/winegcc/winegcc.c
++++ b/tools/winegcc/winegcc.c
+@@ -131,7 +131,7 @@ static const char* app_loader_template =
+     "fi\n"
+     "\n"
+     "# determine the WINELOADER\n"
+-    "if [ ! -x \"$WINELOADER\" ]; then WINELOADER=\"wine\"; fi\n"
++    "if [ ! -x \"$WINELOADER\" ]; then WINELOADER=\"wine-development\"; fi\n"
+     "\n"
+     "# and try to start the app\n"
+     "exec \"$WINELOADER\" \"$apppath\" \"$@\"\n"
diff --git a/debian/patches/winegcc.patch b/debian/patches/winegcc.patch
index 1c9c232..e30f190 100644
--- a/debian/patches/winegcc.patch
+++ b/debian/patches/winegcc.patch
@@ -1,4 +1,4 @@
-description: call wine-development instead of wine from the winegcc shell script
+description: call wine-stable instead of wine from the winegcc shell script
 author: Michael Gilbert <mgilb...@debian.org>
 
 --- a/tools/winegcc/winegcc.c
@@ -8,7 +8,7 @@ author: Michael Gilbert <mgilb...@debian.org>
      "\n"
      "# determine the WINELOADER\n"
 -    "if [ ! -x \"$WINELOADER\" ]; then WINELOADER=\"wine\"; fi\n"
-+    "if [ ! -x \"$WINELOADER\" ]; then WINELOADER=\"wine-development\"; fi\n"
++    "if [ ! -x \"$WINELOADER\" ]; then WINELOADER=\"wine-stable\"; fi\n"
      "\n"
      "# and try to start the app\n"
      "exec \"$WINELOADER\" \"$apppath\" \"$@\"\n"
diff --git a/debian/rules b/debian/rules
index d00eafa..76cd7a0 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,6 +7,7 @@ export DH_VERBOSE=1
 export DEB_BUILD_MAINT_OPTIONS=hardening=+all,-pie
 
 VERSION=$(shell dpkg-parsechangelog | grep ^Source | cut -d\  -f2 | sed s/wine//g)
+
 ifeq ($(VERSION), -development)
 DEBSUFFIX=$(VERSION)
 else
@@ -50,8 +51,33 @@ endif
 # additional files to generate
 INSTALLS=$(shell ls debian/*VERSION* | sed s/VERSION/$(VERSION)/)
 
-debian/control: debian/control.in
-	sed s/VERSION/$(VERSION)/g < $< > $@
+# Following are several recipes containing this line:
+# (sed "s/VERSION/$(VERSION)/g;s/DEBSUFFIX/$(DEBSUFFIX)/g;s/#development#//g" | grep -v "#stable#") < $< > $@
+# This takes the first requisite of the rule, and does depending on the wine version specified in debian/changelog:
+# - Replace VERSION ("-development" or empty) and DEBSUFFIX ("-development" or "-stable").
+# - Remove the tag (#development# or #stable#) of the target version.
+# - Remove lines containing the tag (#development# or #stable#) of the non-target version.
+
+debian/control: debian/control.in debian/changelog debian/rules debian/watch debian/patches/series
+ifeq ($(VERSION), -development)
+	(sed "s/VERSION/$(VERSION)/g;s/DEBSUFFIX/$(DEBSUFFIX)/g;s/#development#//g" | grep -v "#stable#") < $< > $@
+else
+	(sed "s/VERSION/$(VERSION)/g;s/DEBSUFFIX/$(DEBSUFFIX)/g;s/#stable#//g" | grep -v "#development#") < $< > $@
+endif
+
+debian/watch: debian/watch.in debian/changelog debian/rules
+ifeq ($(VERSION), -development)
+	(sed "s/VERSION/$(VERSION)/g;s/DEBSUFFIX/$(DEBSUFFIX)/g;s/#development#//g" | grep -v "#stable#") < $< > $@
+else
+	(sed "s/VERSION/$(VERSION)/g;s/DEBSUFFIX/$(DEBSUFFIX)/g;s/#stable#//g" | grep -v "#development#") < $< > $@
+endif
+
+debian/patches/series: debian/patches/series.in debian/changelog debian/rules
+ifeq ($(VERSION), -development)
+	(sed "s/VERSION/$(VERSION)/g;s/DEBSUFFIX/$(DEBSUFFIX)/g;s/#development#//g" | grep -v "#stable#") < $< > $@
+else
+	(sed "s/VERSION/$(VERSION)/g;s/DEBSUFFIX/$(DEBSUFFIX)/g;s/#stable#//g" | grep -v "#development#") < $< > $@
+endif
 
 debian/wine$(VERSION)%: debian/wineVERSION%
 	sed "s/VERSION/$(VERSION)/g;s/DEBSUFFIX/$(DEBSUFFIX)/g" < $< > $@
@@ -94,6 +120,7 @@ override_dh_clean:
 	dh_clean -- \
 	    $(INSTALLS) \
 	    debian/control \
+	    debian/patches/series \
 	    programs/cscript/ihost.h \
 	    configure config.* tools/config.* include/config.h.in
 	make -f debian/rules debian/control
diff --git a/debian/watch b/debian/watch
index 87ec183..16ada30 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,4 +1,4 @@
 version=3
 opts="pgpsigurlmangle=s/$/.sign/" \
 http://www.winehq.org/ \
-  (?:|.*/)wine(?:[_\-]v?|)(\d*.*.\d*)\.(?:tar\.xz|txz|tar\.bz2|tbz2|tar\.gz|tgz)
+  (?:|.*/)wine(?:[_\-]v?|)(\d*.*[13579].\d*)\.(?:tar\.xz|txz|tar\.bz2|tbz2|tar\.gz|tgz)
diff --git a/debian/watch.in b/debian/watch.in
new file mode 100644
index 0000000..b61cfa3
--- /dev/null
+++ b/debian/watch.in
@@ -0,0 +1,5 @@
+version=3
+opts="pgpsigurlmangle=s/$/.sign/" \
+http://www.winehq.org/ \
+#development#  (?:|.*/)wine(?:[_\-]v?|)(\d*.*[13579].\d*)\.(?:tar\.xz|txz|tar\.bz2|tbz2|tar\.gz|tgz)
+#stable#  (?:|.*/)wine(?:[_\-]v?|)(\d*.*[02468].\d*)\.(?:tar\.xz|txz|tar\.bz2|tbz2|tar\.gz|tgz)

Reply via email to