Superseded former way of managing patches for kdeartwork on Debian and Ubuntu

9 files changed, 12 insertions, 10 deletions

diff --git a/debian/lenny/kdeartwork/debian/patches/debianize-xscreensaver-root-hack.diff b/debian/lenny/kdeartwork/debian/patches/debianize-xscreensaver-root-hack.diff
index 6e443209c..f93aa0706 100644
--- a/debian/lenny/kdeartwork/debian/patches/debianize-xscreensaver-root-hack.diff
+++ b/debian/lenny/kdeartwork/debian/patches/debianize-xscreensaver-root-hack.diff
@@ -1,6 +1,6 @@
 diff -urN kscreensaver/krootbacking/Makefile.am kscreensaver/krootbacking/Makefile.am
---- kscreensaver/krootbacking/Makefile.am
-+++ kscreensaver/krootbacking/Makefile.am
+--- a/kscreensaver/krootbacking/Makefile.am
++++ b/kscreensaver/krootbacking/Makefile.am
 @@ -1,6 +1,6 @@
  INCLUDES = $(all_includes)
  
diff --git a/debian/squeeze/kdeartwork/debian/control b/debian/squeeze/kdeartwork/debian/control
index d83fa3d34..42943de98 100644
--- a/debian/squeeze/kdeartwork/debian/control
+++ b/debian/squeeze/kdeartwork/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Ubuntu Core developers <ubuntu-devel-discuss@lists.ubuntu.com>
 XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
 Uploaders: Ana Beatriz Guerrero Lopez <ana@debian.org>, Christopher Martin <chrsmrtn@debian.org>, Sune Vuorela <debian@pusling.com>
-Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, kdelibs4-trinity-dev, gawk, gettext, sharutils, kdebase-trinity-dev, kwin-trinity, libgl1-mesa-dev | libgl-dev, libglu1-mesa-dev | libglu-dev, xscreensaver, xscreensaver-gl, xscreensaver-data, xscreensaver-data-extra, xscreensaver-gl-extra, rss-glx, fireflies, automake, autoconf, libtool, libltdl-dev
+Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), quilt, autotools-dev, kdelibs4-trinity-dev, gawk, gettext, sharutils, kdebase-trinity-dev, kwin-trinity, libgl1-mesa-dev | libgl-dev, libglu1-mesa-dev | libglu-dev, xscreensaver, xscreensaver-gl, xscreensaver-data, xscreensaver-data-extra, xscreensaver-gl-extra, rss-glx, fireflies, automake, autoconf, libtool, libltdl-dev
 Build-Conflicts: autoconf2.13, nvidia-glx
 Standards-Version: 3.8.4
 
diff --git a/debian/squeeze/kdeartwork/debian/patches/debianize-xscreensaver-root-hack.diff b/debian/squeeze/kdeartwork/debian/patches/debianize-xscreensaver-root-hack.diff
index 6e443209c..f93aa0706 100644
--- a/debian/squeeze/kdeartwork/debian/patches/debianize-xscreensaver-root-hack.diff
+++ b/debian/squeeze/kdeartwork/debian/patches/debianize-xscreensaver-root-hack.diff
@@ -1,6 +1,6 @@
 diff -urN kscreensaver/krootbacking/Makefile.am kscreensaver/krootbacking/Makefile.am
---- kscreensaver/krootbacking/Makefile.am
-+++ kscreensaver/krootbacking/Makefile.am
+--- a/kscreensaver/krootbacking/Makefile.am
++++ b/kscreensaver/krootbacking/Makefile.am
 @@ -1,6 +1,6 @@
  INCLUDES = $(all_includes)
  
diff --git a/debian/squeeze/kdeartwork/debian/patches/series b/debian/squeeze/kdeartwork/debian/patches/series
new file mode 100644
index 000000000..68d619961
--- /dev/null
+++ b/debian/squeeze/kdeartwork/debian/patches/series
@@ -0,0 +1 @@
+debianize-xscreensaver-root-hack.diff
diff --git a/debian/squeeze/kdeartwork/debian/rules b/debian/squeeze/kdeartwork/debian/rules
index 1a593022d..3602aa5c2 100755
--- a/debian/squeeze/kdeartwork/debian/rules
+++ b/debian/squeeze/kdeartwork/debian/rules
@@ -2,7 +2,7 @@
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 include debian/cdbs/debian-qt-kde.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
+#include /usr/share/cdbs/1/rules/simple-patchsys.mk
 include /usr/share/cdbs/1/rules/utils.mk
 
 DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
diff --git a/ubuntu/maverick/kdeartwork/debian/control b/ubuntu/maverick/kdeartwork/debian/control
index 391ca8986..b82586954 100644
--- a/ubuntu/maverick/kdeartwork/debian/control
+++ b/ubuntu/maverick/kdeartwork/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Ubuntu Core developers <ubuntu-devel-discuss@lists.ubuntu.com>
 XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
 Uploaders: Ana Beatriz Guerrero Lopez <ana@debian.org>, Christopher Martin <chrsmrtn@debian.org>, Sune Vuorela <debian@pusling.com>
-Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, kdelibs4-trinity-dev, gawk, gettext, sharutils, kdebase-trinity-dev, kwin-trinity, libgl1-mesa-dev | libgl-dev, libglu1-mesa-dev | libglu-dev, xscreensaver, xscreensaver-gl, xscreensaver-data, xscreensaver-data-extra, xscreensaver-gl-extra, rss-glx, fireflies, automake, autoconf, libtool, libltdl-dev
+Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), quilt, autotools-dev, kdelibs4-trinity-dev, gawk, gettext, sharutils, kdebase-trinity-dev, kwin-trinity, libgl1-mesa-dev | libgl-dev, libglu1-mesa-dev | libglu-dev, xscreensaver, xscreensaver-gl, xscreensaver-data, xscreensaver-data-extra, xscreensaver-gl-extra, rss-glx, fireflies, automake, autoconf, libtool, libltdl-dev
 Build-Conflicts: autoconf2.13, nvidia-glx
 Standards-Version: 3.8.4
 
diff --git a/ubuntu/maverick/kdeartwork/debian/patches/debianize-xscreensaver-root-hack.diff b/ubuntu/maverick/kdeartwork/debian/patches/debianize-xscreensaver-root-hack.diff
index 6e443209c..f93aa0706 100644
--- a/ubuntu/maverick/kdeartwork/debian/patches/debianize-xscreensaver-root-hack.diff
+++ b/ubuntu/maverick/kdeartwork/debian/patches/debianize-xscreensaver-root-hack.diff
@@ -1,6 +1,6 @@
 diff -urN kscreensaver/krootbacking/Makefile.am kscreensaver/krootbacking/Makefile.am
---- kscreensaver/krootbacking/Makefile.am
-+++ kscreensaver/krootbacking/Makefile.am
+--- a/kscreensaver/krootbacking/Makefile.am
++++ b/kscreensaver/krootbacking/Makefile.am
 @@ -1,6 +1,6 @@
  INCLUDES = $(all_includes)
  
diff --git a/ubuntu/maverick/kdeartwork/debian/patches/series b/ubuntu/maverick/kdeartwork/debian/patches/series
new file mode 100644
index 000000000..68d619961
--- /dev/null
+++ b/ubuntu/maverick/kdeartwork/debian/patches/series
@@ -0,0 +1 @@
+debianize-xscreensaver-root-hack.diff
diff --git a/ubuntu/maverick/kdeartwork/debian/rules b/ubuntu/maverick/kdeartwork/debian/rules
index 1a593022d..3602aa5c2 100755
--- a/ubuntu/maverick/kdeartwork/debian/rules
+++ b/ubuntu/maverick/kdeartwork/debian/rules
@@ -2,7 +2,7 @@
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 include debian/cdbs/debian-qt-kde.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
+#include /usr/share/cdbs/1/rules/simple-patchsys.mk
 include /usr/share/cdbs/1/rules/utils.mk
 
 DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde