From 09778f9d9c769ec0902345d5cc0cc036ee4dc65e Mon Sep 17 00:00:00 2001
From: Ben Finney <ben+debian@benfinney.id.au>
Date: Mon, 21 Oct 2013 12:22:53 +1100
Subject: [PATCH] Update patches for current upstream version.

---
 debian/changelog                       |  1 +
 debian/patches/01-custom-destdir.patch | 57 +++++++++++++---------------------
 2 files changed, 23 insertions(+), 35 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index a55ed64..b522371 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ comixcursors (0.8.1-1) UNRELEASED; urgency=low
   * debian/control:
     + Declare “Standards-Version: 3.9.4”. No further changes required.
   * debian/patches/:
+    + Update for current upstream version.
     + 02-rsvg-convert.patch:
       * Remove, merged upstream.
 
diff --git a/debian/patches/01-custom-destdir.patch b/debian/patches/01-custom-destdir.patch
index 37af072..f157b24 100644
--- a/debian/patches/01-custom-destdir.patch
+++ b/debian/patches/01-custom-destdir.patch
@@ -1,24 +1,24 @@
 Description: Use standard ‘DESTDIR’ environment variable to override destination directory.
 Origin: Created to fix build issues in Debian packaging of multiple binary packages.
 Author: Ben Finney <ben+debian@benfinney.id.au>
-Last-Update: 2010-06-13
+Last-Update: 2010-10-21
 
 === modified file 'Makefile'
---- old/Makefile	2010-06-03 02:52:32 +0000
-+++ new/Makefile	2010-06-13 04:54:24 +0000
+--- old/Makefile	revid:j.luetkens@limitland.de-20131020101727-lqhw2cewy2xsaz2m
++++ new/Makefile	2013-10-21 00:24:21 +0000
 @@ -27,7 +27,6 @@
  CURSORSNAME = ComixCursors
  PACKAGENAME ?= ${CURSORSNAME}
  SUMMARY ?= The original Comix Cursors
 -ICONSDIR ?= ${HOME}/.icons
- THEMENAME ?= custom
+ THEMENAME ?= Custom
  
  GENERATED_FILES :=
 @@ -49,8 +48,14 @@
- xcursor_builddir = cursors
- distdir = dist
+ configfile = ${configdir}/${THEMENAME}.CONFIG
+ themefile = ${builddir}/${THEMENAME}.theme
  
--destdir = ${ICONSDIR}/${CURSORSNAME}-${THEMENAME}
+-destdir = ${ICONSDIR}/${CURSORSNAME}${THEMEOPTIONS}${THEMEINCLUDE}${SIZENAME}-${THEMENAME}
 -xcursor_destdir = ${destdir}/cursors
 +ifdef DESTDIR
 +icons_destdir = ${DESTDIR}/usr/share/icons
@@ -29,8 +29,8 @@ Last-Update: 2010-06-13
 +theme_destdir = ${icons_destdir}/${CURSORSNAME}-${THEMENAME}
 +xcursor_destdir = ${theme_destdir}/cursors
  
- template_configfile = ${configdir}/custom.CONFIG
- template_themefile = ${configdir}/custom.theme
+ template_configfile = ${configdir}/Custom.CONFIG
+ template_themefile = ${configdir}/Custom.theme
 @@ -89,22 +94,22 @@
  .PHONY: install
  install: all
@@ -45,8 +45,8 @@ Last-Update: 2010-06-13
  	install -m u=rw,go=r "${xcursor_builddir}"/* "${xcursor_destdir}"
  
  # Install the theme configuration file.
--	install -m u=rw,go=r "${themefile}" "${destdir}"/index.theme
-+	install -m u=rw,go=r "${themefile}" "${theme_destdir}"/index.theme
+-	install -m u=rw,go=r "${themefile}" "${destdir}/index.theme"
++	install -m u=rw,go=r "${themefile}" "${theme_destdir}/index.theme"
  
  # Install alternative name symlinks for the cursors.
  	$(LINK_CURSORS) "${xcursor_destdir}"
@@ -60,8 +60,8 @@ Last-Update: 2010-06-13
  .PHONY: custom-theme
 
 === modified file 'build-distribution'
---- old/build-distribution	2010-06-03 02:25:26 +0000
-+++ new/build-distribution	2010-06-13 04:54:24 +0000
+--- old/build-distribution	revid:j.luetkens@limitland.de-20131020101727-lqhw2cewy2xsaz2m
++++ new/build-distribution	2013-10-21 00:28:51 +0000
 @@ -43,6 +43,7 @@
  printf "Packaging %s %s...\n" "$themename_root" $VERSION
  
@@ -70,7 +70,7 @@ Last-Update: 2010-06-13
  
  #
  # source package
-@@ -68,10 +69,9 @@
+@@ -68,9 +69,9 @@
  printf "Installing cursor files...\n"
  
  # Make a temporary directory for installing icons into.
@@ -78,12 +78,12 @@ Last-Update: 2010-06-13
 -export ICONSDIR
 -mkdir --parents "${ICONSDIR}"
 +icons_destdir="${DESTDIR}/usr/share/icons"
- 
++
 +export DESTDIR
+ 
  ./install-all
  
- function package_variant {
-@@ -93,7 +93,7 @@
+@@ -93,7 +94,7 @@
  
      packagedir="${workdir}/${PACKAGENAME}"
      mkdir --parents "$packagedir"
@@ -94,8 +94,8 @@ Last-Update: 2010-06-13
      tar -cjf "$tarfile" --directory "$packagedir" --files-from <(
 
 === modified file 'install-all'
---- old/install-all	2010-06-02 11:53:50 +0000
-+++ new/install-all	2010-06-13 04:54:24 +0000
+--- old/install-all	revid:j.luetkens@limitland.de-20131020101727-lqhw2cewy2xsaz2m
++++ new/install-all	2013-10-21 00:28:45 +0000
 @@ -27,10 +27,6 @@
  
  bindir="$(dirname $0)"/bin
@@ -104,20 +104,7 @@ Last-Update: 2010-06-13
 -ICONSDIR=${ICONSDIR:-~/.icons}
 -export ICONSDIR
 -
- # argument processing and usage
- function show_usage_message {
-     cat <<_EOT_
-@@ -66,9 +62,9 @@
-     # Build the cursors for a particular theme.
-     THEMENAME="$1"
- 
--    destdir="${ICONSDIR}/${themename_stem}-${THEMENAME}"
--    if [ -d "${destdir}" ] ; then
--        rm -r "${destdir}"
-+    theme_destdir="${DESTDIR}/${themename_stem}-${THEMENAME}"
-+    if [ -d "${theme_destdir}" ] ; then
-+        rm -r "${theme_destdir}"
-     fi
- 
-     export THEMENAME
+ # We want to use cursors with multiple sizes combined.
+ # The script check wether MULTISIZE is exported at all, so don't export 
+ # MULTISIZE if you want distinct cursor sizes, comment it out here or
 
-- 
2.11.4.GIT