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

v3.5.13-sru
Slávek Banko 13 years ago
parent eb2d5ae1ef
commit 499965e087

@ -1,6 +1,6 @@
diff -urN kscreensaver/krootbacking/Makefile.am kscreensaver/krootbacking/Makefile.am diff -urN kscreensaver/krootbacking/Makefile.am kscreensaver/krootbacking/Makefile.am
--- kscreensaver/krootbacking/Makefile.am --- a/kscreensaver/krootbacking/Makefile.am
+++ kscreensaver/krootbacking/Makefile.am +++ b/kscreensaver/krootbacking/Makefile.am
@@ -1,6 +1,6 @@ @@ -1,6 +1,6 @@
INCLUDES = $(all_includes) INCLUDES = $(all_includes)

@ -4,7 +4,7 @@ Priority: optional
Maintainer: Ubuntu Core developers <ubuntu-devel-discuss@lists.ubuntu.com> Maintainer: Ubuntu Core developers <ubuntu-devel-discuss@lists.ubuntu.com>
XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> 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> 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 Build-Conflicts: autoconf2.13, nvidia-glx
Standards-Version: 3.8.4 Standards-Version: 3.8.4

@ -1,6 +1,6 @@
diff -urN kscreensaver/krootbacking/Makefile.am kscreensaver/krootbacking/Makefile.am diff -urN kscreensaver/krootbacking/Makefile.am kscreensaver/krootbacking/Makefile.am
--- kscreensaver/krootbacking/Makefile.am --- a/kscreensaver/krootbacking/Makefile.am
+++ kscreensaver/krootbacking/Makefile.am +++ b/kscreensaver/krootbacking/Makefile.am
@@ -1,6 +1,6 @@ @@ -1,6 +1,6 @@
INCLUDES = $(all_includes) INCLUDES = $(all_includes)

@ -0,0 +1 @@
debianize-xscreensaver-root-hack.diff

@ -2,7 +2,7 @@
include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/rules/debhelper.mk
include debian/cdbs/debian-qt-kde.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 include /usr/share/cdbs/1/rules/utils.mk
DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde

@ -4,7 +4,7 @@ Priority: optional
Maintainer: Ubuntu Core developers <ubuntu-devel-discuss@lists.ubuntu.com> Maintainer: Ubuntu Core developers <ubuntu-devel-discuss@lists.ubuntu.com>
XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> 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> 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 Build-Conflicts: autoconf2.13, nvidia-glx
Standards-Version: 3.8.4 Standards-Version: 3.8.4

@ -1,6 +1,6 @@
diff -urN kscreensaver/krootbacking/Makefile.am kscreensaver/krootbacking/Makefile.am diff -urN kscreensaver/krootbacking/Makefile.am kscreensaver/krootbacking/Makefile.am
--- kscreensaver/krootbacking/Makefile.am --- a/kscreensaver/krootbacking/Makefile.am
+++ kscreensaver/krootbacking/Makefile.am +++ b/kscreensaver/krootbacking/Makefile.am
@@ -1,6 +1,6 @@ @@ -1,6 +1,6 @@
INCLUDES = $(all_includes) INCLUDES = $(all_includes)

@ -0,0 +1 @@
debianize-xscreensaver-root-hack.diff

@ -2,7 +2,7 @@
include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/rules/debhelper.mk
include debian/cdbs/debian-qt-kde.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 include /usr/share/cdbs/1/rules/utils.mk
DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde

Loading…
Cancel
Save