From 024c4a0eba0566e633ae0792bbaa802554b21b06 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Fri, 3 Aug 2012 02:13:40 +0200 Subject: [PATCH] Superseded former way of managing patches for k3b on Debian and Ubuntu --- debian/squeeze/applications/k3b/debian/control | 2 +- debian/squeeze/applications/k3b/debian/patches/series | 1 + debian/squeeze/applications/k3b/debian/rules | 2 +- ubuntu/maverick/applications/k3b/debian/control | 2 +- ubuntu/maverick/applications/k3b/debian/patches/series | 1 + ubuntu/maverick/applications/k3b/debian/rules | 2 +- 6 files changed, 6 insertions(+), 4 deletions(-) create mode 100644 debian/squeeze/applications/k3b/debian/patches/series create mode 100644 ubuntu/maverick/applications/k3b/debian/patches/series diff --git a/debian/squeeze/applications/k3b/debian/control b/debian/squeeze/applications/k3b/debian/control index ae97f656c..3da13a4a7 100644 --- a/debian/squeeze/applications/k3b/debian/control +++ b/debian/squeeze/applications/k3b/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: Timothy Pearson XSBC-Original-Maintainer: Debian KDE Extras Team Uploaders: Francois Marier , Fathi Boudra -Build-Depends: libdvdread4, libdvdread-dev, alsa, libasound2-dev, lame, libmp3lame-dev, debhelper (>= 6), cdbs (>= 0.4.52ubuntu18), kdelibs4-trinity-dev (>= 3.5.0), libflac++-dev (>= 1.1.2), flac, libdbus-tqt-1-dev, libhal-dev (>= 0.5.5.1), libhal-storage-dev (>= 0.5.5.1), libpopt-dev, libmpcdec-dev, libtag1-dev (>= 1.4-3), libmusicbrainz4-dev (>= 2.1.1-4.1), libmad0-dev, chrpath, libavformat-dev, libavcodec-dev, libvorbis-dev, automake, autoconf, libtool, libltdl-dev +Build-Depends: libdvdread4, libdvdread-dev, alsa, libasound2-dev, lame, libmp3lame-dev, debhelper (>= 6), quilt, cdbs (>= 0.4.52ubuntu18), kdelibs4-trinity-dev (>= 3.5.0), libflac++-dev (>= 1.1.2), flac, libdbus-tqt-1-dev, libhal-dev (>= 0.5.5.1), libhal-storage-dev (>= 0.5.5.1), libpopt-dev, libmpcdec-dev, libtag1-dev (>= 1.4-3), libmusicbrainz4-dev (>= 2.1.1-4.1), libmad0-dev, chrpath, libavformat-dev, libavcodec-dev, libvorbis-dev, automake, autoconf, libtool, libltdl-dev Standards-Version: 3.8.4 Homepage: http://www.k3b.org diff --git a/debian/squeeze/applications/k3b/debian/patches/series b/debian/squeeze/applications/k3b/debian/patches/series new file mode 100644 index 000000000..bff63cb8c --- /dev/null +++ b/debian/squeeze/applications/k3b/debian/patches/series @@ -0,0 +1 @@ +111_advice_kubuntu_restricted_extras.diff diff --git a/debian/squeeze/applications/k3b/debian/rules b/debian/squeeze/applications/k3b/debian/rules index fa308829e..dad8420be 100755 --- a/debian/squeeze/applications/k3b/debian/rules +++ b/debian/squeeze/applications/k3b/debian/rules @@ -1,7 +1,7 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/rules/simple-patchsys.mk +#include /usr/share/cdbs/1/rules/simple-patchsys.mk include debian/cdbs/kde.mk DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde5 diff --git a/ubuntu/maverick/applications/k3b/debian/control b/ubuntu/maverick/applications/k3b/debian/control index 0029d1c47..71c362f54 100644 --- a/ubuntu/maverick/applications/k3b/debian/control +++ b/ubuntu/maverick/applications/k3b/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: Timothy Pearson XSBC-Original-Maintainer: Debian KDE Extras Team Uploaders: Francois Marier , Fathi Boudra -Build-Depends: libdvdread4, libdvdread-dev, alsa, libasound2-dev, lame, libmp3lame-dev, debhelper (>= 6), cdbs (>= 0.4.52ubuntu18), kdelibs4-trinity-dev (>= 3.5.0), libflac++-dev (>= 1.1.2), flac, libdbus-tqt-1-dev, libhal-dev (>= 0.5.5.1), libhal-storage-dev (>= 0.5.5.1), libpopt-dev, libmpcdec-dev, libtag1-dev (>= 1.4-3), libmusicbrainz4-dev (>= 2.1.1-4.1), libmad0-dev, chrpath, libavformat-dev, libavcodec-dev, libvorbis-dev, automake, autoconf, libtool, libltdl-dev +Build-Depends: libdvdread4, libdvdread-dev, alsa, libasound2-dev, lame, libmp3lame-dev, debhelper (>= 6), quilt, cdbs (>= 0.4.52ubuntu18), kdelibs4-trinity-dev (>= 3.5.0), libflac++-dev (>= 1.1.2), flac, libdbus-tqt-1-dev, libhal-dev (>= 0.5.5.1), libhal-storage-dev (>= 0.5.5.1), libpopt-dev, libmpcdec-dev, libtag1-dev (>= 1.4-3), libmusicbrainz4-dev (>= 2.1.1-4.1), libmad0-dev, chrpath, libavformat-dev, libavcodec-dev, libvorbis-dev, automake, autoconf, libtool, libltdl-dev Standards-Version: 3.8.4 Homepage: http://www.k3b.org diff --git a/ubuntu/maverick/applications/k3b/debian/patches/series b/ubuntu/maverick/applications/k3b/debian/patches/series new file mode 100644 index 000000000..bff63cb8c --- /dev/null +++ b/ubuntu/maverick/applications/k3b/debian/patches/series @@ -0,0 +1 @@ +111_advice_kubuntu_restricted_extras.diff diff --git a/ubuntu/maverick/applications/k3b/debian/rules b/ubuntu/maverick/applications/k3b/debian/rules index fa308829e..dad8420be 100755 --- a/ubuntu/maverick/applications/k3b/debian/rules +++ b/ubuntu/maverick/applications/k3b/debian/rules @@ -1,7 +1,7 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/rules/simple-patchsys.mk +#include /usr/share/cdbs/1/rules/simple-patchsys.mk include debian/cdbs/kde.mk DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde5