This patch is now unnecessary, as we have removed the SETSTYLE and LOCAL_*_DIR macros and have added the USER_*_DIR upstream. --- debian/patches/54_Debian_wmmacros.diff | 31 ------------------------------- debian/patches/series | 1 - 2 files changed, 32 deletions(-) delete mode 100644 debian/patches/54_Debian_wmmacros.diff
diff --git a/debian/patches/54_Debian_wmmacros.diff b/debian/patches/54_Debian_wmmacros.diff deleted file mode 100644 index 6d03765d..00000000 --- a/debian/patches/54_Debian_wmmacros.diff +++ /dev/null @@ -1,31 +0,0 @@ -Description: Macros for user paths. Based on Marcelo E. Magallon <mmaga...@debian.org> diff patch. -Author: Rodolfo García Peñas (kix) <k...@kix.es> -Last-Update: 2012-01-09 -Index: wmaker-crm/WindowMaker/wmmacros -=================================================================== ---- wmaker-crm.orig/WindowMaker/wmmacros -+++ wmaker-crm/WindowMaker/wmmacros -@@ -22,7 +22,7 @@ - /* - * SETSTYLE FILE - loads a style file - */ --#define SETSTYLE EXEC cd $HOME/GNUstep/Library/WindowMaker/Styles; setstyle -+#define SETSTYLE EXEC cd $GNUSTEP_USER_ROOT/Library/WindowMaker/Styles; setstyle - - - /* -@@ -60,6 +60,14 @@ - #define STYLES_DIR #wmdatadir#/Styles - #define ICON_SETS_DIR #wmdatadir#/IconSets - #define BACKGROUNDS_DIR #wmdatadir#/Backgrounds -+#define LOCAL_THEMES_DIR /usr/local/share/WindowMaker/Themes -+#define LOCAL_STYLES_DIR /usr/local/share/WindowMaker/Styles -+#define LOCAL_ICON_SETS_DIR /usr/local/share/WindowMaker/IconSets -+#define LOCAL_BACKGROUNDS_DIR /usr/local/share/WindowMaker/Backgrounds -+#define USER_THEMES_DIR $GNUSTEP_USER_ROOT/Library/WindowMaker/Themes -+#define USER_STYLES_DIR $GNUSTEP_USER_ROOT/Library/WindowMaker/Styles -+#define USER_ICON_SETS_DIR $GNUSTEP_USER_ROOT/Library/WindowMaker/IconSets -+#define USER_BACKGROUNDS_DIR $GNUSTEP_USER_ROOT/Library/WindowMaker/Backgrounds - - - #define StaticGray 0 diff --git a/debian/patches/series b/debian/patches/series index 1dd24210..451a939d 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +1 @@ 53_Debian_WMState.diff -54_Debian_wmmacros.diff -- 2.11.0 -- To unsubscribe, send mail to wmaker-dev-unsubscr...@lists.windowmaker.org.
