From 94c9bd080585eff86bdbeeb3670b66e1240cc62e Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sat, 5 May 2012 14:20:43 -0500 Subject: [PATCH 01/10] Remove tdeutils build dep on ia32-libs on Debian and Ubuntu --- debian/lenny/tdeutils/debian/control | 2 +- debian/squeeze/tdeutils/debian/control | 2 +- ubuntu/maverick/tdeutils/debian/control | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/debian/lenny/tdeutils/debian/control b/debian/lenny/tdeutils/debian/control index 290f65d7f..8af135969 100644 --- a/debian/lenny/tdeutils/debian/control +++ b/debian/lenny/tdeutils/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: Timothy Pearson XSBC-Original-Maintainer: Debian Qt/KDE Maintainers Uploaders: Ana Beatriz Guerrero Lopez , Christopher Martin , Fathi Boudra , Josh Metzler , Sune Vuorela -Build-Depends: libasound2-dev, ia32-libs [amd64], cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, gawk, gettext, tdelibs4-trinity-dev, tdebase-trinity-dev, libkonq4-trinity-dev, libgmp3-dev, libsnmp-dev, libxpm-dev, python-dev, libxtst-dev, xutils, sharutils, automake, autoconf, libtool, libltdl-dev +Build-Depends: libasound2-dev, cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, gawk, gettext, tdelibs4-trinity-dev, tdebase-trinity-dev, libkonq4-trinity-dev, libgmp3-dev, libsnmp-dev, libxpm-dev, python-dev, libxtst-dev, xutils, sharutils, automake, autoconf, libtool, libltdl-dev Build-Depends-Indep: doxygen, libtqtinterface-doc, graphviz, gsfonts-x11, tdelibs4-trinity-doc Standards-Version: 3.8.4 diff --git a/debian/squeeze/tdeutils/debian/control b/debian/squeeze/tdeutils/debian/control index 290f65d7f..8af135969 100644 --- a/debian/squeeze/tdeutils/debian/control +++ b/debian/squeeze/tdeutils/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: Timothy Pearson XSBC-Original-Maintainer: Debian Qt/KDE Maintainers Uploaders: Ana Beatriz Guerrero Lopez , Christopher Martin , Fathi Boudra , Josh Metzler , Sune Vuorela -Build-Depends: libasound2-dev, ia32-libs [amd64], cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, gawk, gettext, tdelibs4-trinity-dev, tdebase-trinity-dev, libkonq4-trinity-dev, libgmp3-dev, libsnmp-dev, libxpm-dev, python-dev, libxtst-dev, xutils, sharutils, automake, autoconf, libtool, libltdl-dev +Build-Depends: libasound2-dev, cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, gawk, gettext, tdelibs4-trinity-dev, tdebase-trinity-dev, libkonq4-trinity-dev, libgmp3-dev, libsnmp-dev, libxpm-dev, python-dev, libxtst-dev, xutils, sharutils, automake, autoconf, libtool, libltdl-dev Build-Depends-Indep: doxygen, libtqtinterface-doc, graphviz, gsfonts-x11, tdelibs4-trinity-doc Standards-Version: 3.8.4 diff --git a/ubuntu/maverick/tdeutils/debian/control b/ubuntu/maverick/tdeutils/debian/control index 290f65d7f..8af135969 100644 --- a/ubuntu/maverick/tdeutils/debian/control +++ b/ubuntu/maverick/tdeutils/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: Timothy Pearson XSBC-Original-Maintainer: Debian Qt/KDE Maintainers Uploaders: Ana Beatriz Guerrero Lopez , Christopher Martin , Fathi Boudra , Josh Metzler , Sune Vuorela -Build-Depends: libasound2-dev, ia32-libs [amd64], cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, gawk, gettext, tdelibs4-trinity-dev, tdebase-trinity-dev, libkonq4-trinity-dev, libgmp3-dev, libsnmp-dev, libxpm-dev, python-dev, libxtst-dev, xutils, sharutils, automake, autoconf, libtool, libltdl-dev +Build-Depends: libasound2-dev, cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, gawk, gettext, tdelibs4-trinity-dev, tdebase-trinity-dev, libkonq4-trinity-dev, libgmp3-dev, libsnmp-dev, libxpm-dev, python-dev, libxtst-dev, xutils, sharutils, automake, autoconf, libtool, libltdl-dev Build-Depends-Indep: doxygen, libtqtinterface-doc, graphviz, gsfonts-x11, tdelibs4-trinity-doc Standards-Version: 3.8.4 From 1057c1a3e7ae3e43bb15d4a41c3c3a481f0a3e91 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sat, 5 May 2012 17:52:39 -0500 Subject: [PATCH 02/10] Add initial packaging files for kcmautostart on Debian and Ubuntu --- .../kcmautostart/debian/changelog | 37 +++++++++++++++++++ .../applications/kcmautostart/debian/compat | 1 + .../applications/kcmautostart/debian/control | 16 ++++++++ .../kcmautostart/debian/copyright | 32 ++++++++++++++++ .../applications/kcmautostart/debian/rules | 24 ++++++++++++ .../kcmautostart/debian/changelog | 37 +++++++++++++++++++ .../applications/kcmautostart/debian/compat | 1 + .../applications/kcmautostart/debian/control | 16 ++++++++ .../kcmautostart/debian/copyright | 32 ++++++++++++++++ .../applications/kcmautostart/debian/rules | 24 ++++++++++++ .../kcmautostart/debian/changelog | 37 +++++++++++++++++++ .../applications/kcmautostart/debian/compat | 1 + .../applications/kcmautostart/debian/control | 16 ++++++++ .../kcmautostart/debian/copyright | 32 ++++++++++++++++ .../applications/kcmautostart/debian/rules | 24 ++++++++++++ 15 files changed, 330 insertions(+) create mode 100644 debian/lenny/applications/kcmautostart/debian/changelog create mode 100644 debian/lenny/applications/kcmautostart/debian/compat create mode 100644 debian/lenny/applications/kcmautostart/debian/control create mode 100644 debian/lenny/applications/kcmautostart/debian/copyright create mode 100644 debian/lenny/applications/kcmautostart/debian/rules create mode 100644 debian/squeeze/applications/kcmautostart/debian/changelog create mode 100644 debian/squeeze/applications/kcmautostart/debian/compat create mode 100644 debian/squeeze/applications/kcmautostart/debian/control create mode 100644 debian/squeeze/applications/kcmautostart/debian/copyright create mode 100644 debian/squeeze/applications/kcmautostart/debian/rules create mode 100644 ubuntu/maverick/applications/kcmautostart/debian/changelog create mode 100644 ubuntu/maverick/applications/kcmautostart/debian/compat create mode 100644 ubuntu/maverick/applications/kcmautostart/debian/control create mode 100644 ubuntu/maverick/applications/kcmautostart/debian/copyright create mode 100644 ubuntu/maverick/applications/kcmautostart/debian/rules diff --git a/debian/lenny/applications/kcmautostart/debian/changelog b/debian/lenny/applications/kcmautostart/debian/changelog new file mode 100644 index 000000000..4beefe2fa --- /dev/null +++ b/debian/lenny/applications/kcmautostart/debian/changelog @@ -0,0 +1,37 @@ +kcontrol-autostart (0.5-0ubuntu2) gutsy; urgency=low + + * Add kubuntu_03_autostartdesktop.patch to remove duplicate lines in the + desktop file. (LP: #49859) + + -- Breuil Cyril Sun, 20 May 2007 21:10:53 +0200 + +kcontrol-autostart (0.5-0ubuntu1) gutsy; urgency=low + + * New upstream release + * Patch kubuntu_02_poMakefile.patch modifies po/Makefile.am to build pot file. + * Add automake1.9 as build-deps and change standard version to 3.7.2 + * Updated Maintainer field + + -- Breuil Cyril Sun, 20 May 2007 13:52:30 +0200 + +kcontrol-autostart (0.1-0ubuntu3) edgy; urgency=low + + * Removed dh_iconcache (no longer needed for this package) + * Rebuild so it doesnt depend on libgamin0 + + -- Sarah Hobbs Wed, 19 Jul 2006 11:58:50 +1000 + +kcontrol-autostart (0.1-0ubuntu2) dapper; urgency=low + + * Add dh_iconcache + + -- Sarah Hobbs Fri, 28 Apr 2006 15:43:58 +1000 + +kcontrol-autostart (0.1-0ubuntu1) dapper; urgency=low + + * Initial release. + * Patch kubuntu_01_kdepot.patch modifies admin/cvs.sh to build pot file. + * Removed svn-commit.tmp. + + -- Raphaël Pinson Fri, 16 Dec 2005 19:52:51 +0100 + diff --git a/debian/lenny/applications/kcmautostart/debian/compat b/debian/lenny/applications/kcmautostart/debian/compat new file mode 100644 index 000000000..7ed6ff82d --- /dev/null +++ b/debian/lenny/applications/kcmautostart/debian/compat @@ -0,0 +1 @@ +5 diff --git a/debian/lenny/applications/kcmautostart/debian/control b/debian/lenny/applications/kcmautostart/debian/control new file mode 100644 index 000000000..ee5cf9d23 --- /dev/null +++ b/debian/lenny/applications/kcmautostart/debian/control @@ -0,0 +1,16 @@ +Source: kcontrol-autostart-trinity +Section: tde +Priority: optional +Maintainer: Timothy Pearson +XSBC-Original-Maintainer: Raphaël Pinson +Build-Depends: debhelper (>= 5), cdbs, kdelibs4-trinity-dev, automake, autoconf, libtool, libltdl-dev +Standards-Version: 3.8.4 + +Package: kcontrol-autostart-trinity +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends} +Description: autostart module for the TDE control center + Autostart is a TDE control center module to configure which applications + start up when you login into a TDE session. + . + Homepage: http://www.kde-apps.org/content/download.php?content=45975 diff --git a/debian/lenny/applications/kcmautostart/debian/copyright b/debian/lenny/applications/kcmautostart/debian/copyright new file mode 100644 index 000000000..68eb13461 --- /dev/null +++ b/debian/lenny/applications/kcmautostart/debian/copyright @@ -0,0 +1,32 @@ +This package was debianized by Raphaël Pinson on +Fri, 16 Dec 2005 19:52:51 +0100. + +It was downloaded from http://www.kde-apps.org/content/download.php?content=45975&id=1 + +Upstream Author: Stephen Leaf + +Copyright (C) 1997 Janos Farkas (chexum@shadow.banki.hu) +copyright (C) 2006 Stephen Leaf + +License: + + This package is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This package is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this package; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + +On Debian systems, the complete text of the GNU General +Public License can be found in `/usr/share/common-licenses/GPL'. + +The Debian packaging is (C) 2007, Raphaël Pinson +is licensed under the GPL, see above. + diff --git a/debian/lenny/applications/kcmautostart/debian/rules b/debian/lenny/applications/kcmautostart/debian/rules new file mode 100644 index 000000000..242fb2c84 --- /dev/null +++ b/debian/lenny/applications/kcmautostart/debian/rules @@ -0,0 +1,24 @@ +#!/usr/bin/make -f + +include /usr/share/cdbs/1/rules/simple-patchsys.mk +include /usr/share/cdbs/1/class/autotools.mk +include /usr/share/cdbs/1/rules/debhelper.mk + +DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde +DEB_CONFIGURE_MANDIR := /opt/trinity/share/man +DEB_CONFIGURE_PREFIX := /opt/trinity +DEB_CONFIGURE_INFODIR := /opt/trinity/share/info + +cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) + +post-patches:: debian/stamp-bootstrap + +debian/stamp-bootstrap: + ! [ -f /usr/share/libtool/ltmain.sh ] || \ + cp -f /usr/share/libtool/ltmain.sh admin/ltmain.sh + ! [ -f /usr/share/libtool/config/ltmain.sh ] || \ + cp -f /usr/share/libtool/config/ltmain.sh admin/ltmain.sh + cp -f /usr/share/aclocal/libtool.m4 admin/libtool.m4.in + + make -f admin/Makefile.common cvs + touch debian/stamp-bootstrap diff --git a/debian/squeeze/applications/kcmautostart/debian/changelog b/debian/squeeze/applications/kcmautostart/debian/changelog new file mode 100644 index 000000000..4beefe2fa --- /dev/null +++ b/debian/squeeze/applications/kcmautostart/debian/changelog @@ -0,0 +1,37 @@ +kcontrol-autostart (0.5-0ubuntu2) gutsy; urgency=low + + * Add kubuntu_03_autostartdesktop.patch to remove duplicate lines in the + desktop file. (LP: #49859) + + -- Breuil Cyril Sun, 20 May 2007 21:10:53 +0200 + +kcontrol-autostart (0.5-0ubuntu1) gutsy; urgency=low + + * New upstream release + * Patch kubuntu_02_poMakefile.patch modifies po/Makefile.am to build pot file. + * Add automake1.9 as build-deps and change standard version to 3.7.2 + * Updated Maintainer field + + -- Breuil Cyril Sun, 20 May 2007 13:52:30 +0200 + +kcontrol-autostart (0.1-0ubuntu3) edgy; urgency=low + + * Removed dh_iconcache (no longer needed for this package) + * Rebuild so it doesnt depend on libgamin0 + + -- Sarah Hobbs Wed, 19 Jul 2006 11:58:50 +1000 + +kcontrol-autostart (0.1-0ubuntu2) dapper; urgency=low + + * Add dh_iconcache + + -- Sarah Hobbs Fri, 28 Apr 2006 15:43:58 +1000 + +kcontrol-autostart (0.1-0ubuntu1) dapper; urgency=low + + * Initial release. + * Patch kubuntu_01_kdepot.patch modifies admin/cvs.sh to build pot file. + * Removed svn-commit.tmp. + + -- Raphaël Pinson Fri, 16 Dec 2005 19:52:51 +0100 + diff --git a/debian/squeeze/applications/kcmautostart/debian/compat b/debian/squeeze/applications/kcmautostart/debian/compat new file mode 100644 index 000000000..7ed6ff82d --- /dev/null +++ b/debian/squeeze/applications/kcmautostart/debian/compat @@ -0,0 +1 @@ +5 diff --git a/debian/squeeze/applications/kcmautostart/debian/control b/debian/squeeze/applications/kcmautostart/debian/control new file mode 100644 index 000000000..ee5cf9d23 --- /dev/null +++ b/debian/squeeze/applications/kcmautostart/debian/control @@ -0,0 +1,16 @@ +Source: kcontrol-autostart-trinity +Section: tde +Priority: optional +Maintainer: Timothy Pearson +XSBC-Original-Maintainer: Raphaël Pinson +Build-Depends: debhelper (>= 5), cdbs, kdelibs4-trinity-dev, automake, autoconf, libtool, libltdl-dev +Standards-Version: 3.8.4 + +Package: kcontrol-autostart-trinity +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends} +Description: autostart module for the TDE control center + Autostart is a TDE control center module to configure which applications + start up when you login into a TDE session. + . + Homepage: http://www.kde-apps.org/content/download.php?content=45975 diff --git a/debian/squeeze/applications/kcmautostart/debian/copyright b/debian/squeeze/applications/kcmautostart/debian/copyright new file mode 100644 index 000000000..68eb13461 --- /dev/null +++ b/debian/squeeze/applications/kcmautostart/debian/copyright @@ -0,0 +1,32 @@ +This package was debianized by Raphaël Pinson on +Fri, 16 Dec 2005 19:52:51 +0100. + +It was downloaded from http://www.kde-apps.org/content/download.php?content=45975&id=1 + +Upstream Author: Stephen Leaf + +Copyright (C) 1997 Janos Farkas (chexum@shadow.banki.hu) +copyright (C) 2006 Stephen Leaf + +License: + + This package is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This package is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this package; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + +On Debian systems, the complete text of the GNU General +Public License can be found in `/usr/share/common-licenses/GPL'. + +The Debian packaging is (C) 2007, Raphaël Pinson +is licensed under the GPL, see above. + diff --git a/debian/squeeze/applications/kcmautostart/debian/rules b/debian/squeeze/applications/kcmautostart/debian/rules new file mode 100644 index 000000000..242fb2c84 --- /dev/null +++ b/debian/squeeze/applications/kcmautostart/debian/rules @@ -0,0 +1,24 @@ +#!/usr/bin/make -f + +include /usr/share/cdbs/1/rules/simple-patchsys.mk +include /usr/share/cdbs/1/class/autotools.mk +include /usr/share/cdbs/1/rules/debhelper.mk + +DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde +DEB_CONFIGURE_MANDIR := /opt/trinity/share/man +DEB_CONFIGURE_PREFIX := /opt/trinity +DEB_CONFIGURE_INFODIR := /opt/trinity/share/info + +cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) + +post-patches:: debian/stamp-bootstrap + +debian/stamp-bootstrap: + ! [ -f /usr/share/libtool/ltmain.sh ] || \ + cp -f /usr/share/libtool/ltmain.sh admin/ltmain.sh + ! [ -f /usr/share/libtool/config/ltmain.sh ] || \ + cp -f /usr/share/libtool/config/ltmain.sh admin/ltmain.sh + cp -f /usr/share/aclocal/libtool.m4 admin/libtool.m4.in + + make -f admin/Makefile.common cvs + touch debian/stamp-bootstrap diff --git a/ubuntu/maverick/applications/kcmautostart/debian/changelog b/ubuntu/maverick/applications/kcmautostart/debian/changelog new file mode 100644 index 000000000..4beefe2fa --- /dev/null +++ b/ubuntu/maverick/applications/kcmautostart/debian/changelog @@ -0,0 +1,37 @@ +kcontrol-autostart (0.5-0ubuntu2) gutsy; urgency=low + + * Add kubuntu_03_autostartdesktop.patch to remove duplicate lines in the + desktop file. (LP: #49859) + + -- Breuil Cyril Sun, 20 May 2007 21:10:53 +0200 + +kcontrol-autostart (0.5-0ubuntu1) gutsy; urgency=low + + * New upstream release + * Patch kubuntu_02_poMakefile.patch modifies po/Makefile.am to build pot file. + * Add automake1.9 as build-deps and change standard version to 3.7.2 + * Updated Maintainer field + + -- Breuil Cyril Sun, 20 May 2007 13:52:30 +0200 + +kcontrol-autostart (0.1-0ubuntu3) edgy; urgency=low + + * Removed dh_iconcache (no longer needed for this package) + * Rebuild so it doesnt depend on libgamin0 + + -- Sarah Hobbs Wed, 19 Jul 2006 11:58:50 +1000 + +kcontrol-autostart (0.1-0ubuntu2) dapper; urgency=low + + * Add dh_iconcache + + -- Sarah Hobbs Fri, 28 Apr 2006 15:43:58 +1000 + +kcontrol-autostart (0.1-0ubuntu1) dapper; urgency=low + + * Initial release. + * Patch kubuntu_01_kdepot.patch modifies admin/cvs.sh to build pot file. + * Removed svn-commit.tmp. + + -- Raphaël Pinson Fri, 16 Dec 2005 19:52:51 +0100 + diff --git a/ubuntu/maverick/applications/kcmautostart/debian/compat b/ubuntu/maverick/applications/kcmautostart/debian/compat new file mode 100644 index 000000000..7ed6ff82d --- /dev/null +++ b/ubuntu/maverick/applications/kcmautostart/debian/compat @@ -0,0 +1 @@ +5 diff --git a/ubuntu/maverick/applications/kcmautostart/debian/control b/ubuntu/maverick/applications/kcmautostart/debian/control new file mode 100644 index 000000000..ee5cf9d23 --- /dev/null +++ b/ubuntu/maverick/applications/kcmautostart/debian/control @@ -0,0 +1,16 @@ +Source: kcontrol-autostart-trinity +Section: tde +Priority: optional +Maintainer: Timothy Pearson +XSBC-Original-Maintainer: Raphaël Pinson +Build-Depends: debhelper (>= 5), cdbs, kdelibs4-trinity-dev, automake, autoconf, libtool, libltdl-dev +Standards-Version: 3.8.4 + +Package: kcontrol-autostart-trinity +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends} +Description: autostart module for the TDE control center + Autostart is a TDE control center module to configure which applications + start up when you login into a TDE session. + . + Homepage: http://www.kde-apps.org/content/download.php?content=45975 diff --git a/ubuntu/maverick/applications/kcmautostart/debian/copyright b/ubuntu/maverick/applications/kcmautostart/debian/copyright new file mode 100644 index 000000000..68eb13461 --- /dev/null +++ b/ubuntu/maverick/applications/kcmautostart/debian/copyright @@ -0,0 +1,32 @@ +This package was debianized by Raphaël Pinson on +Fri, 16 Dec 2005 19:52:51 +0100. + +It was downloaded from http://www.kde-apps.org/content/download.php?content=45975&id=1 + +Upstream Author: Stephen Leaf + +Copyright (C) 1997 Janos Farkas (chexum@shadow.banki.hu) +copyright (C) 2006 Stephen Leaf + +License: + + This package is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This package is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this package; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + +On Debian systems, the complete text of the GNU General +Public License can be found in `/usr/share/common-licenses/GPL'. + +The Debian packaging is (C) 2007, Raphaël Pinson +is licensed under the GPL, see above. + diff --git a/ubuntu/maverick/applications/kcmautostart/debian/rules b/ubuntu/maverick/applications/kcmautostart/debian/rules new file mode 100644 index 000000000..242fb2c84 --- /dev/null +++ b/ubuntu/maverick/applications/kcmautostart/debian/rules @@ -0,0 +1,24 @@ +#!/usr/bin/make -f + +include /usr/share/cdbs/1/rules/simple-patchsys.mk +include /usr/share/cdbs/1/class/autotools.mk +include /usr/share/cdbs/1/rules/debhelper.mk + +DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde +DEB_CONFIGURE_MANDIR := /opt/trinity/share/man +DEB_CONFIGURE_PREFIX := /opt/trinity +DEB_CONFIGURE_INFODIR := /opt/trinity/share/info + +cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) + +post-patches:: debian/stamp-bootstrap + +debian/stamp-bootstrap: + ! [ -f /usr/share/libtool/ltmain.sh ] || \ + cp -f /usr/share/libtool/ltmain.sh admin/ltmain.sh + ! [ -f /usr/share/libtool/config/ltmain.sh ] || \ + cp -f /usr/share/libtool/config/ltmain.sh admin/ltmain.sh + cp -f /usr/share/aclocal/libtool.m4 admin/libtool.m4.in + + make -f admin/Makefile.common cvs + touch debian/stamp-bootstrap From ecd81115d145cbb70d9bafb71b744ca495fdd6c6 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sat, 5 May 2012 18:13:05 -0500 Subject: [PATCH 03/10] Fix FTBFS --- .../kcmautostart/debian/changelog | 38 ++----------------- .../kcmautostart/debian/changelog | 38 ++----------------- .../kcmautostart/debian/changelog | 38 ++----------------- 3 files changed, 9 insertions(+), 105 deletions(-) diff --git a/debian/lenny/applications/kcmautostart/debian/changelog b/debian/lenny/applications/kcmautostart/debian/changelog index 4beefe2fa..608bc541c 100644 --- a/debian/lenny/applications/kcmautostart/debian/changelog +++ b/debian/lenny/applications/kcmautostart/debian/changelog @@ -1,37 +1,5 @@ -kcontrol-autostart (0.5-0ubuntu2) gutsy; urgency=low +kcontrol-autostart-trinity (0.5-0ubuntu0) karmic; urgency=low - * Add kubuntu_03_autostartdesktop.patch to remove duplicate lines in the - desktop file. (LP: #49859) - - -- Breuil Cyril Sun, 20 May 2007 21:10:53 +0200 - -kcontrol-autostart (0.5-0ubuntu1) gutsy; urgency=low - - * New upstream release - * Patch kubuntu_02_poMakefile.patch modifies po/Makefile.am to build pot file. - * Add automake1.9 as build-deps and change standard version to 3.7.2 - * Updated Maintainer field - - -- Breuil Cyril Sun, 20 May 2007 13:52:30 +0200 - -kcontrol-autostart (0.1-0ubuntu3) edgy; urgency=low - - * Removed dh_iconcache (no longer needed for this package) - * Rebuild so it doesnt depend on libgamin0 - - -- Sarah Hobbs Wed, 19 Jul 2006 11:58:50 +1000 - -kcontrol-autostart (0.1-0ubuntu2) dapper; urgency=low - - * Add dh_iconcache - - -- Sarah Hobbs Fri, 28 Apr 2006 15:43:58 +1000 - -kcontrol-autostart (0.1-0ubuntu1) dapper; urgency=low - - * Initial release. - * Patch kubuntu_01_kdepot.patch modifies admin/cvs.sh to build pot file. - * Removed svn-commit.tmp. - - -- Raphaël Pinson Fri, 16 Dec 2005 19:52:51 +0100 + * Karmic rebuild + -- Timothy Pearson Thu, 02 July 2009 16:08:00 -0600 diff --git a/debian/squeeze/applications/kcmautostart/debian/changelog b/debian/squeeze/applications/kcmautostart/debian/changelog index 4beefe2fa..608bc541c 100644 --- a/debian/squeeze/applications/kcmautostart/debian/changelog +++ b/debian/squeeze/applications/kcmautostart/debian/changelog @@ -1,37 +1,5 @@ -kcontrol-autostart (0.5-0ubuntu2) gutsy; urgency=low +kcontrol-autostart-trinity (0.5-0ubuntu0) karmic; urgency=low - * Add kubuntu_03_autostartdesktop.patch to remove duplicate lines in the - desktop file. (LP: #49859) - - -- Breuil Cyril Sun, 20 May 2007 21:10:53 +0200 - -kcontrol-autostart (0.5-0ubuntu1) gutsy; urgency=low - - * New upstream release - * Patch kubuntu_02_poMakefile.patch modifies po/Makefile.am to build pot file. - * Add automake1.9 as build-deps and change standard version to 3.7.2 - * Updated Maintainer field - - -- Breuil Cyril Sun, 20 May 2007 13:52:30 +0200 - -kcontrol-autostart (0.1-0ubuntu3) edgy; urgency=low - - * Removed dh_iconcache (no longer needed for this package) - * Rebuild so it doesnt depend on libgamin0 - - -- Sarah Hobbs Wed, 19 Jul 2006 11:58:50 +1000 - -kcontrol-autostart (0.1-0ubuntu2) dapper; urgency=low - - * Add dh_iconcache - - -- Sarah Hobbs Fri, 28 Apr 2006 15:43:58 +1000 - -kcontrol-autostart (0.1-0ubuntu1) dapper; urgency=low - - * Initial release. - * Patch kubuntu_01_kdepot.patch modifies admin/cvs.sh to build pot file. - * Removed svn-commit.tmp. - - -- Raphaël Pinson Fri, 16 Dec 2005 19:52:51 +0100 + * Karmic rebuild + -- Timothy Pearson Thu, 02 July 2009 16:08:00 -0600 diff --git a/ubuntu/maverick/applications/kcmautostart/debian/changelog b/ubuntu/maverick/applications/kcmautostart/debian/changelog index 4beefe2fa..608bc541c 100644 --- a/ubuntu/maverick/applications/kcmautostart/debian/changelog +++ b/ubuntu/maverick/applications/kcmautostart/debian/changelog @@ -1,37 +1,5 @@ -kcontrol-autostart (0.5-0ubuntu2) gutsy; urgency=low +kcontrol-autostart-trinity (0.5-0ubuntu0) karmic; urgency=low - * Add kubuntu_03_autostartdesktop.patch to remove duplicate lines in the - desktop file. (LP: #49859) - - -- Breuil Cyril Sun, 20 May 2007 21:10:53 +0200 - -kcontrol-autostart (0.5-0ubuntu1) gutsy; urgency=low - - * New upstream release - * Patch kubuntu_02_poMakefile.patch modifies po/Makefile.am to build pot file. - * Add automake1.9 as build-deps and change standard version to 3.7.2 - * Updated Maintainer field - - -- Breuil Cyril Sun, 20 May 2007 13:52:30 +0200 - -kcontrol-autostart (0.1-0ubuntu3) edgy; urgency=low - - * Removed dh_iconcache (no longer needed for this package) - * Rebuild so it doesnt depend on libgamin0 - - -- Sarah Hobbs Wed, 19 Jul 2006 11:58:50 +1000 - -kcontrol-autostart (0.1-0ubuntu2) dapper; urgency=low - - * Add dh_iconcache - - -- Sarah Hobbs Fri, 28 Apr 2006 15:43:58 +1000 - -kcontrol-autostart (0.1-0ubuntu1) dapper; urgency=low - - * Initial release. - * Patch kubuntu_01_kdepot.patch modifies admin/cvs.sh to build pot file. - * Removed svn-commit.tmp. - - -- Raphaël Pinson Fri, 16 Dec 2005 19:52:51 +0100 + * Karmic rebuild + -- Timothy Pearson Thu, 02 July 2009 16:08:00 -0600 From f0a6de69fa60bedb772a5796b23aad6b50af1f26 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sat, 5 May 2012 20:50:48 -0500 Subject: [PATCH 04/10] Fix kcmautostart --- debian/lenny/applications/kcmautostart/debian/control | 2 +- debian/squeeze/applications/kcmautostart/debian/control | 2 +- ubuntu/maverick/applications/kcmautostart/debian/control | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/debian/lenny/applications/kcmautostart/debian/control b/debian/lenny/applications/kcmautostart/debian/control index ee5cf9d23..3b4fd4872 100644 --- a/debian/lenny/applications/kcmautostart/debian/control +++ b/debian/lenny/applications/kcmautostart/debian/control @@ -3,7 +3,7 @@ Section: tde Priority: optional Maintainer: Timothy Pearson XSBC-Original-Maintainer: Raphaël Pinson -Build-Depends: debhelper (>= 5), cdbs, kdelibs4-trinity-dev, automake, autoconf, libtool, libltdl-dev +Build-Depends: debhelper (>= 5), cdbs, tdelibs4-trinity-dev, automake, autoconf, libtool, libltdl-dev Standards-Version: 3.8.4 Package: kcontrol-autostart-trinity diff --git a/debian/squeeze/applications/kcmautostart/debian/control b/debian/squeeze/applications/kcmautostart/debian/control index ee5cf9d23..3b4fd4872 100644 --- a/debian/squeeze/applications/kcmautostart/debian/control +++ b/debian/squeeze/applications/kcmautostart/debian/control @@ -3,7 +3,7 @@ Section: tde Priority: optional Maintainer: Timothy Pearson XSBC-Original-Maintainer: Raphaël Pinson -Build-Depends: debhelper (>= 5), cdbs, kdelibs4-trinity-dev, automake, autoconf, libtool, libltdl-dev +Build-Depends: debhelper (>= 5), cdbs, tdelibs4-trinity-dev, automake, autoconf, libtool, libltdl-dev Standards-Version: 3.8.4 Package: kcontrol-autostart-trinity diff --git a/ubuntu/maverick/applications/kcmautostart/debian/control b/ubuntu/maverick/applications/kcmautostart/debian/control index ee5cf9d23..3b4fd4872 100644 --- a/ubuntu/maverick/applications/kcmautostart/debian/control +++ b/ubuntu/maverick/applications/kcmautostart/debian/control @@ -3,7 +3,7 @@ Section: tde Priority: optional Maintainer: Timothy Pearson XSBC-Original-Maintainer: Raphaël Pinson -Build-Depends: debhelper (>= 5), cdbs, kdelibs4-trinity-dev, automake, autoconf, libtool, libltdl-dev +Build-Depends: debhelper (>= 5), cdbs, tdelibs4-trinity-dev, automake, autoconf, libtool, libltdl-dev Standards-Version: 3.8.4 Package: kcontrol-autostart-trinity From 53b818dbc8d04c3e88a856a783386b0c84638148 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sat, 5 May 2012 21:55:47 -0500 Subject: [PATCH 05/10] Update build dep for kstreamripper on Debian and Ubuntu --- debian/lenny/applications/kstreamripper/debian/control | 2 +- debian/squeeze/applications/kstreamripper/debian/control | 2 +- ubuntu/maverick/applications/kstreamripper/debian/control | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/debian/lenny/applications/kstreamripper/debian/control b/debian/lenny/applications/kstreamripper/debian/control index 96ea4651d..505bc6682 100644 --- a/debian/lenny/applications/kstreamripper/debian/control +++ b/debian/lenny/applications/kstreamripper/debian/control @@ -2,7 +2,7 @@ Source: kstreamripper-trinity Section: sound Priority: optional Maintainer: Michael Ablassmeier -Build-Depends: debhelper (>= 4.1.0), cdbs, libxmu-dev, libjpeg62-dev (>= 6b-9), tdelibs4-trinity-dev, scons +Build-Depends: debhelper (>= 4.1.0), cdbs, libxmu-dev, libjpeg-dev, tdelibs4-trinity-dev, scons Standards-Version: 3.8.4 Package: kstreamripper-trinity diff --git a/debian/squeeze/applications/kstreamripper/debian/control b/debian/squeeze/applications/kstreamripper/debian/control index 96ea4651d..505bc6682 100644 --- a/debian/squeeze/applications/kstreamripper/debian/control +++ b/debian/squeeze/applications/kstreamripper/debian/control @@ -2,7 +2,7 @@ Source: kstreamripper-trinity Section: sound Priority: optional Maintainer: Michael Ablassmeier -Build-Depends: debhelper (>= 4.1.0), cdbs, libxmu-dev, libjpeg62-dev (>= 6b-9), tdelibs4-trinity-dev, scons +Build-Depends: debhelper (>= 4.1.0), cdbs, libxmu-dev, libjpeg-dev, tdelibs4-trinity-dev, scons Standards-Version: 3.8.4 Package: kstreamripper-trinity diff --git a/ubuntu/maverick/applications/kstreamripper/debian/control b/ubuntu/maverick/applications/kstreamripper/debian/control index 96ea4651d..505bc6682 100644 --- a/ubuntu/maverick/applications/kstreamripper/debian/control +++ b/ubuntu/maverick/applications/kstreamripper/debian/control @@ -2,7 +2,7 @@ Source: kstreamripper-trinity Section: sound Priority: optional Maintainer: Michael Ablassmeier -Build-Depends: debhelper (>= 4.1.0), cdbs, libxmu-dev, libjpeg62-dev (>= 6b-9), tdelibs4-trinity-dev, scons +Build-Depends: debhelper (>= 4.1.0), cdbs, libxmu-dev, libjpeg-dev, tdelibs4-trinity-dev, scons Standards-Version: 3.8.4 Package: kstreamripper-trinity From 77bb80878eaccf8d2e0eb0f0e84ba6e11343c792 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sat, 5 May 2012 22:09:22 -0500 Subject: [PATCH 06/10] Fix pytdeextensions build deps on Ubuntu --- ubuntu/maverick/libraries/pytdeextensions/debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ubuntu/maverick/libraries/pytdeextensions/debian/control b/ubuntu/maverick/libraries/pytdeextensions/debian/control index 19a63c726..0920e9e37 100644 --- a/ubuntu/maverick/libraries/pytdeextensions/debian/control +++ b/ubuntu/maverick/libraries/pytdeextensions/debian/control @@ -5,7 +5,7 @@ Maintainer: Timothy Pearson Uploaders: Fathi Boudra , Mark Purcell Build-Depends: cdbs, debhelper (>= 5), chrpath, quilt, tdelibs4c2a-trinity, libtool, libxml2-utils, libxrandr-dev, libxxf86vm-dev, pytqt-tools, python-trinity-trinity, - python-tqt-dev, python-sip4-dev, python-support (>= 0.6), python2.6, python2.6-dev + python-tqt-dev, python-sip4-dev, python-support (>= 0.6), python (>= 2.5), python-dev (>= 2.5) Standards-Version: 3.8.4 Package: pytdeextensions-trinity From f4871ef3d703770bf08c2628507c1243e206759b Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sat, 5 May 2012 22:14:59 -0500 Subject: [PATCH 07/10] Fix tde-guidance build deps on Ubuntu --- ubuntu/maverick/applications/tde-guidance/debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ubuntu/maverick/applications/tde-guidance/debian/control b/ubuntu/maverick/applications/tde-guidance/debian/control index 0a0b81471..0722d4beb 100644 --- a/ubuntu/maverick/applications/tde-guidance/debian/control +++ b/ubuntu/maverick/applications/tde-guidance/debian/control @@ -7,7 +7,7 @@ Uploaders: Fathi Boudra , Mark Purcell Build-Depends: cdbs, debhelper (>= 5), chrpath, tdelibs4-trinity-dev, libpythonize0-trinity-dev, libtool, libxml2-utils, libxss-dev, libxxf86vm-dev, pytdeextensions-trinity, pytqt-tools, python-tqt, python-trinity-trinity, python-trinity-trinity-dev, python-sip4-dev, - python-support (>= 0.6), python2.6 (>= 2.5), python2.6-dev (>= 2.5), x11proto-scrnsaver-dev, python-tqt-dev, hwdata + python-support (>= 0.6), python (>= 2.5), python-dev (>= 2.5), x11proto-scrnsaver-dev, python-tqt-dev, hwdata Standards-Version: 3.8.4 Package: tde-guidance-trinity From 7c3910256158c7423f53433ca6dd317b32e41a5a Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sat, 5 May 2012 22:54:01 -0500 Subject: [PATCH 08/10] Fix python deps on ubuntu --- ubuntu/maverick/applications/tde-guidance/debian/control | 2 +- ubuntu/maverick/libraries/pytdeextensions/debian/control | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ubuntu/maverick/applications/tde-guidance/debian/control b/ubuntu/maverick/applications/tde-guidance/debian/control index 0722d4beb..1e6619c82 100644 --- a/ubuntu/maverick/applications/tde-guidance/debian/control +++ b/ubuntu/maverick/applications/tde-guidance/debian/control @@ -7,7 +7,7 @@ Uploaders: Fathi Boudra , Mark Purcell Build-Depends: cdbs, debhelper (>= 5), chrpath, tdelibs4-trinity-dev, libpythonize0-trinity-dev, libtool, libxml2-utils, libxss-dev, libxxf86vm-dev, pytdeextensions-trinity, pytqt-tools, python-tqt, python-trinity-trinity, python-trinity-trinity-dev, python-sip4-dev, - python-support (>= 0.6), python (>= 2.5), python-dev (>= 2.5), x11proto-scrnsaver-dev, python-tqt-dev, hwdata + python-support (>= 0.6), python-all (>= 2.5), python-all-dev (>= 2.5), x11proto-scrnsaver-dev, python-tqt-dev, hwdata Standards-Version: 3.8.4 Package: tde-guidance-trinity diff --git a/ubuntu/maverick/libraries/pytdeextensions/debian/control b/ubuntu/maverick/libraries/pytdeextensions/debian/control index 0920e9e37..73d813acb 100644 --- a/ubuntu/maverick/libraries/pytdeextensions/debian/control +++ b/ubuntu/maverick/libraries/pytdeextensions/debian/control @@ -5,7 +5,7 @@ Maintainer: Timothy Pearson Uploaders: Fathi Boudra , Mark Purcell Build-Depends: cdbs, debhelper (>= 5), chrpath, quilt, tdelibs4c2a-trinity, libtool, libxml2-utils, libxrandr-dev, libxxf86vm-dev, pytqt-tools, python-trinity-trinity, - python-tqt-dev, python-sip4-dev, python-support (>= 0.6), python (>= 2.5), python-dev (>= 2.5) + python-tqt-dev, python-sip4-dev, python-support (>= 0.6), python-all (>= 2.5), python-all-dev (>= 2.5) Standards-Version: 3.8.4 Package: pytdeextensions-trinity From 4148b046428563b513708ccaba8e8711a7fd7a26 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sun, 6 May 2012 02:22:49 -0500 Subject: [PATCH 09/10] Update tde-guidance packaging on Ubuntu --- ubuntu/maverick/applications/tde-guidance/debian/rules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ubuntu/maverick/applications/tde-guidance/debian/rules b/ubuntu/maverick/applications/tde-guidance/debian/rules index e21db2b6b..df63d31b1 100755 --- a/ubuntu/maverick/applications/tde-guidance/debian/rules +++ b/ubuntu/maverick/applications/tde-guidance/debian/rules @@ -93,7 +93,7 @@ install/guidance-backends-trinity:: install -D -p -m0755 displayconfig/displayconfig-hwprobe.py \ $(PYSUPPORT_PATH)/guidance-backends-trinity/displayconfig-hwprobe.py - cp $(DEB_DESTDIR)/usr/lib/python2.6/site-packages/xf86misc.py $(PYSUPPORT_PATH)/guidance-backends-trinity + cp $(DEB_DESTDIR)/usr/lib/python*/site-packages/xf86misc.py $(PYSUPPORT_PATH)/guidance-backends-trinity cp $(DEB_DESTDIR)/opt/trinity/share/apps/guidance/MicroHAL.py $(PYSUPPORT_PATH)/guidance-backends-trinity cp $(DEB_DESTDIR)/opt/trinity/share/apps/guidance/ScanPCI.py $(PYSUPPORT_PATH)/guidance-backends-trinity cp $(DEB_DESTDIR)/opt/trinity/share/apps/guidance/infimport.py $(PYSUPPORT_PATH)/guidance-backends-trinity From 8e6f269bd5a2fb020a174b970873da39aad142c2 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sun, 6 May 2012 02:23:24 -0500 Subject: [PATCH 10/10] Same as prior commit --- .../applications/tde-guidance/debian/python-distutils-jaunty.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ubuntu/maverick/applications/tde-guidance/debian/python-distutils-jaunty.mk b/ubuntu/maverick/applications/tde-guidance/debian/python-distutils-jaunty.mk index 9c5e5211f..72efb646f 100644 --- a/ubuntu/maverick/applications/tde-guidance/debian/python-distutils-jaunty.mk +++ b/ubuntu/maverick/applications/tde-guidance/debian/python-distutils-jaunty.mk @@ -83,7 +83,7 @@ endif # pysupport ifndef DEB_PYTHON_SYSTEM DEB_PYTHON_COMPILE_VERSION = -DEB_PYTHON_VERSIONS = 2.1 2.2 2.3 2.4 2.5 2.6 +DEB_PYTHON_VERSIONS = 2.1 2.2 2.3 2.4 2.5 2.6 2.7 else # default package is the first one declared in 'debian/control' # (override if necessary)