diff --git a/DEVELOPER.md b/DEVELOPER.md index 203323e8..01eda44e 100644 --- a/DEVELOPER.md +++ b/DEVELOPER.md @@ -2,16 +2,16 @@ Developers and maintainers guide ================================ This document will provide some information targeted at developers, who -either want to build/package Wine-Compholio for their distribution, but also -for developers who would like to contribute their patches to Wine-Compholio, +either want to build/package Wine Staging for their distribution, but also +for developers who would like to contribute their patches to Wine Staging, to get them included in future releases. -Compiling Wine-Compholio -======================== +Compiling Wine Staging +====================== -**Warning:** Please note that starting with Wine-Compholio 1.7.23 it is +**Warning:** Please note that starting with Staging 1.7.23 it is deprecated to manually apply patches without using the Makefile. To avoid typical pitfalls for package maintainers (like trying to use the patch commandline utility for binary patches or not updating the patchlist) it is @@ -26,14 +26,14 @@ Instructions The following instructions (based on the [Gentoo Wiki](https://wiki.gentoo.org/wiki/Netflix/Pipelight#Compiling_manually)) -will give a short overview how to compile Wine-Compholio, but of course not +will give a short overview how to compile Wine Staging, but of course not explain all details. Make sure to install all required Wine dependencies before proceeding. As the first step please grab the latest Wine source: ```bash wget http://prdownloads.sourceforge.net/wine/wine-1.7.30.tar.bz2 -wget https://github.com/compholio/wine-compholio-daily/archive/v1.7.30.tar.gz +wget https://github.com/wine-compholio/wine-staging/archive/v1.7.30.tar.gz ``` Extract the archives: @@ -49,7 +49,7 @@ make -C ./patches DESTDIR=$(pwd) install ``` Afterwards run configure (you can also specify a prefix if you don't want to install -Wine-Compholio system-wide): +Wine Staging system-wide): ```bash ./configure --with-xattr ``` @@ -93,11 +93,11 @@ make -C ./patches DESTDIR=$(pwd) PATCHLIST="DIRNAME1.ok DIRNAME2.ok" install ``` -Contributing to Wine-Compholio -============================== +Contributing to Wine Staging +============================ -Please note that Wine-Compholio is not just an arbitrary collection of Wine -patches. We see Wine-Compholio as a **testing version** in preparation for +Please note that Wine Staging is not just an arbitrary collection of Wine +patches. We see Wine Staging as a **testing version** in preparation for patches to be submitted to upstream Wine. This implies that all patches should at least have a minimum standard quality. Unlike some other PPAs/AURs which provide heavily patched Wine versions, we will not accept hacks for very @@ -126,7 +126,7 @@ for upstream Wine. Attribution guidelines ---------------------- -The Wine "Compholio" Edition repository expects all patches to conform to +The Wine Staging repository expects all patches to conform to Wine's (undocumented) attribution guidelines. There are a variety of ways to attribute patches, but they all involve an additional line to the patch subject: diff --git a/debian/tools/DEVELOPER.md.in b/debian/tools/DEVELOPER.md.in index 851e8fad..43d1ef9d 100644 --- a/debian/tools/DEVELOPER.md.in +++ b/debian/tools/DEVELOPER.md.in @@ -2,16 +2,16 @@ Developers and maintainers guide ================================ This document will provide some information targeted at developers, who -either want to build/package Wine-Compholio for their distribution, but also -for developers who would like to contribute their patches to Wine-Compholio, +either want to build/package Wine Staging for their distribution, but also +for developers who would like to contribute their patches to Wine Staging, to get them included in future releases. -Compiling Wine-Compholio -======================== +Compiling Wine Staging +====================== -**Warning:** Please note that starting with Wine-Compholio 1.7.23 it is +**Warning:** Please note that starting with Staging 1.7.23 it is deprecated to manually apply patches without using the Makefile. To avoid typical pitfalls for package maintainers (like trying to use the patch commandline utility for binary patches or not updating the patchlist) it is @@ -26,14 +26,14 @@ Instructions The following instructions (based on the [Gentoo Wiki](https://wiki.gentoo.org/wiki/Netflix/Pipelight#Compiling_manually)) -will give a short overview how to compile Wine-Compholio, but of course not +will give a short overview how to compile Wine Staging, but of course not explain all details. Make sure to install all required Wine dependencies before proceeding. As the first step please grab the latest Wine source: ```bash wget http://prdownloads.sourceforge.net/wine/wine-{version}.tar.bz2 -wget https://github.com/compholio/wine-compholio-daily/archive/v{version}.tar.gz +wget https://github.com/wine-compholio/wine-staging/archive/v{version}.tar.gz ``` Extract the archives: @@ -49,7 +49,7 @@ make -C ./patches DESTDIR=$(pwd) install ``` Afterwards run configure (you can also specify a prefix if you don't want to install -Wine-Compholio system-wide): +Wine Staging system-wide): ```bash ./configure --with-xattr ``` @@ -93,11 +93,11 @@ make -C ./patches DESTDIR=$(pwd) PATCHLIST="DIRNAME1.ok DIRNAME2.ok" install ``` -Contributing to Wine-Compholio -============================== +Contributing to Wine Staging +============================ -Please note that Wine-Compholio is not just an arbitrary collection of Wine -patches. We see Wine-Compholio as a **testing version** in preparation for +Please note that Wine Staging is not just an arbitrary collection of Wine +patches. We see Wine Staging as a **testing version** in preparation for patches to be submitted to upstream Wine. This implies that all patches should at least have a minimum standard quality. Unlike some other PPAs/AURs which provide heavily patched Wine versions, we will not accept hacks for very @@ -126,7 +126,7 @@ for upstream Wine. Attribution guidelines ---------------------- -The Wine "Compholio" Edition repository expects all patches to conform to +The Wine Staging repository expects all patches to conform to Wine's (undocumented) attribution guidelines. There are a variety of ways to attribute patches, but they all involve an additional line to the patch subject: