From f24915471ea396c53670df51b2affc4af74373bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Sun, 15 Sep 2013 20:29:47 +0200 Subject: Switch patch system from simple to quilt on Debian and Ubuntu --- ubuntu/precise/tdebase/debian/cdbs/debian-qt-kde.mk | 2 ++ ubuntu/precise/tdebase/debian/control | 2 +- .../kubuntu_13_hide_konsolesu_menu_entry.diff | 10 ++++++---- ubuntu/precise/tdebase/debian/patches/series | 21 +++++++++++++++++++++ ubuntu/precise/tdebase/debian/rules | 2 +- 5 files changed, 31 insertions(+), 6 deletions(-) create mode 100644 ubuntu/precise/tdebase/debian/patches/series (limited to 'ubuntu/precise/tdebase/debian') diff --git a/ubuntu/precise/tdebase/debian/cdbs/debian-qt-kde.mk b/ubuntu/precise/tdebase/debian/cdbs/debian-qt-kde.mk index fa0d532f4..ec89756bb 100644 --- a/ubuntu/precise/tdebase/debian/cdbs/debian-qt-kde.mk +++ b/ubuntu/precise/tdebase/debian/cdbs/debian-qt-kde.mk @@ -15,7 +15,9 @@ debian/stamp-cvs-make: include debian/cdbs/kde.mk$(_cdbs_makefile_suffix) include debian/cdbs/uploaders.mk +ifndef _cdbs_rules_patchsys_quilt DEB_PATCHDIRS := debian/patches/common debian/patches +endif DEB_KDE_ENABLE_FINAL := yes DEB_INSTALL_DOCS_ALL := diff --git a/ubuntu/precise/tdebase/debian/control b/ubuntu/precise/tdebase/debian/control index 748ea8bf5..e998c677b 100644 --- a/ubuntu/precise/tdebase/debian/control +++ b/ubuntu/precise/tdebase/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: Timothy Pearson XSBC-Original-Maintainer: Debian Qt/KDE Maintainers Uploaders: Ana Beatriz Guerrero Lopez , Fathi Boudra , Modestas Vainius , Sune Vuorela -Build-Depends: libasound2-dev, cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, gawk, gettext, tdelibs14-trinity-dev, libldap2-dev, libncurses5-dev, libpam0g-dev, libpopt-dev, libraw1394-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libsensors4-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libsmbclient-dev, libusb-dev, libxtst-dev, libfontenc-dev, xscreensaver, xscreensaver-data, xscreensaver-data-extra, libxss-dev, libxcomposite-dev, libxdamage-dev, libxkbfile-dev, xutils, sharutils, texinfo, libavahi-compat-libdnssd-dev (>= 0.4), x11proto-kb-dev, xmkmf | xutils-dev, tdelibs14-trinity, libogg-dev, libdbus-tqt-1-dev, libavahi-tqt-dev, udev, libudev-dev, libdbus-1-tqt-dev, libart-2.0-dev (>= 14.0.0), libtool, libltdl-dev, cmake +Build-Depends: libasound2-dev, cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), quilt, autotools-dev, gawk, gettext, tdelibs14-trinity-dev, libldap2-dev, libncurses5-dev, libpam0g-dev, libpopt-dev, libraw1394-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libsensors4-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libsmbclient-dev, libusb-dev, libxtst-dev, libfontenc-dev, xscreensaver, xscreensaver-data, xscreensaver-data-extra, libxss-dev, libxcomposite-dev, libxdamage-dev, libxkbfile-dev, xutils, sharutils, texinfo, libavahi-compat-libdnssd-dev (>= 0.4), x11proto-kb-dev, xmkmf | xutils-dev, tdelibs14-trinity, libogg-dev, libdbus-tqt-1-dev, libavahi-tqt-dev, udev, libudev-dev, libdbus-1-tqt-dev, libart-2.0-dev (>= 14.0.0), libtool, libltdl-dev, cmake Build-Depends-Indep: doxygen, libtqtinterface-doc, graphviz, gsfonts-x11, tdelibs14-trinity-doc Build-Conflicts: nvidia-glx (<< 1.0.8774-6) Standards-Version: 3.8.4 diff --git a/ubuntu/precise/tdebase/debian/patches/kubuntu_13_hide_konsolesu_menu_entry.diff b/ubuntu/precise/tdebase/debian/patches/kubuntu_13_hide_konsolesu_menu_entry.diff index cd5b0b2eb..9dfccdbd7 100644 --- a/ubuntu/precise/tdebase/debian/patches/kubuntu_13_hide_konsolesu_menu_entry.diff +++ b/ubuntu/precise/tdebase/debian/patches/kubuntu_13_hide_konsolesu_menu_entry.diff @@ -1,7 +1,9 @@ ---- tdebase/konsole/konsolesu.desktop -+++ tdebase/konsole/konsolesu.desktop -@@ -81,3 +81,4 @@ - Name[zh_TW]=終端機程式 - 超級使用者模式 +Index: b/konsole/konsolesu.desktop +=================================================================== +--- a/konsole/konsolesu.desktop ++++ b/konsole/konsolesu.desktop +@@ -82,3 +82,4 @@ + GenericName[zh_TW]=終端機程式 - 超級使用者模式 X-TDE-AuthorizeAction=shell_access Categories=Qt;TDE;X-TDE-System-su; +NoDisplay=true diff --git a/ubuntu/precise/tdebase/debian/patches/series b/ubuntu/precise/tdebase/debian/patches/series new file mode 100644 index 000000000..382f72a04 --- /dev/null +++ b/ubuntu/precise/tdebase/debian/patches/series @@ -0,0 +1,21 @@ +disable_default_tdm_theme.diff +disable_starttde_wallpaper.diff +kubuntu_04_hide_menu_entries.diff +kubuntu_06_hide_home_menu_entry.diff +kubuntu_07_hide_knetattach_menu_entry.diff +kubuntu_08_hide_kcmkicker_menu_entry.diff +kubuntu_09_hide_kpersonaliser_menu_entry.diff +kubuntu_10_hide_kmenuedit_menu_entry.diff +kubuntu_11_hide_kappfinder_menu_entry.diff +kubuntu_13_hide_konsolesu_menu_entry.diff +kubuntu_14_hide_konquerorsu_menu_entry.diff +kubuntu_15_hide_tdefontview_menu_entry.diff +kubuntu_16_hide_kpager_menu_entry.diff +kubuntu_35_hide_klipper_menu_entry.diff +kubuntu_37_hide_tdeprintfax_menu_entry.diff +kubuntu_48_hide_display.diff +kubuntu_70_hide_printers_desktop.diff +kubuntu_78_kcontrol_hide_component_chooser.diff +kubuntu_89_new_logout_ui.diff +kubuntu_9904_hide_kfind.diff +kubuntu_9921_tdm_bulletproof_x.diff diff --git a/ubuntu/precise/tdebase/debian/rules b/ubuntu/precise/tdebase/debian/rules index 4982940b1..af7515161 100755 --- a/ubuntu/precise/tdebase/debian/rules +++ b/ubuntu/precise/tdebase/debian/rules @@ -11,7 +11,7 @@ export LD_LIBRARY_PATH include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/rules/simple-patchsys.mk +include /usr/share/cdbs/1/rules/patchsys-quilt.mk include /usr/share/cdbs/1/rules/utils.mk include debian/cdbs/debian-qt-kde.mk -- cgit v1.2.1