* Use quilt to handle patches.debian/0.79.0-3

* Add already applied patch 1001 to install cursor files executable.
* Add already applied patch 2001 to use empy from system.
* Semi-auto-update debian/control to update build-dependencies:
    DEB_AUTO_UPDATE_DEBIAN_CONTROL=yes fakeroot debian/rules clean

9 files changed, 44 insertions, 8 deletions

diff --git a/cursor/sugar/Makefile.am b/cursor/sugar/Makefile.am
index 27f20ff..cb9beec 100644
--- a/cursor/sugar/Makefile.am
+++ b/cursor/sugar/Makefile.am
@@ -31,7 +31,7 @@ clean-local:
 install-data-local:
 	$(mkinstalldirs) $(DESTDIR)$(datadir)/icons/sugar/cursors/
 	for i in `cd $(THEME_DIR) && echo *` ; do					\
-	  $(INSTALL) -m u=rw,go=r $(THEME_DIR)/$$i $(DESTDIR)$(datadir)/icons/sugar/cursors/$$i ;	\
+	  $(INSTALL) $(THEME_DIR)/$$i $(DESTDIR)$(datadir)/icons/sugar/cursors/$$i ;	\
 	done
 
 uninstall-local:
diff --git a/debian/changelog b/debian/changelog
index 1c4188b..a3fc69d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,16 @@
-sugar-artwork (0.79.0-3) UNRELEASED; urgency=low
+sugar-artwork (0.79.0-3) unstable; urgency=low
 
   * Pass over maintenance of the package to the OLPC team: Change
     Maintainer, and add myself to Uploaders.
   * Fix README.packaging to use "pull; fetch --tags" (not "pull -t").
   * Fix email address of OLPC Alioth team.
+  * Use quilt to handle patches.
+  * Add already applied patch 1001 to install cursor files executable.
+  * Add already applied patch 2001 to use empy from system.
+  * Semi-auto-update debian/control to update build-dependencies:
+      DEB_AUTO_UPDATE_DEBIAN_CONTROL=yes fakeroot debian/rules clean
 
- -- Jonas Smedegaard <dr@jones.dk>  Sun, 16 Mar 2008 14:01:24 +0100
+ -- Jonas Smedegaard <dr@jones.dk>  Sun, 16 Mar 2008 14:12:30 +0100
 
 sugar-artwork (0.79.0-2) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 3e295c7..f11395e 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: x11
 Priority: optional
 Maintainer: Debian OLPC <debian-olpc-devel@lists.alioth.debian.org>
 Uploaders: Jonas Smedegaard <dr@jones.dk>
-Build-Depends: cdbs (>= 0.4.39), libtool, automake, autoconf, debhelper (>= 5), devscripts (>= 2.10.7), dh-buildinfo, libgtk2.0-dev, libglib2.0-dev, libcairo2-dev, python-empy, x11-apps | xbase-clients
+Build-Depends: cdbs (>= 0.4.39), devscripts (>= 2.10.7), quilt, patchutils (>= 0.2.25), libtool, automake, autoconf, debhelper (>= 5), dh-buildinfo, libgtk2.0-dev, libglib2.0-dev, libcairo2-dev, python-empy, x11-apps | xbase-clients
 Standards-Version: 3.7.3
 Vcs-Git: git://git.debian.org/git/collab-maint/sugar-artwork.git
 Vcs-Browser: http://git.debian.org/?p=collab-maint/sugar-artwork.git;a=summary
diff --git a/debian/patches/1001_cursorfiles_noexec.patch b/debian/patches/1001_cursorfiles_noexec.patch
new file mode 100644
index 0000000..883e242
--- /dev/null
+++ b/debian/patches/1001_cursorfiles_noexec.patch
@@ -0,0 +1,11 @@
+--- sugar-artwork-0.79.0.orig/cursor/sugar/Makefile.am
++++ sugar-artwork-0.79.0/cursor/sugar/Makefile.am
+@@ -31,7 +31,7 @@
+ install-data-local:
+ 	$(mkinstalldirs) $(DESTDIR)$(datadir)/icons/sugar/cursors/
+ 	for i in `cd $(THEME_DIR) && echo *` ; do					\
+-	  $(INSTALL) $(THEME_DIR)/$$i $(DESTDIR)$(datadir)/icons/sugar/cursors/$$i ;	\
++	  $(INSTALL) -m u=rw,go=r $(THEME_DIR)/$$i $(DESTDIR)$(datadir)/icons/sugar/cursors/$$i ;	\
+ 	done
+ 
+ uninstall-local:
diff --git a/debian/patches/2001_empy_from_system.patch b/debian/patches/2001_empy_from_system.patch
new file mode 100644
index 0000000..ed336fe
--- /dev/null
+++ b/debian/patches/2001_empy_from_system.patch
@@ -0,0 +1,14 @@
+--- sugar-artwork-0.79.0.orig/gtk/theme/Makefile.am
++++ sugar-artwork-0.79.0/gtk/theme/Makefile.am
+@@ -1,9 +1,9 @@
+ sugar.gtkrc: gtkrc.em
+-	$(srcdir)/em.py -p $$ -D theme=\'sugar\' $(srcdir)/gtkrc.em > \
++	empy -p $$ -D theme=\'sugar\' $(srcdir)/gtkrc.em > \
+ 		$(top_builddir)/gtk/theme/sugar.gtkrc
+ 
+ sugar-xo.gtkrc: gtkrc.em
+-	$(srcdir)/em.py -p $$ -D theme=\'sugar-xo\' $(srcdir)/gtkrc.em > \
++	empy -p $$ -D theme=\'sugar-xo\' $(srcdir)/gtkrc.em > \
+ 		$(top_builddir)/gtk/theme/sugar-xo.gtkrc
+ 
+ clean:
diff --git a/debian/patches/README b/debian/patches/README
new file mode 100644
index 0000000..80c1584
--- /dev/null
+++ b/debian/patches/README
@@ -0,0 +1,3 @@
+0xxx: Grabbed from upstream development.
+1xxx: Possibly relevant for upstream adoption.
+2xxx: Only relevant for official Debian release.
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..53de102
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,2 @@
+1001_cursorfiles_noexec.patch
+2001_empy_from_system.patch
diff --git a/debian/rules b/debian/rules
index e4c4b0d..86c7836 100755
--- a/debian/rules
+++ b/debian/rules
@@ -8,9 +8,10 @@ DEB_AUTO_UPDATE_AUTOMAKE = 1.10
 DEB_AUTO_UPDATE_AUTOCONF = 2.61
 DEB_AUTO_UPDATE_LIBTOOL = pre
 include debian/cdbs/1/rules/upstream-tarball.mk
+include debian/cdbs/1/rules/copyright-check.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 include /usr/share/cdbs/1/class/autotools.mk
 include /usr/share/cdbs/1/rules/debhelper.mk
-include debian/cdbs/1/rules/copyright-check.mk
 include debian/cdbs/1/rules/buildinfo.mk
 
 pkg = sugar-artwork
@@ -37,4 +38,4 @@ CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), libgtk2.0-dev, libglib2.0-dev, libc
 CDBS_BUILD_DEPENDS := $(shell echo '$(CDBS_BUILD_DEPENDS)' | sed -e 's/\bautomake1\.10\b/automake/')
 
 # Merge duplicate build-dependencies
-CDBS_BUILD_DEPENDS := $(shell echo '$(CDBS_BUILD_DEPENDS)' | sed -e '/\bcdbs (>= 0.4.39)/ s/ *,* *\bcdbs (>= \(0.4.23-1.1\)) *,* */, /g' -e 's/^ *, *//' -e 's/ *, *$$//')
+CDBS_BUILD_DEPENDS := $(shell echo '$(CDBS_BUILD_DEPENDS)' | sed -e '/\bcdbs (>= 0.4.39)/ s/ *,* *\bcdbs (>= \(0.4.23-1.1\|0.4.27-1\)) *,* */, /g' -e 's/^ *, *//' -e 's/ *, *$$//')
diff --git a/gtk/theme/Makefile.am b/gtk/theme/Makefile.am
index 97c15b2..f6b1229 100644
--- a/gtk/theme/Makefile.am
+++ b/gtk/theme/Makefile.am
@@ -1,9 +1,9 @@
 sugar.gtkrc: gtkrc.em
-	empy -p $$ -D theme=\'sugar\' $(srcdir)/gtkrc.em > \
+	$(srcdir)/em.py -p $$ -D theme=\'sugar\' $(srcdir)/gtkrc.em > \
 		$(top_builddir)/gtk/theme/sugar.gtkrc
 
 sugar-xo.gtkrc: gtkrc.em
-	empy -p $$ -D theme=\'sugar-xo\' $(srcdir)/gtkrc.em > \
+	$(srcdir)/em.py -p $$ -D theme=\'sugar-xo\' $(srcdir)/gtkrc.em > \
 		$(top_builddir)/gtk/theme/sugar-xo.gtkrc
 
 clean: