diff --git a/.gitignore b/.gitignore index e42abb3a..2b9063d0 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,3 @@ -debian/tools/wine +patch-tools/wine *.pyc .patchupdate.cache diff --git a/README.md b/README.md index 4688e952..c4332726 100644 --- a/README.md +++ b/README.md @@ -40,7 +40,7 @@ Included bug fixes and improvements yet available in vanilla Wine. They are removed from the list as soon as they are included upstream. The list also includes features and fixes from previous releases, take a look at the -[changelog](https://github.com/wine-compholio/wine-staging/blob/master/debian/changelog) +[changelog](https://github.com/wine-compholio/wine-staging/blob/master/patch-tools/changelog) for more details.* * Add IDragSourceHelper stub interface ([Wine Bug #24699](https://bugs.winehq.org/show_bug.cgi?id=24699)) diff --git a/debian/compat b/debian/compat deleted file mode 100644 index 7f8f011e..00000000 --- a/debian/compat +++ /dev/null @@ -1 +0,0 @@ -7 diff --git a/debian/control b/debian/control deleted file mode 100644 index 7c7123bb..00000000 --- a/debian/control +++ /dev/null @@ -1,327 +0,0 @@ -Source: wine-staging -Section: otherosfs -Priority: optional -Maintainer: Erich E. Hoover -XSBC-Original-Maintainer: Scott Ritchie -Build-Depends: autotools-dev, - autoconf, - bison, - bsdmainutils, - debhelper (>= 7), - docbook-to-man, - docbook-utils, - docbook-xsl, - flex, - fontforge, - gawk, - gcc-4.5 | gcc-4.7 | gcc-4.9 | ubuntu-desktop (<< 1.207), - gettext, - libacl1-dev, - libasound2-dev, - libcapi20-dev, - libcups2-dev, - libdbus-1-dev, - libesd0 | libesd-alsa0, - libesd0-dev, - libfontconfig1-dev | libfontconfig-dev, - libfreetype6-dev, - libgl1-mesa-dev | nvidia-glx-dev | fglrx-driver-dev | libgl-dev, - libglu1-mesa-dev | libglu-dev, - libgnutls-dev, - libgphoto2-dev | libgphoto2-6-dev | libgphoto2-2-dev (>= 2.4.6), - libgsm1-dev, - libgtk-3-dev, - libice-dev, - libjpeg-dev, - liblcms2-dev | ubuntu-desktop (<< 1.267), - libldap2-dev, libldap-dev, - libmpg123-dev, - libncurses5-dev | libncurses-dev, - libopenal-dev (>= 1:1.12) | ubuntu-desktop (<< 1.207), - libosmesa6-dev, - libpcap-dev, - libpng12-dev, - libpulse-dev, - libsane-dev, - libssl-dev, - libstdc++6-4.5-dev | libstdc++-dev, - libtiff5-dev | libtiff4-dev | libtiff-dev, - libtxc-dxtn-s2tc-dev, - libv4l-dev, - libva-dev, - libx11-dev, - libxcomposite-dev, - libxcursor-dev, - libxext-dev, - libxi-dev, - libxinerama-dev, - libxml2-dev, - libxrandr-dev, - libxrender-dev, - libxslt1-dev, - libxt-dev, - libxxf86vm-dev, - linux-kernel-headers, - linux-libc-dev, - patch, - perl, - prelink, - sharutils, - unixodbc-dev, - x11proto-xinerama-dev -Standards-Version: 3.9.5 - -Package: wine-staging-i386 -Architecture: i386 -Multi-Arch: foreign -Pre-Depends: dpkg (>= 1.14.12ubuntu3), ${misc:Pre-Depends} -Depends: ${shlibs:Depends}, - libasound2-plugins, - libncurses5 -Recommends: libcapi20-3, - libcups2, - libdbus-1-3, - libfontconfig1 | libfontconfig, - libfreetype6, - libgnutls26, - libgtk-3-0, - libjpeg8, - libosmesa6, - libpcap0.8, - libpng12-0, - libpulse0, - libsane, - libssl1.0.0, - libtiff5 | libtiff4, - libtxc-dxtn-s2tc0, - libv4l-0, - libva-drm1, - libva-x11-1, - libxcomposite1, - libxcursor1, - libxi6, - libxinerama1, - libxrandr2, - libxrender1, - libxslt1.1, - libxt6, - libxxf86vm1, - libodbc1, - libgsm1 -Section: otherosfs -Priority: optional -Description: special build of the popular Wine software - The Staging Edition is a special build of the popular Wine software - with patches representing my current staging tree for Wine. - . - Microsoft Windows Compatibility Layer (Binary Emulator and Library) - Wine is a compatibility layer for running Windows applications on Linux. - Applications are run at full speed without the need of cpu emulation. Wine - does not require Microsoft Windows, however it can use native system dll - files in place of its own if they are available. - . - This package provides support for loading 32-bit x86 Windows applications - . - This package is based on a recent Wine beta. While many more applications - will work, there may be some loss of functionality compared with the stable - release provided by the regular wine package. - -Package: wine-staging-amd64 -Architecture: amd64 -Multi-Arch: foreign -Pre-Depends: dpkg (>= 1.14.12ubuntu3), ${misc:Pre-Depends} -Depends: ${shlibs:Depends}, - libasound2-plugins, - libncurses5 -Recommends: libcapi20-3, - libcups2, - libdbus-1-3, - libfontconfig1 | libfontconfig, - libfreetype6, - libgnutls26, - libgtk-3-0, - libjpeg8, - libosmesa6, - libpcap0.8, - libpng12-0, - libpulse0, - libsane, - libssl1.0.0, - libtiff5 | libtiff4, - libtxc-dxtn-s2tc0, - libv4l-0, - libva-drm1, - libva-x11-1, - libxcomposite1, - libxcursor1, - libxi6, - libxinerama1, - libxrandr2, - libxrender1, - libxslt1.1, - libxt6, - libxxf86vm1, - libodbc1, - libgsm1 -Section: otherosfs -Priority: optional -Description: special build of the popular Wine software - The Staging Edition is a special build of the popular Wine software - with patches representing my current staging tree for Wine. - . - Microsoft Windows Compatibility Layer (Binary Emulator and Library) - Wine is a compatibility layer for running Windows applications on Linux. - Applications are run at full speed without the need of cpu emulation. Wine - does not require Microsoft Windows, however it can use native system dll - files in place of its own if they are available. - . - This package provides support for loading 64-bit x86 Windows applications - . - This package is based on a recent Wine beta. While many more applications - will work, there may be some loss of functionality compared with the stable - release provided by the regular wine package. - -Package: wine-staging -Architecture: i386 amd64 -Multi-Arch: foreign -Pre-Depends: dpkg (>= 1.14.12ubuntu3), ${misc:Pre-Depends} -Depends: ${misc:Depends}, ${shlibs:Depends}, - wine-staging-i386 (= ${binary:Version}) [i386 amd64], - wine-staging-amd64 (= ${binary:Version}) [amd64], -Section: otherosfs -Priority: optional -Description: special build of the popular Wine software - The Staging Edition is a special build of the popular Wine software - with patches representing my current staging tree for Wine. - . - Microsoft Windows Compatibility Layer (Binary Emulator and Library) - Wine is a compatibility layer for running Windows applications on Linux. - Applications are run at full speed without the need of cpu emulation. Wine - does not require Microsoft Windows, however it can use native system dll - files in place of its own if they are available. - . - This package includes a program loader for running unmodified Windows - executables as well as the Wine project's free version of the Windows API - for running programs ported from Windows. - . - This package is based on a recent Wine beta. While many more applications - will work, there may be some loss of functionality compared with the stable - release provided by the regular wine package. - -Package: wine-staging-dev -Architecture: i386 amd64 -Pre-Depends: dpkg (>= 1.14.12ubuntu3), ${misc:Pre-Depends} -Depends: libc6-dev, - ${shlibs:Depends}, - wine-staging-i386 (= ${binary:Version}) [i386 amd64], - wine-staging-amd64 (= ${binary:Version}) [amd64], -Section: libdevel -Priority: optional -Description: special build of the popular Wine software - The Staging Edition is a special build of the popular Wine software - with patches representing my current staging tree for Wine. - . - Microsoft Windows Compatibility Layer (Binary Emulator and Library) - Wine is a compatibility layer for running Windows applications on Linux. - Applications are run at full speed without the need of cpu emulation. Wine - does not require Microsoft Windows, however it can use native system dll - files in place of its own if they are available. - . - This package consists of the development files needed to compile programs - using wine's free version of the Microsoft Windows API. - -Package: wine-staging-dbg -Architecture: i386 amd64 -Multi-Arch: same -Pre-Depends: dpkg (>= 1.14.12ubuntu3), ${misc:Pre-Depends} -Depends: ${shlibs:Depends}, - wine-staging-i386 (= ${binary:Version}) [i386 amd64], - wine-staging-amd64 (= ${binary:Version}) [amd64], -Section: debug -Priority: optional -Description: special build of the popular Wine software - The Staging Edition is a special build of the popular Wine software - with patches representing my current staging tree for Wine. - . - Microsoft Windows Compatibility Layer (Binary Emulator and Library) - Wine is a compatibility layer for running Windows applications on Linux. - Applications are run at full speed without the need of cpu emulation. Wine - does not require Microsoft Windows, however it can use native system dll - files in place of its own if they are available. - . - This package includes debugging symbols useful for reporting crashes and other - failures. - -Package: wine-staging-compat -Architecture: i386 amd64 -Depends: wine-staging, ${misc:Depends} -Section: otherosfs -Priority: optional -Replaces: wine, wine1.4, wine1.5, wine1.6, wine1.7, wine-i386, wine1.4-i386, - wine1.5-i386, wine1.6-i386, wine1.7-i386, ine-amd64, wine1.4-amd64, - wine1.5-amd64, wine1.6-amd64, wine1.7-amd64 -Conflicts: wine, wine-i386, wine-amd64 -Provides: wine, wine1.4, wine1.5, wine1.6, wine1.7, wine-i386, wine1.4-i386, - wine1.5-i386, wine1.6-i386, wine1.7-i386, wine-amd64 [amd64], - wine1.4-amd64 [amd64], wine1.5-amd64 [amd64], wine1.6-amd64 [amd64], - wine1.7-amd64 [amd64] -Description: special build of the popular Wine software - The Staging Edition is a special build of the popular Wine software - with patches representing our current staging tree for Wine. - . - Microsoft Windows Compatibility Layer (Binary Emulator and Library) - Wine is a compatibility layer for running Windows applications on Linux. - Applications are run at full speed without the need of cpu emulation. Wine - does not require Microsoft Windows, however it can use native system dll - files in place of its own if they are available. - . - This package includes a program loader for running unmodified Windows - executables as well as the Wine project's free version of the Windows API - for running programs ported from Windows. - . - This package is based on a recent Wine beta. While many more applications - will work, there may be some loss of functionality compared with the stable - release provided by the regular wine package. - . - This compatibility package allows to use Wine Staging system-wide as - the default Wine version. - -Package: wine-compholio -Architecture: i386 amd64 -Depends: wine-staging, ${misc:Depends} -Priority: extra -Section: oldlibs -Description: Transitional dummy package - This is a transitional dummy package. It can safely be removed. - -Package: wine-compholio-i386 -Architecture: i386 -Depends: wine-staging-i386, ${misc:Depends} -Priority: extra -Section: oldlibs -Description: Transitional dummy package - This is a transitional dummy package. It can safely be removed. - -Package: wine-compholio-amd64 -Architecture: amd64 -Depends: wine-staging-amd64, ${misc:Depends} -Priority: extra -Section: oldlibs -Description: Transitional dummy package - This is a transitional dummy package. It can safely be removed. - -Package: wine-compholio-dev -Architecture: i386 amd64 -Depends: wine-staging-dev, ${misc:Depends} -Priority: extra -Section: oldlibs -Description: Transitional dummy package - This is a transitional dummy package. It can safely be removed. - -Package: wine-compholio-dbg -Architecture: i386 amd64 -Depends: wine-staging-dbg, ${misc:Depends} -Priority: extra -Section: oldlibs -Description: Transitional dummy package - This is a transitional dummy package. It can safely be removed. diff --git a/debian/copyright b/debian/copyright deleted file mode 100644 index a6889b68..00000000 --- a/debian/copyright +++ /dev/null @@ -1,226 +0,0 @@ -Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ -Upstream-Name: Wine Staging -Source: http://www.winehq.com/ and http://www.wine-staging.com/ - -Files: * -Copyright: 1993-2015, the Wine project authors - 2014-2015, the Wine Staging project authors -License: LGPL-2.1 - -Files: patches/fonts-Missing_Fonts/0001-fonts-Add-Liberation-Sans-as-an-Arial-replacement.patch -Copyright: 2007, Red Hat -License: LiberationFontLicense - -Files: patches/fonts-Missing_Fonts/0002-fonts-Add-WenQuanYi-Micro-Hei-as-a-Microsoft-Yahei-r.patch -Copyright: 2008-2009, WenQuanYi Board of Trustees - 2007, Google Corporation - 2003-2004, Electronic Font Open Laboratory - 1990-2003, Wada Laboratory, the University of Tokyo -License: Apache-2 or GPL-3+ with font embedding exceptions - -Files: patches/fonts-Missing_Fonts/0003-fonts-Add-Courier-Prime-as-a-Courier-New-replacement -Copyright: 2013, Quote-Unquote Apps -License: OFL1.1 - -License: LGPL-2.1 - This software is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - . - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - . - On Debian systems, the complete text of the GNU Library General Public - License can be found in /usr/share/common-licenses/LGPL-2.1 file. - -License: LiberationFontLicense - LICENSE AGREEMENT AND LIMITED PRODUCT WARRANTY - LIBERATION FONT SOFTWARE - . - This agreement governs the use of the Software and any updates to the Software, - regardless of the delivery mechanism. Subject to the following terms, Red Hat, - Inc. ("Red Hat") grants to the user ("Client") a license to this work pursuant - to the GNU General Public License v.2 with the exceptions set forth below and - such other terms as our set forth in this End User License Agreement. - . - 1.The Software and License Exception. LIBERATION font software (the "Software") - consists of TrueType-OpenType formatted font software for rendering LIBERATION - typefaces in sans serif, serif, and monospaced character styles. You are licensed - to use, modify, copy, and distribute the Software pursuant to the GNU General - Public License v.2 with the following exceptions: - (a)As a special exception, if you create a document which uses this font, and - embed this font or unaltered portions of this font into the document, this font - does not by itself cause the resulting document to be covered by the GNU General - Public License. This exception does not however invalidate any other reasons why - the document might be covered by the GNU General Public License. If you modify - this font, you may extend this exception to your version of the font, but you - are not obligated to do so. If you do not wish to do so, delete this exception - statement from your version. - (b)As a further exception, any distribution of the object code of the Software - in a physical product must provide you the right to access and modify the source - code for the Software and to reinstall that modified version of the Software in - object code form on the same physical product on which you received it. - 2.Intellectual Property Rights. The Software and each of its components, - including the source code, documentation, appearance, structure and organization - are owned by Red Hat and others and are protected under copyright and other laws. - Title to the Software and any component, or to any copy, modification, or merged - portion shall remain with the aforementioned, subject to the applicable license. - The "LIBERATION" trademark is a trademark of Red Hat, Inc. in the U.S. and other - countries. This agreement does not permit Client to distribute modified versions - of the Software using Red Hat's trademarks. If Client makes a redistribution of - a modified version of the Software, then Client must modify the files names to - remove any reference to the Red Hat trademarks and must not use the Red Hat - trademarks in any way to reference or promote the modified Software. - 3.Limited Warranty. To the maximum extent permitted under applicable law, the - Software is provided and licensed "as is" without warranty of any kind, - expressed or implied, including the implied warranties of merchantability, - non-infringement or fitness for a particular purpose. Red Hat does not warrant - that the functions contained in the Software will meet Client's requirements or - that the operation of the Software will be entirely error free or appear - precisely as described in the accompanying documentation. - 4.Limitation of Remedies and Liability. To the maximum extent permitted by - applicable law, Red Hat or any Red Hat authorized dealer will not be liable to - Client for any incidental or consequential damages, including lost profits or - lost savings arising out of the use or inability to use the Software, even if - Red Hat or such dealer has been advised of the possibility of such damages. - 5.General. If any provision of this agreement is held to be unenforceable, that - shall not affect the enforceability of the remaining provisions. This agreement - shall be governed by the laws of the State of North Carolina and of the United - States, without regard to any conflict of laws provisions, except that the - United Nations Convention on the International Sale of Goods shall not apply. - Copyright © 2007 Red Hat, Inc. All rights reserved. LIBERATION is a trademark - of Red Hat, Inc. - -License: GPL-3+ with font embedding exceptions - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - . - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - . - As a special exception, if you create a document which uses this font, - and embed this font or unaltered portions of this font into the - document, this font does not by itself cause the resulting document to - be covered by the GNU General Public License. This exception does not - however invalidate any other reasons why the document might be covered - by the GNU General Public License. If you modify this font, you may - extend this exception to your version of the font, but you are not - obligated to do so. If you do not wish to do so, delete this exception - statement from your version. - . - On Debian systems, the complete text of the GNU General Public License - version 3 can be found in /usr/share/common-licenses/GPL-3 file. - -License: OFL1.1 - Copyright (c) 2013, Quote-Unquote Apps (http://quoteunquoteapps.com), - with Reserved Font Name Courier Prime. - . - This Font Software is licensed under the SIL Open Font License, Version 1.1. - This license is copied below, and is also available with a FAQ at: - http://scripts.sil.org/OFL - . - PREAMBLE - The goals of the Open Font License (OFL) are to stimulate worldwide - development of collaborative font projects, to support the font creation - efforts of academic and linguistic communities, and to provide a free and - open framework in which fonts may be shared and improved in partnership - with others. - . - The OFL allows the licensed fonts to be used, studied, modified and - redistributed freely as long as they are not sold by themselves. The - fonts, including any derivative works, can be bundled, embedded, - redistributed and/or sold with any software provided that any reserved - names are not used by derivative works. The fonts and derivatives, - however, cannot be released under any other type of license. The - requirement for fonts to remain under this license does not apply - to any document created using the fonts or their derivatives. - . - DEFINITIONS - "Font Software" refers to the set of files released by the Copyright - Holder(s) under this license and clearly marked as such. This may - include source files, build scripts and documentation. - . - "Reserved Font Name" refers to any names specified as such after the - copyright statement(s). - . - "Original Version" refers to the collection of Font Software components as - distributed by the Copyright Holder(s). - . - "Modified Version" refers to any derivative made by adding to, deleting, - or substituting -- in part or in whole -- any of the components of the - Original Version, by changing formats or by porting the Font Software to a - new environment. - . - "Author" refers to any designer, engineer, programmer, technical - writer or other person who contributed to the Font Software. - . - PERMISSION & CONDITIONS - Permission is hereby granted, free of charge, to any person obtaining - a copy of the Font Software, to use, study, copy, merge, embed, modify, - redistribute, and sell modified and unmodified copies of the Font - Software, subject to the following conditions: - . - 1) Neither the Font Software nor any of its individual components, - in Original or Modified Versions, may be sold by itself. - . - 2) Original or Modified Versions of the Font Software may be bundled, - redistributed and/or sold with any software, provided that each copy - contains the above copyright notice and this license. These can be - included either as stand-alone text files, human-readable headers or - in the appropriate machine-readable metadata fields within text or - binary files as long as those fields can be easily viewed by the user. - . - 3) No Modified Version of the Font Software may use the Reserved Font - Name(s) unless explicit written permission is granted by the corresponding - Copyright Holder. This restriction only applies to the primary font name as - presented to the users. - . - 4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font - Software shall not be used to promote, endorse or advertise any - Modified Version, except to acknowledge the contribution(s) of the - Copyright Holder(s) and the Author(s) or with their explicit written - permission. - . - 5) The Font Software, modified or unmodified, in part or in whole, - must be distributed entirely under this license, and must not be - distributed under any other license. The requirement for fonts to - remain under this license does not apply to any document created - using the Font Software. - . - TERMINATION - This license becomes null and void if any of the above conditions are - not met. - . - DISCLAIMER - THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, - EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF - MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT - OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE - COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, - INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL - DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING - FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM - OTHER DEALINGS IN THE FONT SOFTWARE. - -License: Apache-2 - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - . - http://www.apache.org/licenses/LICENSE-2.0 - . - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - . - On Debian systems, the complete text of the Apache License 2.0 can be - found in /usr/share/common-licenses/Apache-2.0 file. diff --git a/debian/rules b/debian/rules deleted file mode 100755 index 93ba2c42..00000000 --- a/debian/rules +++ /dev/null @@ -1,85 +0,0 @@ -#!/usr/bin/make -f - -# Prefer gcc-4.5, then 4.7, then 4.9 - otherwise fallback to gcc. -export CC = $(shell for _cc in gcc-4.5 gcc-4.7 gcc-4.9 gcc false; do \ - if which "$$_cc" >/dev/null 2>&1; then echo "$$_cc"; break; fi; done) - -%: - dh $@ --parallel - - -override_dh_auto_configure: - - # Apply our patches, reconfigure, and update the wineserver protocol request data - "$(CURDIR)/patches/patchinstall.sh" DESTDIR="$(CURDIR)" --all - - # Run configure -ifeq ($(DEB_BUILD_ARCH), amd64) - ./configure --prefix=/opt/wine-staging \ - --libdir=\$${prefix}/lib64 \ - --mandir=\$${prefix}/share/man \ - --infodir=\$${prefix}/share/info \ - --enable-win64 \ - --without-gstreamer \ - --with-xattr \ - $(CONFFLAGS) -else - ./configure --prefix=/opt/wine-staging \ - --libdir=\$${prefix}/lib \ - --mandir=\$${prefix}/share/man \ - --infodir=\$${prefix}/share/info \ - --without-gstreamer \ - --with-xattr \ - $(CONFFLAGS) -endif - - -override_dh_auto_test: - # Wine's test suite does not pass on build daemons, skip it for now - - -override_dh_installdocs: - dh_installdocs --link-doc=wine-staging - - -override_dh_install: - dh_install --fail-missing - - # These files will end up in multiple packages otherwise - rm -f debian/wine-staging/opt/wine-staging/bin/wine - rm -f debian/wine-staging/opt/wine-staging/bin/wine-preloader - rm -f debian/wine-staging/opt/wine-staging/bin/wine64 - rm -f debian/wine-staging/opt/wine-staging/bin/wine64-preloader - - # Create compatibility symlinks - mkdir -p debian/wine-compholio/opt/wine-compholio/bin - mkdir -p debian/wine-staging-compat/usr/bin - - for _file in $$(ls "debian/wine-staging/opt/wine-staging/bin"); do \ - ln -s "/opt/wine-staging/bin/$$_file" "debian/wine-compholio/opt/wine-compholio/bin/$$_file"; \ - ln -s "/opt/wine-staging/bin/$$_file" "debian/wine-staging-compat/usr/bin/$$_file"; \ - done - - # Architecture specific compatibility symlinks -ifeq ($(DEB_HOST_ARCH),amd64) - for _file in wine wine-preloader wine64 wine64-preloader; do \ - ln -s "/opt/wine-staging/bin/$$_file" "debian/wine-compholio/opt/wine-compholio/bin/$$_file"; \ - ln -s "/opt/wine-staging/bin/$$_file" "debian/wine-staging-compat/usr/bin/$$_file"; \ - done -else - for _file in wine wine-preloader; do \ - ln -s "/opt/wine-staging/bin/$$_file" "debian/wine-compholio/opt/wine-compholio/bin/$$_file"; \ - ln -s "/opt/wine-staging/bin/$$_file" "debian/wine-staging-compat/usr/bin/$$_file"; \ - done -endif - -override_dh_strip: - dh_strip -Xwine-pthread -Xwine-kthread --dbg-package=wine-staging-dbg - - -override_dh_shlibdeps: -ifeq ($(DEB_HOST_ARCH),amd64) - dh_shlibdeps -l $(CURDIR)/debian/tmp/opt/wine-staging/lib64/ -else - dh_shlibdeps -l $(CURDIR)/debian/tmp/opt/wine-staging/lib/ -endif diff --git a/debian/source/format b/debian/source/format deleted file mode 100644 index 89ae9db8..00000000 --- a/debian/source/format +++ /dev/null @@ -1 +0,0 @@ -3.0 (native) diff --git a/debian/wine-staging-amd64.install b/debian/wine-staging-amd64.install deleted file mode 100644 index 7a1afd97..00000000 --- a/debian/wine-staging-amd64.install +++ /dev/null @@ -1,4 +0,0 @@ -/opt/wine-staging/lib64/libwine.so* -/opt/wine-staging/lib64/wine -/opt/wine-staging/bin/wine64 -/opt/wine-staging/bin/wine64-preloader diff --git a/debian/wine-staging-amd64.lintian-overrides b/debian/wine-staging-amd64.lintian-overrides deleted file mode 100644 index d97eae43..00000000 --- a/debian/wine-staging-amd64.lintian-overrides +++ /dev/null @@ -1,3 +0,0 @@ -# Wine preloader needs static linking to reserve memory and work properly, see -# the comments at loader/preloader.c for a fuller explanation -wine-staging-amd64 binary: statically-linked-binary opt/wine-staging/bin/wine64-preloader diff --git a/debian/wine-staging-dev.install b/debian/wine-staging-dev.install deleted file mode 100644 index 11285351..00000000 --- a/debian/wine-staging-dev.install +++ /dev/null @@ -1 +0,0 @@ -/opt/wine-staging/include diff --git a/debian/wine-staging-i386.install b/debian/wine-staging-i386.install deleted file mode 100644 index 4bbf338f..00000000 --- a/debian/wine-staging-i386.install +++ /dev/null @@ -1,8 +0,0 @@ -/opt/wine-staging/lib/libwine.so* -/opt/wine-staging/lib/wine -/opt/wine-staging/bin/wine -/opt/wine-staging/bin/wine-preloader -/opt/wine-staging/share/man/man?/wine.?* -/opt/wine-staging/share/man/de.UTF-8/man?/wine.?* -/opt/wine-staging/share/man/fr.UTF-8/man?/wine.?* -/opt/wine-staging/share/man/pl.UTF-8/man?/wine.?* diff --git a/debian/wine-staging-i386.lintian-overrides b/debian/wine-staging-i386.lintian-overrides deleted file mode 100644 index 0bfad5f4..00000000 --- a/debian/wine-staging-i386.lintian-overrides +++ /dev/null @@ -1,3 +0,0 @@ -# Wine preloader needs static linking to reserve memory and work properly, see -# the comments at loader/preloader.c for a fuller explanation -wine-staging-i386 binary: statically-linked-binary opt/wine-staging/bin/wine-preloader diff --git a/debian/wine-staging.docs b/debian/wine-staging.docs deleted file mode 100644 index 515b1915..00000000 --- a/debian/wine-staging.docs +++ /dev/null @@ -1,4 +0,0 @@ -documentation/README.* -ANNOUNCE -AUTHORS -README diff --git a/debian/wine-staging.install b/debian/wine-staging.install deleted file mode 100644 index 1e13af21..00000000 --- a/debian/wine-staging.install +++ /dev/null @@ -1,28 +0,0 @@ -/opt/wine-staging/bin -/opt/wine-staging/share/applications -/opt/wine-staging/share/wine -/opt/wine-staging/share/man/de.UTF-8/man?/winemaker.?* -/opt/wine-staging/share/man/de.UTF-8/man?/wineserver.?* -/opt/wine-staging/share/man/fr.UTF-8/man?/winemaker.?* -/opt/wine-staging/share/man/fr.UTF-8/man?/wineserver.?* -/opt/wine-staging/share/man/man?/msiexec.?* -/opt/wine-staging/share/man/man?/notepad.?* -/opt/wine-staging/share/man/man?/regedit.?* -/opt/wine-staging/share/man/man?/regsvr32.?* -/opt/wine-staging/share/man/man?/widl.?* -/opt/wine-staging/share/man/man?/wineboot.?* -/opt/wine-staging/share/man/man?/winebuild.?* -/opt/wine-staging/share/man/man?/winecfg.?* -/opt/wine-staging/share/man/man?/wineconsole.?* -/opt/wine-staging/share/man/man?/winecpp.?* -/opt/wine-staging/share/man/man?/winedbg.?* -/opt/wine-staging/share/man/man?/winedump.?* -/opt/wine-staging/share/man/man?/winefile.?* -/opt/wine-staging/share/man/man?/wineg++.?* -/opt/wine-staging/share/man/man?/winegcc.?* -/opt/wine-staging/share/man/man?/winemaker.?* -/opt/wine-staging/share/man/man?/winemine.?* -/opt/wine-staging/share/man/man?/winepath.?* -/opt/wine-staging/share/man/man?/wineserver.?* -/opt/wine-staging/share/man/man?/wmc.?* -/opt/wine-staging/share/man/man?/wrc.?* diff --git a/debian/tools/README.md.in b/patch-tools/README.md.in similarity index 100% rename from debian/tools/README.md.in rename to patch-tools/README.md.in diff --git a/debian/changelog b/patch-tools/changelog similarity index 100% rename from debian/changelog rename to patch-tools/changelog diff --git a/debian/tools/patchinstall.sh.in b/patch-tools/patchinstall.sh.in similarity index 100% rename from debian/tools/patchinstall.sh.in rename to patch-tools/patchinstall.sh.in diff --git a/debian/tools/patchupdate.py b/patch-tools/patchupdate.py similarity index 99% rename from debian/tools/patchupdate.py rename to patch-tools/patchupdate.py index 950b4bbc..003d52b4 100755 --- a/debian/tools/patchupdate.py +++ b/patch-tools/patchupdate.py @@ -55,13 +55,13 @@ class config(object): path_config = os.path.expanduser("~/.config/patchupdate.conf") path_patches = "patches" - path_changelog = "debian/changelog" - path_wine = "debian/tools/wine" + path_changelog = "patch-tools/changelog" + path_wine = "patch-tools/wine" - path_template_script = "debian/tools/patchinstall.sh.in" + path_template_script = "patch-tools/patchinstall.sh.in" path_script = "patches/patchinstall.sh" - path_template_README_md = "debian/tools/README.md.in" + path_template_README_md = "patch-tools/README.md.in" path_README_md = "README.md" path_IfDefined = "9999-IfDefined.patch" @@ -859,7 +859,7 @@ def generate_markdown(all_patches, release_patches): lines.append("yet available in vanilla Wine. They are removed from the list as soon as they") lines.append("are included upstream. The list also includes features and fixes from previous") lines.append("releases, take a look at the") - lines.append("[changelog](https://github.com/wine-compholio/wine-staging/blob/master/debian/changelog)") + lines.append("[changelog](https://github.com/wine-compholio/wine-staging/blob/master/patch-tools/changelog)") lines.append("for more details.*") lines.append("") for mode, bugid, bugname in sorted(old_fixes, key=lambda x: x[2]): @@ -913,7 +913,7 @@ if __name__ == "__main__": args = parser.parse_args() tools_directory = os.path.dirname(os.path.realpath(__file__)) - os.chdir(os.path.join(tools_directory, "./../..")) + os.chdir(os.path.join(tools_directory, "./..")) config_parser = ConfigParser.ConfigParser() config_parser.read(config.path_config) diff --git a/debian/tools/patchutils.py b/patch-tools/patchutils.py similarity index 100% rename from debian/tools/patchutils.py rename to patch-tools/patchutils.py diff --git a/debian/tools/progressbar.py b/patch-tools/progressbar.py similarity index 100% rename from debian/tools/progressbar.py rename to patch-tools/progressbar.py diff --git a/precommit-hook.sh b/precommit-hook.sh index 2c97630d..880e2913 100755 --- a/precommit-hook.sh +++ b/precommit-hook.sh @@ -8,8 +8,8 @@ warning() echo "" } -if git status --porcelain "debian" | grep "^.[^ ]" &> /dev/null; then - warning "PLEASE ADD OR STASH YOUR CHANGES IN debian" +if git status --porcelain "patch-tools" | grep "^.[^ ]" &> /dev/null; then + warning "PLEASE ADD OR STASH YOUR CHANGES IN patch-tools" exit 1 fi @@ -19,9 +19,9 @@ if git status --porcelain "patches" | grep -v "^.\\?.*\\.py$" | grep "^.[^ ]" &> fi git diff --cached --name-status | while read status file; do - if [[ "$file" =~ ^patches/ ]] || [[ "$file" =~ ^debian/tools/ ]] || [[ "$file" =~ ^debian/changelog ]]; then + if [[ "$file" =~ ^patches/ ]] || [[ "$file" =~ ^patch-tools/ ]]; then warning "UPDATING AUTOGENERATED FILES" - debian/tools/patchupdate.py || exit 1 + ./patch-tools/patchupdate.py || exit 1 break; fi done