diff --git a/debian/lenny/applications/kscope/debian/cdbs/debian-qt-kde.mk b/debian/lenny/applications/kscope/debian/cdbs/debian-qt-kde.mk new file mode 100644 index 000000000..d81e0a12f --- /dev/null +++ b/debian/lenny/applications/kscope/debian/cdbs/debian-qt-kde.mk @@ -0,0 +1,115 @@ +ifndef _cdbs_bootstrap +_cdbs_scripts_path ?= /usr/lib/cdbs +_cdbs_rules_path ?= /usr/share/cdbs/1/rules +_cdbs_class_path ?= /usr/share/cdbs/1/class +endif + +ifndef _cdbs_class_debian-qt-kde +_cdbs_class_debian-qt-kde := 1 + +# Note: This _must_ be included before autotools.mk, or it won't work. +common-configure-arch common-configure-indep:: debian/stamp-cvs-make +debian/stamp-cvs-make: +ifndef _cdbs_class_cmake + cp -Rp /usr/share/aclocal/libtool.m4 admin/libtool.m4.in + cp -Rp /usr/share/libtool/config/ltmain.sh admin/ltmain.sh + $(MAKE) -C $(DEB_SRCDIR) -f admin/Makefile.common dist; +endif + touch 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 := + +DEB_DH_MAKESHLIBS_ARGS_ALL := -V +DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib) + +ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) + cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb + ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches))) + cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,) + else + cdbs_kde_enable_final = + endif +endif + +common-build-arch:: debian/stamp-man-pages +debian/stamp-man-pages: + if ! test -d debian/man/out; then mkdir -p debian/man/out; fi + for f in $$(find debian/man -name '*.sgml'); do \ + docbook-to-man $$f > debian/man/out/`basename $$f .sgml`.1; \ + done + for f in $$(find debian/man -name '*.man'); do \ + soelim -I debian/man $$f \ + > debian/man/out/`basename $$f .man`.`head -n1 $$f | awk '{print $$NF}'`; \ + done + touch debian/stamp-man-pages + +common-binary-indep:: + ( set -e; \ + tmpf=`mktemp debian/versions.XXXXXX`; \ + perl debian/cdbs/versions.pl >$$tmpf; \ + for p in $(DEB_INDEP_PACKAGES); do \ + cat $$tmpf >>debian/$$p.substvars; \ + done; \ + rm -f $$tmpf ) + +common-binary-arch:: + ( set -e; \ + tmpf=`mktemp debian/versions.XXXXXX`; \ + perl debian/cdbs/versions.pl >$$tmpf; \ + for p in $(DEB_ARCH_PACKAGES); do \ + cat $$tmpf >>debian/$$p.substvars; \ + done; \ + rm -f $$tmpf ) + +clean:: + rm -rf debian/man/out + -rmdir debian/man + rm -f debian/stamp-man-pages + rm -rf debian/shlibs-check + +$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: + if test -x /usr/bin/dh_desktop; then dh_desktop -p$(cdbs_curpkg) $(DEB_DH_DESKTOP_ARGS); fi + if test -e debian/$(cdbs_curpkg).lintian; then \ + install -p -D -m644 debian/$(cdbs_curpkg).lintian \ + debian/$(cdbs_curpkg)/usr/share/lintian/overrides/$(cdbs_curpkg); \ + fi + if test -e debian/$(cdbs_curpkg).presubj; then \ + install -p -D -m644 debian/$(cdbs_curpkg).presubj \ + debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \ + fi + +binary-install/$(DEB_SOURCE_PACKAGE)-doc-html:: + set -e; \ + for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \ + pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \ + echo Building $$pkg HTML docs...; \ + mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \ + cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \ + /opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \ + done + for pkg in $(DOC_HTML_PRUNE) ; do \ + rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \ + done + +clean:: +ifndef _cdbs_class_cmake + if test -n "$(DEB_KDE_CVS_MAKE)" && test -d $(DEB_SRCDIR); then \ + cd $(DEB_SRCDIR); \ + find . -name Makefile.in -print | \ + xargs --no-run-if-empty rm -f; \ + rm -f Makefile.am acinclude.m4 aclocal.m4 config.h.in \ + configure configure.files configure.in stamp-h.in \ + subdirs; \ + fi +endif + rm -f debian/stamp-cvs-make + +endif diff --git a/debian/lenny/applications/kscope/debian/cdbs/kde.mk b/debian/lenny/applications/kscope/debian/cdbs/kde.mk new file mode 100644 index 000000000..023886fc8 --- /dev/null +++ b/debian/lenny/applications/kscope/debian/cdbs/kde.mk @@ -0,0 +1,99 @@ +# -*- mode: makefile; coding: utf-8 -*- +# Copyright © 2003 Christopher L Cheney +# Description: A class for KDE packages; sets KDE environment variables, etc +# +# This program 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, or (at +# your option) any later version. +# +# This program 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 program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA +# 02111-1307 USA. + +_cdbs_scripts_path ?= /usr/lib/cdbs +_cdbs_rules_path ?= /usr/share/cdbs/1/rules +_cdbs_class_path ?= /usr/share/cdbs/1/class + +ifndef _cdbs_class_kde +_cdbs_class_kde := 1 + +# for dh_icons +CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), debhelper (>= 5.0.7ubuntu4) + +include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix) + +ifdef _cdbs_tarball_dir +DEB_BUILDDIR = $(_cdbs_tarball_dir)/obj-$(DEB_BUILD_GNU_TYPE) +else +DEB_BUILDDIR = obj-$(DEB_BUILD_GNU_TYPE) +endif + +ifndef _cdbs_class_cmake +include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix) +endif + +export kde_cgidir = \$${libdir}/cgi-bin +export kde_confdir = \$${sysconfdir}/trinity +export kde_htmldir = \$${datadir}/doc/tde/HTML + +ifeq (,$(filter noopt,$(DEB_BUILD_OPTIONS))) + cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,) +endif + +ifneq (,$(filter nostrip,$(DEB_BUILD_OPTIONS))) + cdbs_kde_enable_final = + cdbs_kde_enable_debug = --enable-debug=yes +else + cdbs_kde_enable_debug = --disable-debug +endif + +ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS))) + cdbs_kde_enable_debug = --enable-debug=full +endif + +cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) + +DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include" +DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el + +$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: + if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi + +cleanbuilddir:: + -$(if $(call cdbs_streq,$(DEB_BUILDDIR),$(DEB_SRCDIR)),,rm -rf $(DEB_BUILDDIR)) + +common-build-arch common-build-indep:: debian/stamp-kde-apidox +debian/stamp-kde-apidox: + $(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox) + touch $@ + +common-install-prehook-impl:: + mkdir -p po + -XGETTEXT=/usr/bin/kde-xgettext EXTRACTATTR=/opt/trinity/bin/extractattr sh $(DEB_SRCDIR)/admin/cvs.sh extract-messages + -for file in po/*pot; do \ + sed "s/charset=CHARSET/charset=UTF-8/" -i $$file; \ + done + +common-install-arch common-install-indep:: common-install-kde-apidox +common-install-kde-apidox:: + $(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) install-apidox DESTDIR=$(DEB_DESTDIR)) + +clean:: + rm -f debian/stamp-kde-apidox + rm -rf po/*.pot + +# This is a convenience target for calling manually. It's not part of +# the build process. +buildprep: clean apply-patches + $(MAKE) -f admin/Makefile.common dist + debian/rules clean + +endif diff --git a/debian/lenny/applications/kscope/debian/cdbs/versions.pl b/debian/lenny/applications/kscope/debian/cdbs/versions.pl new file mode 100644 index 000000000..75c9add4b --- /dev/null +++ b/debian/lenny/applications/kscope/debian/cdbs/versions.pl @@ -0,0 +1,19 @@ +#!/usr/bin/env perl + +use strict; +use warnings; + +my $version = `dpkg-parsechangelog | awk '/^Version/ {print \$2}'`; +my ($version3, $version3_next); +my ($version2, $version2_next); + +($version3 = $version) =~ s/^(([^.]+\.){2}[^.+~-]+)[.+~-]?[^-]*-[^-]+$/$1/; +($version2 = $version3) =~ s/\.[^.]+$//; + +($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e; +($version2_next = $version2) =~ s/(?<=\.)(\d+)$/($1+1)/e; + +print "KDE-Version3=$version3\n"; +print "KDE-Version2=$version2\n"; +print "KDE-Next-Version3=$version3_next\n"; +print "KDE-Next-Version2=$version2_next\n"; diff --git a/debian/lenny/applications/kscope/debian/changelog b/debian/lenny/applications/kscope/debian/changelog new file mode 100644 index 000000000..d3689c28f --- /dev/null +++ b/debian/lenny/applications/kscope/debian/changelog @@ -0,0 +1,97 @@ +kscope-trinity (1.6.2-1ubuntu1) maverick; urgency=low + + * Initial Release for TDE + + -- Slávek Banko Mon, 07 Sep 2013 23:43:53 +0200 + +kscope (1.6.2-1ubuntu1) maverick; urgency=low + + * Port to Ubuntu. + + -- Eugene San (eugenesan) Fri, 04 Feb 2011 22:02:59 +0200 + +kscope (1.6.2-1) unstable; urgency=low + + * New upstream release (bugfix release). + * Bump Standards-Version to 3.8.0 (no changes needed). + + -- Fathi Boudra Sat, 09 Aug 2008 10:20:14 +0200 + +kscope (1.6.1-1) unstable; urgency=low + + * New upstream release. + * Refresh patches. + * Bump Standards-Version to 3.7.3. + * Use Homepage, Vcs-Browser and Vcs-Svn fields. + * Switch to quilt patch system. + * Remove embedded copy of GFDL as it can be found in common-licences. + + -- Fathi Boudra Sat, 01 Mar 2008 19:33:31 +0100 + +kscope (1.6.0-1) unstable; urgency=low + + * New upstream release. + + -- Fathi Boudra Thu, 12 Jul 2007 21:22:32 +0200 + +kscope (1.5.2-1) unstable; urgency=low + + * New upstream release. (Closes: #420874) + + -- Fathi Boudra Tue, 15 May 2007 19:47:50 +0200 + +kscope (1.5.1-2) unstable; urgency=low + + * Upload to unstable + + -- Mark Purcell Sat, 3 Mar 2007 13:23:12 +0000 + +kscope (1.5.1-1) experimental; urgency=low + + * New upstream release. + + -- Fathi Boudra Thu, 15 Feb 2007 18:56:31 +0100 + +kscope (1.5.0-1) unstable; urgency=low + + * New upstream release + * Add ./debian/rules get-orig-source for http://buildserver.net + * Build-Depends: autotools-dev fixes outdated-autotools-helper-file + + -- Mark Purcell Wed, 7 Feb 2007 21:08:10 +0000 + +kscope (1.4.2-1) unstable; urgency=low + + * New upstream release + + -- Fathi Boudra Mon, 16 Oct 2006 22:03:21 +0200 + +kscope (1.4.1-2) unstable; urgency=low + + * Add patch to load default config + + -- Fathi Boudra Fri, 8 Sep 2006 18:13:30 +0200 + +kscope (1.4.1-1) unstable; urgency=low + + * New upstream release + * Remove 11_crashfix.diff, merged upstream + + -- Fathi Boudra Thu, 24 Aug 2006 12:24:23 +0200 + +kscope (1.4.0-1) unstable; urgency=low + + * New upstream release + * Merge kubuntu patches, thanks to Tom Albers + * Add kscope manpage from kubuntu package, + thanks to Jonathan Patrick Davies + * Update copyright file: add kscope manpage license + + -- Fathi Boudra Thu, 10 Aug 2006 14:42:31 +0200 + +kscope (1.3.4-1) unstable; urgency=low + + * Initial release (Closes: #309669) + + -- Fathi Boudra Fri, 28 Apr 2006 08:05:15 +0100 + diff --git a/debian/lenny/applications/kscope/debian/compat b/debian/lenny/applications/kscope/debian/compat new file mode 100644 index 000000000..7ed6ff82d --- /dev/null +++ b/debian/lenny/applications/kscope/debian/compat @@ -0,0 +1 @@ +5 diff --git a/debian/lenny/applications/kscope/debian/control b/debian/lenny/applications/kscope/debian/control new file mode 100644 index 000000000..f48fa899a --- /dev/null +++ b/debian/lenny/applications/kscope/debian/control @@ -0,0 +1,45 @@ +Source: kscope-trinity +Section: tde +Priority: optional +Maintainer: Timothy Pearson +XSBC-Original-Maintainer: Debian KDE Extras Team +Uploaders: Fathi Boudra , Mark Purcell +Build-Depends: cdbs, debhelper (>= 5), quilt, automake, libtool, bison, flex, + tdebase-trinity-dev, docbook2x, docbook-xml +Standards-Version: 3.8.0 +Homepage: http://kscope.sourceforge.net +Vcs-Browser: http://svn.debian.org/wsvn/pkg-kde/kde-extras/kscope/?op=log +Vcs-Svn: svn://svn.debian.org/pkg-kde/kde-extras/kscope/trunk + +Package: kscope-trinity +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends}, cscope, exuberant-ctags, graphviz +Description: source editing environment for TDE + KScope is a TDE front-end to Cscope. It provides a source-editing environment + for large C projects. KScope is focused on source editing and analysis. + . + KScope is built around an efficient mechanism for code-navigation, which + allows the user to run queries on the code. + . + The types of queries KScope can run include: + * Get all references to a symbol + * Find the definition of a symbol + * Find all functions called by or calling to a function + * Find an EGrep pattern + * Find all files #including some file + . + These queries are handled by an underlying Cscope process. KScope simply + serves as a front-end to this process, feeding it with queries, and parsing + its output into result lists. The items in those lists can later be selected + to open an editor at the matching line. + . + Main Features: + * Multiple editor windows (using your favourite TDE editor) + * Project management + * Front-end to most Cscope queries + * Tag list for every open editor + * Call-tree window + * Session management, including saving and restoring queries + * Works with externally-built cscope.out files + . + Homepage: http://kscope.sourceforge.net diff --git a/debian/lenny/applications/kscope/debian/copyright b/debian/lenny/applications/kscope/debian/copyright new file mode 100644 index 000000000..6149f4244 --- /dev/null +++ b/debian/lenny/applications/kscope/debian/copyright @@ -0,0 +1,62 @@ +This package was debianized by Fathi Boudra on +Tue, 11 Apr 2006 11:44:04 +0200. + +It was downloaded from http://kscope.sourceforge.net + +Copyright Holder: Elad Lahav + +The kscope manpage is © 2006 Jonathan Patrick Davies +and is licensed under the GPL, see below. + +manpage 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-2'. + +kscope license: + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions +are met: + +1. Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. +2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + +THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR +IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES +OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. +IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, +INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT +NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF +THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +On Debian systems, the complete text of the BSD License can be +found in `/usr/share/common-licenses/BSD'. + +The documentations provided with kscope is distributed under +the GNU Free Documentation License (FDL). They are considered free with +regards to the Debian Free Software Guidelines (DFSG) because they don't +contain any unmodifiable parts (invariant sections). + +On Debian systems, the complete text of the GNU Free Documentation +License can be found in `/usr/share/common-licenses/GFDL'. diff --git a/debian/lenny/applications/kscope/debian/docs b/debian/lenny/applications/kscope/debian/docs new file mode 100644 index 000000000..1333ed77b --- /dev/null +++ b/debian/lenny/applications/kscope/debian/docs @@ -0,0 +1 @@ +TODO diff --git a/debian/lenny/applications/kscope/debian/kscope.xml b/debian/lenny/applications/kscope/debian/kscope.xml new file mode 100644 index 000000000..a70b1be45 --- /dev/null +++ b/debian/lenny/applications/kscope/debian/kscope.xml @@ -0,0 +1,124 @@ + + + + + + Jonathan Patrick + Davies + jpatrick@ubuntu.com + + + 2006 + Jonathan Patrick Davies + + + + 2006-02-18 + + + + kscope + 1 + + + kscope + a source browsing and editing environment + + + + kscope + + + + + + + + + + DESCRIPTION + + KScope is a source browsing and editing environment for large projects written + in C (such as the Linux kernel). + + + KScope uses the Cscope code analysis engine to provide valuable information to + coders. + + + KScope also provides call-tree and call-graph views that can help developers + by visualising the relationships between different functions in the code base. + + + + OPTIONS + + All TDE and Qt + programs accept a some common command-line options. KScope has no + application-specific options. + + + + Generic options: + + + Show help about options + + + + Show Qt specific options + + + + Show TDE specific options + + + + Show all options + + + + Show author information + + + , + Show version information + + + + Show license information + + + + Indicates end of options + + + + + + + AUTHOR + + KScope was written by Elad Lahav elad_lahav@users.sf.net. + + + + COPYRIGHT + + This manual page was written by Jonathan Patrick Davies + jpatrick@ubuntu.com for the + Ubuntu system (but may be used by others). + Permission is granted to copy, distribute and/or modify this document + under the terms of the GNU General Public License, + Version 2 or any later version published by the Free Software Foundation. + + + On Debian systems, the complete text of the GNU General Public + License can be found in + /usr/share/common-licenses/GPL. + + + diff --git a/debian/lenny/applications/kscope/debian/manpages b/debian/lenny/applications/kscope/debian/manpages new file mode 100644 index 000000000..03ff43b50 --- /dev/null +++ b/debian/lenny/applications/kscope/debian/manpages @@ -0,0 +1 @@ +kscope.1 diff --git a/debian/lenny/applications/kscope/debian/patches/04_am_maintainer_mode.diff b/debian/lenny/applications/kscope/debian/patches/04_am_maintainer_mode.diff new file mode 100644 index 000000000..391a80285 --- /dev/null +++ b/debian/lenny/applications/kscope/debian/patches/04_am_maintainer_mode.diff @@ -0,0 +1,11 @@ +--- a/admin/configure.in.min ++++ b/admin/configure.in.min +@@ -38,6 +38,8 @@ + dnl Automake doc recommends to do this only here. (Janos) + AM_INIT_AUTOMAKE(@MODULENAME@, @VERSION@) dnl searches for some needed programs + ++AM_MAINTAINER_MODE ++ + KDE_SET_PREFIX + + dnl generate the config header diff --git a/debian/lenny/applications/kscope/debian/patches/06_disable_no_undefined.diff b/debian/lenny/applications/kscope/debian/patches/06_disable_no_undefined.diff new file mode 100644 index 000000000..05c932c3c --- /dev/null +++ b/debian/lenny/applications/kscope/debian/patches/06_disable_no_undefined.diff @@ -0,0 +1,18 @@ +--- a/admin/acinclude.m4.in ++++ b/admin/acinclude.m4.in +@@ -1689,15 +1689,6 @@ + KDE_USE_CLOSURE_TRUE="#" + KDE_USE_CLOSURE_FALSE="" + KDE_NO_UNDEFINED="" +- case $host in +- *-*-linux-gnu) +- KDE_CHECK_COMPILER_FLAG([Wl,--no-undefined], +- [KDE_CHECK_COMPILER_FLAG([Wl,--allow-shlib-undefined], +- [KDE_NO_UNDEFINED="-Wl,--no-undefined -Wl,--allow-shlib-undefined"], +- [KDE_NO_UNDEFINED=""])], +- [KDE_NO_UNDEFINED=""]) +- ;; +- esac + fi + AC_SUBST(KDE_USE_CLOSURE_TRUE) + AC_SUBST(KDE_USE_CLOSURE_FALSE) diff --git a/debian/lenny/applications/kscope/debian/patches/series b/debian/lenny/applications/kscope/debian/patches/series new file mode 100644 index 000000000..b8743ddd9 --- /dev/null +++ b/debian/lenny/applications/kscope/debian/patches/series @@ -0,0 +1,2 @@ +04_am_maintainer_mode.diff +06_disable_no_undefined.diff diff --git a/debian/lenny/applications/kscope/debian/rules b/debian/lenny/applications/kscope/debian/rules new file mode 100755 index 000000000..65883a481 --- /dev/null +++ b/debian/lenny/applications/kscope/debian/rules @@ -0,0 +1,40 @@ +#!/usr/bin/make -f + +include /usr/share/cdbs/1/rules/debhelper.mk +include debian/cdbs/kde.mk +include /usr/share/cdbs/1/rules/patchsys-quilt.mk +include /usr/share/cdbs/1/rules/utils.mk + +DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include +DEB_CONFIGURE_MANDIR := /opt/trinity/share/man +DEB_CONFIGURE_PREFIX := /opt/trinity +DEB_CONFIGURE_INFODIR := /opt/trinity/share/info + +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + +post-patches:: debian/stamp-bootstrap + +debian/stamp-bootstrap: + dh_testdir + + # Regenerate build system + ! [ -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 + + autoreconf --install && automake -f && \ + $(MAKE) -f admin/Makefile.common && \ + touch debian/stamp-bootstrap + +build/kscope-trinity:: + /usr/bin/docbook2x-man debian/kscope.xml + +binary-install/kscope-trinity:: + mv debian/$(cdbs_curpkg)/usr/share/man debian/$(cdbs_curpkg)/opt/trinity/share/ + +clean:: + rm -f kscope.1 + rm -f debian/stamp-bootstrap diff --git a/debian/lenny/applications/kscope/debian/source/format b/debian/lenny/applications/kscope/debian/source/format new file mode 100644 index 000000000..89ae9db8f --- /dev/null +++ b/debian/lenny/applications/kscope/debian/source/format @@ -0,0 +1 @@ +3.0 (native) diff --git a/debian/lenny/applications/kscope/debian/source/options b/debian/lenny/applications/kscope/debian/source/options new file mode 100644 index 000000000..72f1f5450 --- /dev/null +++ b/debian/lenny/applications/kscope/debian/source/options @@ -0,0 +1,6 @@ +# Use xz instead of gzip +compression = "xz" +compression-level = 9 + +# Don't run differences +diff-ignore = .* diff --git a/debian/lenny/applications/kscope/debian/watch b/debian/lenny/applications/kscope/debian/watch new file mode 100644 index 000000000..6825f61dd --- /dev/null +++ b/debian/lenny/applications/kscope/debian/watch @@ -0,0 +1,2 @@ +version=3 +http://sf.net/kscope/kscope-(.*)\.tar\.gz debian svn-upgrade diff --git a/debian/lenny/applications/kvpnc/debian/patches/13_add_kuser_issuperuser.diff b/debian/lenny/applications/kvpnc/debian/patches/13_add_kuser_issuperuser.diff index 826d4e236..0729793b7 100644 --- a/debian/lenny/applications/kvpnc/debian/patches/13_add_kuser_issuperuser.diff +++ b/debian/lenny/applications/kvpnc/debian/patches/13_add_kuser_issuperuser.diff @@ -14,16 +14,16 @@ index 7c45fcf..b933832 100644 } else { --// if (getenv("USER") != "root") +-// if (getenv("USER") != TQString("root")) -// { -// KMessageBox::error( 0, I18N_NOOP( "Kvpnc must be started as root!" ) ); -// exit(0); -// } -+ if (getenv("USER") != "root") -+ { -+ KMessageBox::error( 0, I18N_NOOP( "Kvpnc must be started as root!" ) ); -+ exit(0); -+ } ++ if (getenv("USER") != TQString("root")) ++ { ++ KMessageBox::error( 0, I18N_NOOP( "Kvpnc must be started as root!" ) ); ++ exit(0); ++ } TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); diff --git a/debian/lenny/applications/kvpnc/debian/patches/series b/debian/lenny/applications/kvpnc/debian/patches/series index 09040ada9..d29c3ca91 100644 --- a/debian/lenny/applications/kvpnc/debian/patches/series +++ b/debian/lenny/applications/kvpnc/debian/patches/series @@ -1,2 +1,2 @@ -10_su-to-root_usage.diff +# 10_su-to-root_usage.diff 13_add_kuser_issuperuser.diff diff --git a/debian/lenny/applications/tdepowersave/debian/cdbs/debian-qt-kde.mk b/debian/lenny/applications/tdepowersave/debian/cdbs/debian-qt-kde.mk index c807eed8c..33a932634 100644 --- a/debian/lenny/applications/tdepowersave/debian/cdbs/debian-qt-kde.mk +++ b/debian/lenny/applications/tdepowersave/debian/cdbs/debian-qt-kde.mk @@ -10,9 +10,11 @@ _cdbs_class_debian-qt-kde := 1 # Note: This _must_ be included before autotools.mk, or it won't work. common-configure-arch common-configure-indep:: debian/stamp-cvs-make debian/stamp-cvs-make: +ifndef _cdbs_class_cmake cp -Rp /usr/share/aclocal/libtool.m4 admin/libtool.m4.in cp -Rp /usr/share/libtool/config/ltmain.sh admin/ltmain.sh $(MAKE) -C $(DEB_SRCDIR) -f admin/Makefile.common dist; +endif touch debian/stamp-cvs-make include debian/cdbs/kde.mk$(_cdbs_makefile_suffix) @@ -98,6 +100,7 @@ binary-install/$(DEB_SOURCE_PACKAGE)-doc-html:: done clean:: +ifndef _cdbs_class_cmake if test -n "$(DEB_KDE_CVS_MAKE)" && test -d $(DEB_SRCDIR); then \ cd $(DEB_SRCDIR); \ find . -name Makefile.in -print | \ @@ -106,6 +109,7 @@ clean:: configure configure.files configure.in stamp-h.in \ subdirs; \ fi +endif rm -f debian/stamp-cvs-make endif diff --git a/debian/lenny/applications/tdepowersave/debian/cdbs/kde.mk b/debian/lenny/applications/tdepowersave/debian/cdbs/kde.mk index 765560c89..023886fc8 100644 --- a/debian/lenny/applications/tdepowersave/debian/cdbs/kde.mk +++ b/debian/lenny/applications/tdepowersave/debian/cdbs/kde.mk @@ -35,7 +35,9 @@ else DEB_BUILDDIR = obj-$(DEB_BUILD_GNU_TYPE) endif +ifndef _cdbs_class_cmake include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix) +endif export kde_cgidir = \$${libdir}/cgi-bin export kde_confdir = \$${sysconfdir}/trinity @@ -59,7 +61,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/debian/lenny/applications/tdepowersave/debian/control b/debian/lenny/applications/tdepowersave/debian/control index ca4a5def2..7882039dd 100644 --- a/debian/lenny/applications/tdepowersave/debian/control +++ b/debian/lenny/applications/tdepowersave/debian/control @@ -3,7 +3,7 @@ Section: tde Priority: optional Maintainer: Timothy Pearson XSBC-Original-Maintainer: Michael Biebl -Build-Depends: cdbs, debhelper (>= 5.0.0), quilt, tdelibs14-trinity-dev, libxss-dev, libxtst-dev, libdbus-1-dev (>= 0.6), libdbus-tqt-1-dev, automake, autoconf, libtool, libltdl-dev +Build-Depends: cdbs, debhelper (>= 5.0.0), quilt, tdelibs14-trinity-dev, libxss-dev, libxtst-dev, libdbus-1-dev (>= 0.6), libdbus-tqt-1-dev, cmake, automake, autoconf, libtool, libltdl-dev Build-Conflicts: autoconf2.13 Standards-Version: 3.8.4 Homepage: http://sourceforge.net/projects/powersave/ diff --git a/debian/lenny/applications/tdepowersave/debian/rules b/debian/lenny/applications/tdepowersave/debian/rules index f74a76605..a891b0150 100755 --- a/debian/lenny/applications/tdepowersave/debian/rules +++ b/debian/lenny/applications/tdepowersave/debian/rules @@ -1,5 +1,6 @@ #!/usr/bin/make -f +include /usr/share/cdbs/1/class/cmake.mk include debian/cdbs/kde.mk include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/rules/patchsys-quilt.mk @@ -17,9 +18,20 @@ DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinit DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ && echo xz || echo bzip2) +DEB_CMAKE_EXTRA_FLAGS := \ + -DCMAKE_INSTALL_PREFIX="/opt/trinity" \ + -DCONFIG_INSTALL_DIR="/etc/trinity" \ + -DSYSCONF_INSTALL_DIR="/etc/trinity" \ + -DXDG_MENU_INSTALL_DIR="/etc/xdg/menus" \ + -DCMAKE_BUILD_TYPE=RelWithDebInfo \ + -DCMAKE_VERBOSE_MAKEFILE="ON" \ + -DCMAKE_SKIP_RPATH="OFF" \ + -DBUILD_ALL="ON" + post-patches:: debian/stamp-bootstrap debian/stamp-bootstrap: +ifndef _cdbs_class_cmake ! [ -f /usr/share/libtool/ltmain.sh ] || \ cp -f /usr/share/libtool/ltmain.sh admin/ltmain.sh ! [ -f /usr/share/libtool/config/ltmain.sh ] || \ @@ -27,6 +39,7 @@ debian/stamp-bootstrap: cp -f /usr/share/aclocal/libtool.m4 admin/libtool.m4.in make -f admin/Makefile.common cvs +endif touch debian/stamp-bootstrap install/tdepowersave-trinity:: diff --git a/debian/lenny/tdelibs/debian/control b/debian/lenny/tdelibs/debian/control index d38f9b418..cb73309e6 100644 --- a/debian/lenny/tdelibs/debian/control +++ b/debian/lenny/tdelibs/debian/control @@ -60,7 +60,7 @@ Replaces: kdelibs4c2a-kde3 (<< 4:14.0.0~), kdelibs4c2a-trinity (<< 4:14.0.0~), t Breaks: kdelibs4c2a-kde3 (<< 4:14.0.0~), kdelibs4c2a-trinity (<< 4:14.0.0~), tdelibs4c2a-trinity Depends: ${shlibs:Depends}, tdelibs-data-trinity, tdelibs-data-trinity, libart-2.0-2 (>= 4:14.0.0~), perl, xbase-clients, sudo -Recommends: xdg-user-dirs +Recommends: xdg-user-dirs, consolekit Suggests: fam, perl-suid Conflicts: tdelibs4-trinity, tdelibs4c2-trinity (>> 4:1.0.0), tdelibs-bin-trinity (<< 4:3.3.3), tdelibs4-trinity-dev (<< 4:3.5.7.dfsg.1-6) Description: core libraries and binaries for all TDE applications diff --git a/debian/squeeze/applications/kscope/debian/cdbs/debian-qt-kde.mk b/debian/squeeze/applications/kscope/debian/cdbs/debian-qt-kde.mk new file mode 100644 index 000000000..d81e0a12f --- /dev/null +++ b/debian/squeeze/applications/kscope/debian/cdbs/debian-qt-kde.mk @@ -0,0 +1,115 @@ +ifndef _cdbs_bootstrap +_cdbs_scripts_path ?= /usr/lib/cdbs +_cdbs_rules_path ?= /usr/share/cdbs/1/rules +_cdbs_class_path ?= /usr/share/cdbs/1/class +endif + +ifndef _cdbs_class_debian-qt-kde +_cdbs_class_debian-qt-kde := 1 + +# Note: This _must_ be included before autotools.mk, or it won't work. +common-configure-arch common-configure-indep:: debian/stamp-cvs-make +debian/stamp-cvs-make: +ifndef _cdbs_class_cmake + cp -Rp /usr/share/aclocal/libtool.m4 admin/libtool.m4.in + cp -Rp /usr/share/libtool/config/ltmain.sh admin/ltmain.sh + $(MAKE) -C $(DEB_SRCDIR) -f admin/Makefile.common dist; +endif + touch 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 := + +DEB_DH_MAKESHLIBS_ARGS_ALL := -V +DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib) + +ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) + cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb + ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches))) + cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,) + else + cdbs_kde_enable_final = + endif +endif + +common-build-arch:: debian/stamp-man-pages +debian/stamp-man-pages: + if ! test -d debian/man/out; then mkdir -p debian/man/out; fi + for f in $$(find debian/man -name '*.sgml'); do \ + docbook-to-man $$f > debian/man/out/`basename $$f .sgml`.1; \ + done + for f in $$(find debian/man -name '*.man'); do \ + soelim -I debian/man $$f \ + > debian/man/out/`basename $$f .man`.`head -n1 $$f | awk '{print $$NF}'`; \ + done + touch debian/stamp-man-pages + +common-binary-indep:: + ( set -e; \ + tmpf=`mktemp debian/versions.XXXXXX`; \ + perl debian/cdbs/versions.pl >$$tmpf; \ + for p in $(DEB_INDEP_PACKAGES); do \ + cat $$tmpf >>debian/$$p.substvars; \ + done; \ + rm -f $$tmpf ) + +common-binary-arch:: + ( set -e; \ + tmpf=`mktemp debian/versions.XXXXXX`; \ + perl debian/cdbs/versions.pl >$$tmpf; \ + for p in $(DEB_ARCH_PACKAGES); do \ + cat $$tmpf >>debian/$$p.substvars; \ + done; \ + rm -f $$tmpf ) + +clean:: + rm -rf debian/man/out + -rmdir debian/man + rm -f debian/stamp-man-pages + rm -rf debian/shlibs-check + +$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: + if test -x /usr/bin/dh_desktop; then dh_desktop -p$(cdbs_curpkg) $(DEB_DH_DESKTOP_ARGS); fi + if test -e debian/$(cdbs_curpkg).lintian; then \ + install -p -D -m644 debian/$(cdbs_curpkg).lintian \ + debian/$(cdbs_curpkg)/usr/share/lintian/overrides/$(cdbs_curpkg); \ + fi + if test -e debian/$(cdbs_curpkg).presubj; then \ + install -p -D -m644 debian/$(cdbs_curpkg).presubj \ + debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \ + fi + +binary-install/$(DEB_SOURCE_PACKAGE)-doc-html:: + set -e; \ + for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \ + pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \ + echo Building $$pkg HTML docs...; \ + mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \ + cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \ + /opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \ + done + for pkg in $(DOC_HTML_PRUNE) ; do \ + rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \ + done + +clean:: +ifndef _cdbs_class_cmake + if test -n "$(DEB_KDE_CVS_MAKE)" && test -d $(DEB_SRCDIR); then \ + cd $(DEB_SRCDIR); \ + find . -name Makefile.in -print | \ + xargs --no-run-if-empty rm -f; \ + rm -f Makefile.am acinclude.m4 aclocal.m4 config.h.in \ + configure configure.files configure.in stamp-h.in \ + subdirs; \ + fi +endif + rm -f debian/stamp-cvs-make + +endif diff --git a/debian/squeeze/applications/kscope/debian/cdbs/kde.mk b/debian/squeeze/applications/kscope/debian/cdbs/kde.mk new file mode 100644 index 000000000..023886fc8 --- /dev/null +++ b/debian/squeeze/applications/kscope/debian/cdbs/kde.mk @@ -0,0 +1,99 @@ +# -*- mode: makefile; coding: utf-8 -*- +# Copyright © 2003 Christopher L Cheney +# Description: A class for KDE packages; sets KDE environment variables, etc +# +# This program 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, or (at +# your option) any later version. +# +# This program 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 program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA +# 02111-1307 USA. + +_cdbs_scripts_path ?= /usr/lib/cdbs +_cdbs_rules_path ?= /usr/share/cdbs/1/rules +_cdbs_class_path ?= /usr/share/cdbs/1/class + +ifndef _cdbs_class_kde +_cdbs_class_kde := 1 + +# for dh_icons +CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), debhelper (>= 5.0.7ubuntu4) + +include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix) + +ifdef _cdbs_tarball_dir +DEB_BUILDDIR = $(_cdbs_tarball_dir)/obj-$(DEB_BUILD_GNU_TYPE) +else +DEB_BUILDDIR = obj-$(DEB_BUILD_GNU_TYPE) +endif + +ifndef _cdbs_class_cmake +include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix) +endif + +export kde_cgidir = \$${libdir}/cgi-bin +export kde_confdir = \$${sysconfdir}/trinity +export kde_htmldir = \$${datadir}/doc/tde/HTML + +ifeq (,$(filter noopt,$(DEB_BUILD_OPTIONS))) + cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,) +endif + +ifneq (,$(filter nostrip,$(DEB_BUILD_OPTIONS))) + cdbs_kde_enable_final = + cdbs_kde_enable_debug = --enable-debug=yes +else + cdbs_kde_enable_debug = --disable-debug +endif + +ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS))) + cdbs_kde_enable_debug = --enable-debug=full +endif + +cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) + +DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include" +DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el + +$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: + if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi + +cleanbuilddir:: + -$(if $(call cdbs_streq,$(DEB_BUILDDIR),$(DEB_SRCDIR)),,rm -rf $(DEB_BUILDDIR)) + +common-build-arch common-build-indep:: debian/stamp-kde-apidox +debian/stamp-kde-apidox: + $(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox) + touch $@ + +common-install-prehook-impl:: + mkdir -p po + -XGETTEXT=/usr/bin/kde-xgettext EXTRACTATTR=/opt/trinity/bin/extractattr sh $(DEB_SRCDIR)/admin/cvs.sh extract-messages + -for file in po/*pot; do \ + sed "s/charset=CHARSET/charset=UTF-8/" -i $$file; \ + done + +common-install-arch common-install-indep:: common-install-kde-apidox +common-install-kde-apidox:: + $(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) install-apidox DESTDIR=$(DEB_DESTDIR)) + +clean:: + rm -f debian/stamp-kde-apidox + rm -rf po/*.pot + +# This is a convenience target for calling manually. It's not part of +# the build process. +buildprep: clean apply-patches + $(MAKE) -f admin/Makefile.common dist + debian/rules clean + +endif diff --git a/debian/squeeze/applications/kscope/debian/cdbs/versions.pl b/debian/squeeze/applications/kscope/debian/cdbs/versions.pl new file mode 100644 index 000000000..75c9add4b --- /dev/null +++ b/debian/squeeze/applications/kscope/debian/cdbs/versions.pl @@ -0,0 +1,19 @@ +#!/usr/bin/env perl + +use strict; +use warnings; + +my $version = `dpkg-parsechangelog | awk '/^Version/ {print \$2}'`; +my ($version3, $version3_next); +my ($version2, $version2_next); + +($version3 = $version) =~ s/^(([^.]+\.){2}[^.+~-]+)[.+~-]?[^-]*-[^-]+$/$1/; +($version2 = $version3) =~ s/\.[^.]+$//; + +($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e; +($version2_next = $version2) =~ s/(?<=\.)(\d+)$/($1+1)/e; + +print "KDE-Version3=$version3\n"; +print "KDE-Version2=$version2\n"; +print "KDE-Next-Version3=$version3_next\n"; +print "KDE-Next-Version2=$version2_next\n"; diff --git a/debian/squeeze/applications/kscope/debian/changelog b/debian/squeeze/applications/kscope/debian/changelog new file mode 100644 index 000000000..d3689c28f --- /dev/null +++ b/debian/squeeze/applications/kscope/debian/changelog @@ -0,0 +1,97 @@ +kscope-trinity (1.6.2-1ubuntu1) maverick; urgency=low + + * Initial Release for TDE + + -- Slávek Banko Mon, 07 Sep 2013 23:43:53 +0200 + +kscope (1.6.2-1ubuntu1) maverick; urgency=low + + * Port to Ubuntu. + + -- Eugene San (eugenesan) Fri, 04 Feb 2011 22:02:59 +0200 + +kscope (1.6.2-1) unstable; urgency=low + + * New upstream release (bugfix release). + * Bump Standards-Version to 3.8.0 (no changes needed). + + -- Fathi Boudra Sat, 09 Aug 2008 10:20:14 +0200 + +kscope (1.6.1-1) unstable; urgency=low + + * New upstream release. + * Refresh patches. + * Bump Standards-Version to 3.7.3. + * Use Homepage, Vcs-Browser and Vcs-Svn fields. + * Switch to quilt patch system. + * Remove embedded copy of GFDL as it can be found in common-licences. + + -- Fathi Boudra Sat, 01 Mar 2008 19:33:31 +0100 + +kscope (1.6.0-1) unstable; urgency=low + + * New upstream release. + + -- Fathi Boudra Thu, 12 Jul 2007 21:22:32 +0200 + +kscope (1.5.2-1) unstable; urgency=low + + * New upstream release. (Closes: #420874) + + -- Fathi Boudra Tue, 15 May 2007 19:47:50 +0200 + +kscope (1.5.1-2) unstable; urgency=low + + * Upload to unstable + + -- Mark Purcell Sat, 3 Mar 2007 13:23:12 +0000 + +kscope (1.5.1-1) experimental; urgency=low + + * New upstream release. + + -- Fathi Boudra Thu, 15 Feb 2007 18:56:31 +0100 + +kscope (1.5.0-1) unstable; urgency=low + + * New upstream release + * Add ./debian/rules get-orig-source for http://buildserver.net + * Build-Depends: autotools-dev fixes outdated-autotools-helper-file + + -- Mark Purcell Wed, 7 Feb 2007 21:08:10 +0000 + +kscope (1.4.2-1) unstable; urgency=low + + * New upstream release + + -- Fathi Boudra Mon, 16 Oct 2006 22:03:21 +0200 + +kscope (1.4.1-2) unstable; urgency=low + + * Add patch to load default config + + -- Fathi Boudra Fri, 8 Sep 2006 18:13:30 +0200 + +kscope (1.4.1-1) unstable; urgency=low + + * New upstream release + * Remove 11_crashfix.diff, merged upstream + + -- Fathi Boudra Thu, 24 Aug 2006 12:24:23 +0200 + +kscope (1.4.0-1) unstable; urgency=low + + * New upstream release + * Merge kubuntu patches, thanks to Tom Albers + * Add kscope manpage from kubuntu package, + thanks to Jonathan Patrick Davies + * Update copyright file: add kscope manpage license + + -- Fathi Boudra Thu, 10 Aug 2006 14:42:31 +0200 + +kscope (1.3.4-1) unstable; urgency=low + + * Initial release (Closes: #309669) + + -- Fathi Boudra Fri, 28 Apr 2006 08:05:15 +0100 + diff --git a/debian/squeeze/applications/kscope/debian/compat b/debian/squeeze/applications/kscope/debian/compat new file mode 100644 index 000000000..7ed6ff82d --- /dev/null +++ b/debian/squeeze/applications/kscope/debian/compat @@ -0,0 +1 @@ +5 diff --git a/debian/squeeze/applications/kscope/debian/control b/debian/squeeze/applications/kscope/debian/control new file mode 100644 index 000000000..f48fa899a --- /dev/null +++ b/debian/squeeze/applications/kscope/debian/control @@ -0,0 +1,45 @@ +Source: kscope-trinity +Section: tde +Priority: optional +Maintainer: Timothy Pearson +XSBC-Original-Maintainer: Debian KDE Extras Team +Uploaders: Fathi Boudra , Mark Purcell +Build-Depends: cdbs, debhelper (>= 5), quilt, automake, libtool, bison, flex, + tdebase-trinity-dev, docbook2x, docbook-xml +Standards-Version: 3.8.0 +Homepage: http://kscope.sourceforge.net +Vcs-Browser: http://svn.debian.org/wsvn/pkg-kde/kde-extras/kscope/?op=log +Vcs-Svn: svn://svn.debian.org/pkg-kde/kde-extras/kscope/trunk + +Package: kscope-trinity +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends}, cscope, exuberant-ctags, graphviz +Description: source editing environment for TDE + KScope is a TDE front-end to Cscope. It provides a source-editing environment + for large C projects. KScope is focused on source editing and analysis. + . + KScope is built around an efficient mechanism for code-navigation, which + allows the user to run queries on the code. + . + The types of queries KScope can run include: + * Get all references to a symbol + * Find the definition of a symbol + * Find all functions called by or calling to a function + * Find an EGrep pattern + * Find all files #including some file + . + These queries are handled by an underlying Cscope process. KScope simply + serves as a front-end to this process, feeding it with queries, and parsing + its output into result lists. The items in those lists can later be selected + to open an editor at the matching line. + . + Main Features: + * Multiple editor windows (using your favourite TDE editor) + * Project management + * Front-end to most Cscope queries + * Tag list for every open editor + * Call-tree window + * Session management, including saving and restoring queries + * Works with externally-built cscope.out files + . + Homepage: http://kscope.sourceforge.net diff --git a/debian/squeeze/applications/kscope/debian/copyright b/debian/squeeze/applications/kscope/debian/copyright new file mode 100644 index 000000000..6149f4244 --- /dev/null +++ b/debian/squeeze/applications/kscope/debian/copyright @@ -0,0 +1,62 @@ +This package was debianized by Fathi Boudra on +Tue, 11 Apr 2006 11:44:04 +0200. + +It was downloaded from http://kscope.sourceforge.net + +Copyright Holder: Elad Lahav + +The kscope manpage is © 2006 Jonathan Patrick Davies +and is licensed under the GPL, see below. + +manpage 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-2'. + +kscope license: + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions +are met: + +1. Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. +2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + +THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR +IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES +OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. +IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, +INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT +NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF +THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +On Debian systems, the complete text of the BSD License can be +found in `/usr/share/common-licenses/BSD'. + +The documentations provided with kscope is distributed under +the GNU Free Documentation License (FDL). They are considered free with +regards to the Debian Free Software Guidelines (DFSG) because they don't +contain any unmodifiable parts (invariant sections). + +On Debian systems, the complete text of the GNU Free Documentation +License can be found in `/usr/share/common-licenses/GFDL'. diff --git a/debian/squeeze/applications/kscope/debian/docs b/debian/squeeze/applications/kscope/debian/docs new file mode 100644 index 000000000..1333ed77b --- /dev/null +++ b/debian/squeeze/applications/kscope/debian/docs @@ -0,0 +1 @@ +TODO diff --git a/debian/squeeze/applications/kscope/debian/kscope.xml b/debian/squeeze/applications/kscope/debian/kscope.xml new file mode 100644 index 000000000..a70b1be45 --- /dev/null +++ b/debian/squeeze/applications/kscope/debian/kscope.xml @@ -0,0 +1,124 @@ + + + + + + Jonathan Patrick + Davies + jpatrick@ubuntu.com + + + 2006 + Jonathan Patrick Davies + + + + 2006-02-18 + + + + kscope + 1 + + + kscope + a source browsing and editing environment + + + + kscope + + + + + + + + + + DESCRIPTION + + KScope is a source browsing and editing environment for large projects written + in C (such as the Linux kernel). + + + KScope uses the Cscope code analysis engine to provide valuable information to + coders. + + + KScope also provides call-tree and call-graph views that can help developers + by visualising the relationships between different functions in the code base. + + + + OPTIONS + + All TDE and Qt + programs accept a some common command-line options. KScope has no + application-specific options. + + + + Generic options: + + + Show help about options + + + + Show Qt specific options + + + + Show TDE specific options + + + + Show all options + + + + Show author information + + + , + Show version information + + + + Show license information + + + + Indicates end of options + + + + + + + AUTHOR + + KScope was written by Elad Lahav elad_lahav@users.sf.net. + + + + COPYRIGHT + + This manual page was written by Jonathan Patrick Davies + jpatrick@ubuntu.com for the + Ubuntu system (but may be used by others). + Permission is granted to copy, distribute and/or modify this document + under the terms of the GNU General Public License, + Version 2 or any later version published by the Free Software Foundation. + + + On Debian systems, the complete text of the GNU General Public + License can be found in + /usr/share/common-licenses/GPL. + + + diff --git a/debian/squeeze/applications/kscope/debian/manpages b/debian/squeeze/applications/kscope/debian/manpages new file mode 100644 index 000000000..03ff43b50 --- /dev/null +++ b/debian/squeeze/applications/kscope/debian/manpages @@ -0,0 +1 @@ +kscope.1 diff --git a/debian/squeeze/applications/kscope/debian/patches/04_am_maintainer_mode.diff b/debian/squeeze/applications/kscope/debian/patches/04_am_maintainer_mode.diff new file mode 100644 index 000000000..391a80285 --- /dev/null +++ b/debian/squeeze/applications/kscope/debian/patches/04_am_maintainer_mode.diff @@ -0,0 +1,11 @@ +--- a/admin/configure.in.min ++++ b/admin/configure.in.min +@@ -38,6 +38,8 @@ + dnl Automake doc recommends to do this only here. (Janos) + AM_INIT_AUTOMAKE(@MODULENAME@, @VERSION@) dnl searches for some needed programs + ++AM_MAINTAINER_MODE ++ + KDE_SET_PREFIX + + dnl generate the config header diff --git a/debian/squeeze/applications/kscope/debian/patches/06_disable_no_undefined.diff b/debian/squeeze/applications/kscope/debian/patches/06_disable_no_undefined.diff new file mode 100644 index 000000000..05c932c3c --- /dev/null +++ b/debian/squeeze/applications/kscope/debian/patches/06_disable_no_undefined.diff @@ -0,0 +1,18 @@ +--- a/admin/acinclude.m4.in ++++ b/admin/acinclude.m4.in +@@ -1689,15 +1689,6 @@ + KDE_USE_CLOSURE_TRUE="#" + KDE_USE_CLOSURE_FALSE="" + KDE_NO_UNDEFINED="" +- case $host in +- *-*-linux-gnu) +- KDE_CHECK_COMPILER_FLAG([Wl,--no-undefined], +- [KDE_CHECK_COMPILER_FLAG([Wl,--allow-shlib-undefined], +- [KDE_NO_UNDEFINED="-Wl,--no-undefined -Wl,--allow-shlib-undefined"], +- [KDE_NO_UNDEFINED=""])], +- [KDE_NO_UNDEFINED=""]) +- ;; +- esac + fi + AC_SUBST(KDE_USE_CLOSURE_TRUE) + AC_SUBST(KDE_USE_CLOSURE_FALSE) diff --git a/debian/squeeze/applications/kscope/debian/patches/series b/debian/squeeze/applications/kscope/debian/patches/series new file mode 100644 index 000000000..b8743ddd9 --- /dev/null +++ b/debian/squeeze/applications/kscope/debian/patches/series @@ -0,0 +1,2 @@ +04_am_maintainer_mode.diff +06_disable_no_undefined.diff diff --git a/debian/squeeze/applications/kscope/debian/rules b/debian/squeeze/applications/kscope/debian/rules new file mode 100755 index 000000000..65883a481 --- /dev/null +++ b/debian/squeeze/applications/kscope/debian/rules @@ -0,0 +1,40 @@ +#!/usr/bin/make -f + +include /usr/share/cdbs/1/rules/debhelper.mk +include debian/cdbs/kde.mk +include /usr/share/cdbs/1/rules/patchsys-quilt.mk +include /usr/share/cdbs/1/rules/utils.mk + +DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include +DEB_CONFIGURE_MANDIR := /opt/trinity/share/man +DEB_CONFIGURE_PREFIX := /opt/trinity +DEB_CONFIGURE_INFODIR := /opt/trinity/share/info + +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + +post-patches:: debian/stamp-bootstrap + +debian/stamp-bootstrap: + dh_testdir + + # Regenerate build system + ! [ -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 + + autoreconf --install && automake -f && \ + $(MAKE) -f admin/Makefile.common && \ + touch debian/stamp-bootstrap + +build/kscope-trinity:: + /usr/bin/docbook2x-man debian/kscope.xml + +binary-install/kscope-trinity:: + mv debian/$(cdbs_curpkg)/usr/share/man debian/$(cdbs_curpkg)/opt/trinity/share/ + +clean:: + rm -f kscope.1 + rm -f debian/stamp-bootstrap diff --git a/debian/squeeze/applications/kscope/debian/source/format b/debian/squeeze/applications/kscope/debian/source/format new file mode 100644 index 000000000..89ae9db8f --- /dev/null +++ b/debian/squeeze/applications/kscope/debian/source/format @@ -0,0 +1 @@ +3.0 (native) diff --git a/debian/squeeze/applications/kscope/debian/source/options b/debian/squeeze/applications/kscope/debian/source/options new file mode 100644 index 000000000..72f1f5450 --- /dev/null +++ b/debian/squeeze/applications/kscope/debian/source/options @@ -0,0 +1,6 @@ +# Use xz instead of gzip +compression = "xz" +compression-level = 9 + +# Don't run differences +diff-ignore = .* diff --git a/debian/squeeze/applications/kscope/debian/watch b/debian/squeeze/applications/kscope/debian/watch new file mode 100644 index 000000000..6825f61dd --- /dev/null +++ b/debian/squeeze/applications/kscope/debian/watch @@ -0,0 +1,2 @@ +version=3 +http://sf.net/kscope/kscope-(.*)\.tar\.gz debian svn-upgrade diff --git a/debian/squeeze/applications/kvpnc/debian/patches/13_add_kuser_issuperuser.diff b/debian/squeeze/applications/kvpnc/debian/patches/13_add_kuser_issuperuser.diff index 826d4e236..0729793b7 100644 --- a/debian/squeeze/applications/kvpnc/debian/patches/13_add_kuser_issuperuser.diff +++ b/debian/squeeze/applications/kvpnc/debian/patches/13_add_kuser_issuperuser.diff @@ -14,16 +14,16 @@ index 7c45fcf..b933832 100644 } else { --// if (getenv("USER") != "root") +-// if (getenv("USER") != TQString("root")) -// { -// KMessageBox::error( 0, I18N_NOOP( "Kvpnc must be started as root!" ) ); -// exit(0); -// } -+ if (getenv("USER") != "root") -+ { -+ KMessageBox::error( 0, I18N_NOOP( "Kvpnc must be started as root!" ) ); -+ exit(0); -+ } ++ if (getenv("USER") != TQString("root")) ++ { ++ KMessageBox::error( 0, I18N_NOOP( "Kvpnc must be started as root!" ) ); ++ exit(0); ++ } TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); diff --git a/debian/squeeze/applications/kvpnc/debian/patches/series b/debian/squeeze/applications/kvpnc/debian/patches/series index 09040ada9..d29c3ca91 100644 --- a/debian/squeeze/applications/kvpnc/debian/patches/series +++ b/debian/squeeze/applications/kvpnc/debian/patches/series @@ -1,2 +1,2 @@ -10_su-to-root_usage.diff +# 10_su-to-root_usage.diff 13_add_kuser_issuperuser.diff diff --git a/debian/squeeze/applications/tdepowersave/debian/cdbs/debian-qt-kde.mk b/debian/squeeze/applications/tdepowersave/debian/cdbs/debian-qt-kde.mk index c807eed8c..33a932634 100644 --- a/debian/squeeze/applications/tdepowersave/debian/cdbs/debian-qt-kde.mk +++ b/debian/squeeze/applications/tdepowersave/debian/cdbs/debian-qt-kde.mk @@ -10,9 +10,11 @@ _cdbs_class_debian-qt-kde := 1 # Note: This _must_ be included before autotools.mk, or it won't work. common-configure-arch common-configure-indep:: debian/stamp-cvs-make debian/stamp-cvs-make: +ifndef _cdbs_class_cmake cp -Rp /usr/share/aclocal/libtool.m4 admin/libtool.m4.in cp -Rp /usr/share/libtool/config/ltmain.sh admin/ltmain.sh $(MAKE) -C $(DEB_SRCDIR) -f admin/Makefile.common dist; +endif touch debian/stamp-cvs-make include debian/cdbs/kde.mk$(_cdbs_makefile_suffix) @@ -98,6 +100,7 @@ binary-install/$(DEB_SOURCE_PACKAGE)-doc-html:: done clean:: +ifndef _cdbs_class_cmake if test -n "$(DEB_KDE_CVS_MAKE)" && test -d $(DEB_SRCDIR); then \ cd $(DEB_SRCDIR); \ find . -name Makefile.in -print | \ @@ -106,6 +109,7 @@ clean:: configure configure.files configure.in stamp-h.in \ subdirs; \ fi +endif rm -f debian/stamp-cvs-make endif diff --git a/debian/squeeze/applications/tdepowersave/debian/cdbs/kde.mk b/debian/squeeze/applications/tdepowersave/debian/cdbs/kde.mk index 765560c89..023886fc8 100644 --- a/debian/squeeze/applications/tdepowersave/debian/cdbs/kde.mk +++ b/debian/squeeze/applications/tdepowersave/debian/cdbs/kde.mk @@ -35,7 +35,9 @@ else DEB_BUILDDIR = obj-$(DEB_BUILD_GNU_TYPE) endif +ifndef _cdbs_class_cmake include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix) +endif export kde_cgidir = \$${libdir}/cgi-bin export kde_confdir = \$${sysconfdir}/trinity @@ -59,7 +61,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/debian/squeeze/applications/tdepowersave/debian/control b/debian/squeeze/applications/tdepowersave/debian/control index ca4a5def2..7882039dd 100644 --- a/debian/squeeze/applications/tdepowersave/debian/control +++ b/debian/squeeze/applications/tdepowersave/debian/control @@ -3,7 +3,7 @@ Section: tde Priority: optional Maintainer: Timothy Pearson XSBC-Original-Maintainer: Michael Biebl -Build-Depends: cdbs, debhelper (>= 5.0.0), quilt, tdelibs14-trinity-dev, libxss-dev, libxtst-dev, libdbus-1-dev (>= 0.6), libdbus-tqt-1-dev, automake, autoconf, libtool, libltdl-dev +Build-Depends: cdbs, debhelper (>= 5.0.0), quilt, tdelibs14-trinity-dev, libxss-dev, libxtst-dev, libdbus-1-dev (>= 0.6), libdbus-tqt-1-dev, cmake, automake, autoconf, libtool, libltdl-dev Build-Conflicts: autoconf2.13 Standards-Version: 3.8.4 Homepage: http://sourceforge.net/projects/powersave/ diff --git a/debian/squeeze/applications/tdepowersave/debian/rules b/debian/squeeze/applications/tdepowersave/debian/rules index f74a76605..a891b0150 100755 --- a/debian/squeeze/applications/tdepowersave/debian/rules +++ b/debian/squeeze/applications/tdepowersave/debian/rules @@ -1,5 +1,6 @@ #!/usr/bin/make -f +include /usr/share/cdbs/1/class/cmake.mk include debian/cdbs/kde.mk include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/rules/patchsys-quilt.mk @@ -17,9 +18,20 @@ DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinit DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ && echo xz || echo bzip2) +DEB_CMAKE_EXTRA_FLAGS := \ + -DCMAKE_INSTALL_PREFIX="/opt/trinity" \ + -DCONFIG_INSTALL_DIR="/etc/trinity" \ + -DSYSCONF_INSTALL_DIR="/etc/trinity" \ + -DXDG_MENU_INSTALL_DIR="/etc/xdg/menus" \ + -DCMAKE_BUILD_TYPE=RelWithDebInfo \ + -DCMAKE_VERBOSE_MAKEFILE="ON" \ + -DCMAKE_SKIP_RPATH="OFF" \ + -DBUILD_ALL="ON" + post-patches:: debian/stamp-bootstrap debian/stamp-bootstrap: +ifndef _cdbs_class_cmake ! [ -f /usr/share/libtool/ltmain.sh ] || \ cp -f /usr/share/libtool/ltmain.sh admin/ltmain.sh ! [ -f /usr/share/libtool/config/ltmain.sh ] || \ @@ -27,6 +39,7 @@ debian/stamp-bootstrap: cp -f /usr/share/aclocal/libtool.m4 admin/libtool.m4.in make -f admin/Makefile.common cvs +endif touch debian/stamp-bootstrap install/tdepowersave-trinity:: diff --git a/debian/squeeze/tdelibs/debian/control b/debian/squeeze/tdelibs/debian/control index d38f9b418..cb73309e6 100644 --- a/debian/squeeze/tdelibs/debian/control +++ b/debian/squeeze/tdelibs/debian/control @@ -60,7 +60,7 @@ Replaces: kdelibs4c2a-kde3 (<< 4:14.0.0~), kdelibs4c2a-trinity (<< 4:14.0.0~), t Breaks: kdelibs4c2a-kde3 (<< 4:14.0.0~), kdelibs4c2a-trinity (<< 4:14.0.0~), tdelibs4c2a-trinity Depends: ${shlibs:Depends}, tdelibs-data-trinity, tdelibs-data-trinity, libart-2.0-2 (>= 4:14.0.0~), perl, xbase-clients, sudo -Recommends: xdg-user-dirs +Recommends: xdg-user-dirs, consolekit Suggests: fam, perl-suid Conflicts: tdelibs4-trinity, tdelibs4c2-trinity (>> 4:1.0.0), tdelibs-bin-trinity (<< 4:3.3.3), tdelibs4-trinity-dev (<< 4:3.5.7.dfsg.1-6) Description: core libraries and binaries for all TDE applications diff --git a/debian/wheezy/applications/kscope/debian/cdbs/debian-qt-kde.mk b/debian/wheezy/applications/kscope/debian/cdbs/debian-qt-kde.mk new file mode 100644 index 000000000..d81e0a12f --- /dev/null +++ b/debian/wheezy/applications/kscope/debian/cdbs/debian-qt-kde.mk @@ -0,0 +1,115 @@ +ifndef _cdbs_bootstrap +_cdbs_scripts_path ?= /usr/lib/cdbs +_cdbs_rules_path ?= /usr/share/cdbs/1/rules +_cdbs_class_path ?= /usr/share/cdbs/1/class +endif + +ifndef _cdbs_class_debian-qt-kde +_cdbs_class_debian-qt-kde := 1 + +# Note: This _must_ be included before autotools.mk, or it won't work. +common-configure-arch common-configure-indep:: debian/stamp-cvs-make +debian/stamp-cvs-make: +ifndef _cdbs_class_cmake + cp -Rp /usr/share/aclocal/libtool.m4 admin/libtool.m4.in + cp -Rp /usr/share/libtool/config/ltmain.sh admin/ltmain.sh + $(MAKE) -C $(DEB_SRCDIR) -f admin/Makefile.common dist; +endif + touch 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 := + +DEB_DH_MAKESHLIBS_ARGS_ALL := -V +DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib) + +ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) + cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb + ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches))) + cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,) + else + cdbs_kde_enable_final = + endif +endif + +common-build-arch:: debian/stamp-man-pages +debian/stamp-man-pages: + if ! test -d debian/man/out; then mkdir -p debian/man/out; fi + for f in $$(find debian/man -name '*.sgml'); do \ + docbook-to-man $$f > debian/man/out/`basename $$f .sgml`.1; \ + done + for f in $$(find debian/man -name '*.man'); do \ + soelim -I debian/man $$f \ + > debian/man/out/`basename $$f .man`.`head -n1 $$f | awk '{print $$NF}'`; \ + done + touch debian/stamp-man-pages + +common-binary-indep:: + ( set -e; \ + tmpf=`mktemp debian/versions.XXXXXX`; \ + perl debian/cdbs/versions.pl >$$tmpf; \ + for p in $(DEB_INDEP_PACKAGES); do \ + cat $$tmpf >>debian/$$p.substvars; \ + done; \ + rm -f $$tmpf ) + +common-binary-arch:: + ( set -e; \ + tmpf=`mktemp debian/versions.XXXXXX`; \ + perl debian/cdbs/versions.pl >$$tmpf; \ + for p in $(DEB_ARCH_PACKAGES); do \ + cat $$tmpf >>debian/$$p.substvars; \ + done; \ + rm -f $$tmpf ) + +clean:: + rm -rf debian/man/out + -rmdir debian/man + rm -f debian/stamp-man-pages + rm -rf debian/shlibs-check + +$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: + if test -x /usr/bin/dh_desktop; then dh_desktop -p$(cdbs_curpkg) $(DEB_DH_DESKTOP_ARGS); fi + if test -e debian/$(cdbs_curpkg).lintian; then \ + install -p -D -m644 debian/$(cdbs_curpkg).lintian \ + debian/$(cdbs_curpkg)/usr/share/lintian/overrides/$(cdbs_curpkg); \ + fi + if test -e debian/$(cdbs_curpkg).presubj; then \ + install -p -D -m644 debian/$(cdbs_curpkg).presubj \ + debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \ + fi + +binary-install/$(DEB_SOURCE_PACKAGE)-doc-html:: + set -e; \ + for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \ + pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \ + echo Building $$pkg HTML docs...; \ + mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \ + cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \ + /opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \ + done + for pkg in $(DOC_HTML_PRUNE) ; do \ + rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \ + done + +clean:: +ifndef _cdbs_class_cmake + if test -n "$(DEB_KDE_CVS_MAKE)" && test -d $(DEB_SRCDIR); then \ + cd $(DEB_SRCDIR); \ + find . -name Makefile.in -print | \ + xargs --no-run-if-empty rm -f; \ + rm -f Makefile.am acinclude.m4 aclocal.m4 config.h.in \ + configure configure.files configure.in stamp-h.in \ + subdirs; \ + fi +endif + rm -f debian/stamp-cvs-make + +endif diff --git a/debian/wheezy/applications/kscope/debian/cdbs/kde.mk b/debian/wheezy/applications/kscope/debian/cdbs/kde.mk new file mode 100644 index 000000000..023886fc8 --- /dev/null +++ b/debian/wheezy/applications/kscope/debian/cdbs/kde.mk @@ -0,0 +1,99 @@ +# -*- mode: makefile; coding: utf-8 -*- +# Copyright © 2003 Christopher L Cheney +# Description: A class for KDE packages; sets KDE environment variables, etc +# +# This program 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, or (at +# your option) any later version. +# +# This program 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 program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA +# 02111-1307 USA. + +_cdbs_scripts_path ?= /usr/lib/cdbs +_cdbs_rules_path ?= /usr/share/cdbs/1/rules +_cdbs_class_path ?= /usr/share/cdbs/1/class + +ifndef _cdbs_class_kde +_cdbs_class_kde := 1 + +# for dh_icons +CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), debhelper (>= 5.0.7ubuntu4) + +include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix) + +ifdef _cdbs_tarball_dir +DEB_BUILDDIR = $(_cdbs_tarball_dir)/obj-$(DEB_BUILD_GNU_TYPE) +else +DEB_BUILDDIR = obj-$(DEB_BUILD_GNU_TYPE) +endif + +ifndef _cdbs_class_cmake +include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix) +endif + +export kde_cgidir = \$${libdir}/cgi-bin +export kde_confdir = \$${sysconfdir}/trinity +export kde_htmldir = \$${datadir}/doc/tde/HTML + +ifeq (,$(filter noopt,$(DEB_BUILD_OPTIONS))) + cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,) +endif + +ifneq (,$(filter nostrip,$(DEB_BUILD_OPTIONS))) + cdbs_kde_enable_final = + cdbs_kde_enable_debug = --enable-debug=yes +else + cdbs_kde_enable_debug = --disable-debug +endif + +ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS))) + cdbs_kde_enable_debug = --enable-debug=full +endif + +cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) + +DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include" +DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el + +$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: + if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi + +cleanbuilddir:: + -$(if $(call cdbs_streq,$(DEB_BUILDDIR),$(DEB_SRCDIR)),,rm -rf $(DEB_BUILDDIR)) + +common-build-arch common-build-indep:: debian/stamp-kde-apidox +debian/stamp-kde-apidox: + $(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox) + touch $@ + +common-install-prehook-impl:: + mkdir -p po + -XGETTEXT=/usr/bin/kde-xgettext EXTRACTATTR=/opt/trinity/bin/extractattr sh $(DEB_SRCDIR)/admin/cvs.sh extract-messages + -for file in po/*pot; do \ + sed "s/charset=CHARSET/charset=UTF-8/" -i $$file; \ + done + +common-install-arch common-install-indep:: common-install-kde-apidox +common-install-kde-apidox:: + $(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) install-apidox DESTDIR=$(DEB_DESTDIR)) + +clean:: + rm -f debian/stamp-kde-apidox + rm -rf po/*.pot + +# This is a convenience target for calling manually. It's not part of +# the build process. +buildprep: clean apply-patches + $(MAKE) -f admin/Makefile.common dist + debian/rules clean + +endif diff --git a/debian/wheezy/applications/kscope/debian/cdbs/versions.pl b/debian/wheezy/applications/kscope/debian/cdbs/versions.pl new file mode 100644 index 000000000..75c9add4b --- /dev/null +++ b/debian/wheezy/applications/kscope/debian/cdbs/versions.pl @@ -0,0 +1,19 @@ +#!/usr/bin/env perl + +use strict; +use warnings; + +my $version = `dpkg-parsechangelog | awk '/^Version/ {print \$2}'`; +my ($version3, $version3_next); +my ($version2, $version2_next); + +($version3 = $version) =~ s/^(([^.]+\.){2}[^.+~-]+)[.+~-]?[^-]*-[^-]+$/$1/; +($version2 = $version3) =~ s/\.[^.]+$//; + +($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e; +($version2_next = $version2) =~ s/(?<=\.)(\d+)$/($1+1)/e; + +print "KDE-Version3=$version3\n"; +print "KDE-Version2=$version2\n"; +print "KDE-Next-Version3=$version3_next\n"; +print "KDE-Next-Version2=$version2_next\n"; diff --git a/debian/wheezy/applications/kscope/debian/changelog b/debian/wheezy/applications/kscope/debian/changelog new file mode 100644 index 000000000..d3689c28f --- /dev/null +++ b/debian/wheezy/applications/kscope/debian/changelog @@ -0,0 +1,97 @@ +kscope-trinity (1.6.2-1ubuntu1) maverick; urgency=low + + * Initial Release for TDE + + -- Slávek Banko Mon, 07 Sep 2013 23:43:53 +0200 + +kscope (1.6.2-1ubuntu1) maverick; urgency=low + + * Port to Ubuntu. + + -- Eugene San (eugenesan) Fri, 04 Feb 2011 22:02:59 +0200 + +kscope (1.6.2-1) unstable; urgency=low + + * New upstream release (bugfix release). + * Bump Standards-Version to 3.8.0 (no changes needed). + + -- Fathi Boudra Sat, 09 Aug 2008 10:20:14 +0200 + +kscope (1.6.1-1) unstable; urgency=low + + * New upstream release. + * Refresh patches. + * Bump Standards-Version to 3.7.3. + * Use Homepage, Vcs-Browser and Vcs-Svn fields. + * Switch to quilt patch system. + * Remove embedded copy of GFDL as it can be found in common-licences. + + -- Fathi Boudra Sat, 01 Mar 2008 19:33:31 +0100 + +kscope (1.6.0-1) unstable; urgency=low + + * New upstream release. + + -- Fathi Boudra Thu, 12 Jul 2007 21:22:32 +0200 + +kscope (1.5.2-1) unstable; urgency=low + + * New upstream release. (Closes: #420874) + + -- Fathi Boudra Tue, 15 May 2007 19:47:50 +0200 + +kscope (1.5.1-2) unstable; urgency=low + + * Upload to unstable + + -- Mark Purcell Sat, 3 Mar 2007 13:23:12 +0000 + +kscope (1.5.1-1) experimental; urgency=low + + * New upstream release. + + -- Fathi Boudra Thu, 15 Feb 2007 18:56:31 +0100 + +kscope (1.5.0-1) unstable; urgency=low + + * New upstream release + * Add ./debian/rules get-orig-source for http://buildserver.net + * Build-Depends: autotools-dev fixes outdated-autotools-helper-file + + -- Mark Purcell Wed, 7 Feb 2007 21:08:10 +0000 + +kscope (1.4.2-1) unstable; urgency=low + + * New upstream release + + -- Fathi Boudra Mon, 16 Oct 2006 22:03:21 +0200 + +kscope (1.4.1-2) unstable; urgency=low + + * Add patch to load default config + + -- Fathi Boudra Fri, 8 Sep 2006 18:13:30 +0200 + +kscope (1.4.1-1) unstable; urgency=low + + * New upstream release + * Remove 11_crashfix.diff, merged upstream + + -- Fathi Boudra Thu, 24 Aug 2006 12:24:23 +0200 + +kscope (1.4.0-1) unstable; urgency=low + + * New upstream release + * Merge kubuntu patches, thanks to Tom Albers + * Add kscope manpage from kubuntu package, + thanks to Jonathan Patrick Davies + * Update copyright file: add kscope manpage license + + -- Fathi Boudra Thu, 10 Aug 2006 14:42:31 +0200 + +kscope (1.3.4-1) unstable; urgency=low + + * Initial release (Closes: #309669) + + -- Fathi Boudra Fri, 28 Apr 2006 08:05:15 +0100 + diff --git a/debian/wheezy/applications/kscope/debian/compat b/debian/wheezy/applications/kscope/debian/compat new file mode 100644 index 000000000..7ed6ff82d --- /dev/null +++ b/debian/wheezy/applications/kscope/debian/compat @@ -0,0 +1 @@ +5 diff --git a/debian/wheezy/applications/kscope/debian/control b/debian/wheezy/applications/kscope/debian/control new file mode 100644 index 000000000..f48fa899a --- /dev/null +++ b/debian/wheezy/applications/kscope/debian/control @@ -0,0 +1,45 @@ +Source: kscope-trinity +Section: tde +Priority: optional +Maintainer: Timothy Pearson +XSBC-Original-Maintainer: Debian KDE Extras Team +Uploaders: Fathi Boudra , Mark Purcell +Build-Depends: cdbs, debhelper (>= 5), quilt, automake, libtool, bison, flex, + tdebase-trinity-dev, docbook2x, docbook-xml +Standards-Version: 3.8.0 +Homepage: http://kscope.sourceforge.net +Vcs-Browser: http://svn.debian.org/wsvn/pkg-kde/kde-extras/kscope/?op=log +Vcs-Svn: svn://svn.debian.org/pkg-kde/kde-extras/kscope/trunk + +Package: kscope-trinity +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends}, cscope, exuberant-ctags, graphviz +Description: source editing environment for TDE + KScope is a TDE front-end to Cscope. It provides a source-editing environment + for large C projects. KScope is focused on source editing and analysis. + . + KScope is built around an efficient mechanism for code-navigation, which + allows the user to run queries on the code. + . + The types of queries KScope can run include: + * Get all references to a symbol + * Find the definition of a symbol + * Find all functions called by or calling to a function + * Find an EGrep pattern + * Find all files #including some file + . + These queries are handled by an underlying Cscope process. KScope simply + serves as a front-end to this process, feeding it with queries, and parsing + its output into result lists. The items in those lists can later be selected + to open an editor at the matching line. + . + Main Features: + * Multiple editor windows (using your favourite TDE editor) + * Project management + * Front-end to most Cscope queries + * Tag list for every open editor + * Call-tree window + * Session management, including saving and restoring queries + * Works with externally-built cscope.out files + . + Homepage: http://kscope.sourceforge.net diff --git a/debian/wheezy/applications/kscope/debian/copyright b/debian/wheezy/applications/kscope/debian/copyright new file mode 100644 index 000000000..6149f4244 --- /dev/null +++ b/debian/wheezy/applications/kscope/debian/copyright @@ -0,0 +1,62 @@ +This package was debianized by Fathi Boudra on +Tue, 11 Apr 2006 11:44:04 +0200. + +It was downloaded from http://kscope.sourceforge.net + +Copyright Holder: Elad Lahav + +The kscope manpage is © 2006 Jonathan Patrick Davies +and is licensed under the GPL, see below. + +manpage 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-2'. + +kscope license: + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions +are met: + +1. Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. +2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + +THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR +IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES +OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. +IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, +INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT +NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF +THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +On Debian systems, the complete text of the BSD License can be +found in `/usr/share/common-licenses/BSD'. + +The documentations provided with kscope is distributed under +the GNU Free Documentation License (FDL). They are considered free with +regards to the Debian Free Software Guidelines (DFSG) because they don't +contain any unmodifiable parts (invariant sections). + +On Debian systems, the complete text of the GNU Free Documentation +License can be found in `/usr/share/common-licenses/GFDL'. diff --git a/debian/wheezy/applications/kscope/debian/docs b/debian/wheezy/applications/kscope/debian/docs new file mode 100644 index 000000000..1333ed77b --- /dev/null +++ b/debian/wheezy/applications/kscope/debian/docs @@ -0,0 +1 @@ +TODO diff --git a/debian/wheezy/applications/kscope/debian/kscope.xml b/debian/wheezy/applications/kscope/debian/kscope.xml new file mode 100644 index 000000000..a70b1be45 --- /dev/null +++ b/debian/wheezy/applications/kscope/debian/kscope.xml @@ -0,0 +1,124 @@ + + + + + + Jonathan Patrick + Davies + jpatrick@ubuntu.com + + + 2006 + Jonathan Patrick Davies + + + + 2006-02-18 + + + + kscope + 1 + + + kscope + a source browsing and editing environment + + + + kscope + + + + + + + + + + DESCRIPTION + + KScope is a source browsing and editing environment for large projects written + in C (such as the Linux kernel). + + + KScope uses the Cscope code analysis engine to provide valuable information to + coders. + + + KScope also provides call-tree and call-graph views that can help developers + by visualising the relationships between different functions in the code base. + + + + OPTIONS + + All TDE and Qt + programs accept a some common command-line options. KScope has no + application-specific options. + + + + Generic options: + + + Show help about options + + + + Show Qt specific options + + + + Show TDE specific options + + + + Show all options + + + + Show author information + + + , + Show version information + + + + Show license information + + + + Indicates end of options + + + + + + + AUTHOR + + KScope was written by Elad Lahav elad_lahav@users.sf.net. + + + + COPYRIGHT + + This manual page was written by Jonathan Patrick Davies + jpatrick@ubuntu.com for the + Ubuntu system (but may be used by others). + Permission is granted to copy, distribute and/or modify this document + under the terms of the GNU General Public License, + Version 2 or any later version published by the Free Software Foundation. + + + On Debian systems, the complete text of the GNU General Public + License can be found in + /usr/share/common-licenses/GPL. + + + diff --git a/debian/wheezy/applications/kscope/debian/manpages b/debian/wheezy/applications/kscope/debian/manpages new file mode 100644 index 000000000..03ff43b50 --- /dev/null +++ b/debian/wheezy/applications/kscope/debian/manpages @@ -0,0 +1 @@ +kscope.1 diff --git a/debian/wheezy/applications/kscope/debian/patches/04_am_maintainer_mode.diff b/debian/wheezy/applications/kscope/debian/patches/04_am_maintainer_mode.diff new file mode 100644 index 000000000..391a80285 --- /dev/null +++ b/debian/wheezy/applications/kscope/debian/patches/04_am_maintainer_mode.diff @@ -0,0 +1,11 @@ +--- a/admin/configure.in.min ++++ b/admin/configure.in.min +@@ -38,6 +38,8 @@ + dnl Automake doc recommends to do this only here. (Janos) + AM_INIT_AUTOMAKE(@MODULENAME@, @VERSION@) dnl searches for some needed programs + ++AM_MAINTAINER_MODE ++ + KDE_SET_PREFIX + + dnl generate the config header diff --git a/debian/wheezy/applications/kscope/debian/patches/06_disable_no_undefined.diff b/debian/wheezy/applications/kscope/debian/patches/06_disable_no_undefined.diff new file mode 100644 index 000000000..05c932c3c --- /dev/null +++ b/debian/wheezy/applications/kscope/debian/patches/06_disable_no_undefined.diff @@ -0,0 +1,18 @@ +--- a/admin/acinclude.m4.in ++++ b/admin/acinclude.m4.in +@@ -1689,15 +1689,6 @@ + KDE_USE_CLOSURE_TRUE="#" + KDE_USE_CLOSURE_FALSE="" + KDE_NO_UNDEFINED="" +- case $host in +- *-*-linux-gnu) +- KDE_CHECK_COMPILER_FLAG([Wl,--no-undefined], +- [KDE_CHECK_COMPILER_FLAG([Wl,--allow-shlib-undefined], +- [KDE_NO_UNDEFINED="-Wl,--no-undefined -Wl,--allow-shlib-undefined"], +- [KDE_NO_UNDEFINED=""])], +- [KDE_NO_UNDEFINED=""]) +- ;; +- esac + fi + AC_SUBST(KDE_USE_CLOSURE_TRUE) + AC_SUBST(KDE_USE_CLOSURE_FALSE) diff --git a/debian/wheezy/applications/kscope/debian/patches/series b/debian/wheezy/applications/kscope/debian/patches/series new file mode 100644 index 000000000..b8743ddd9 --- /dev/null +++ b/debian/wheezy/applications/kscope/debian/patches/series @@ -0,0 +1,2 @@ +04_am_maintainer_mode.diff +06_disable_no_undefined.diff diff --git a/debian/wheezy/applications/kscope/debian/rules b/debian/wheezy/applications/kscope/debian/rules new file mode 100755 index 000000000..65883a481 --- /dev/null +++ b/debian/wheezy/applications/kscope/debian/rules @@ -0,0 +1,40 @@ +#!/usr/bin/make -f + +include /usr/share/cdbs/1/rules/debhelper.mk +include debian/cdbs/kde.mk +include /usr/share/cdbs/1/rules/patchsys-quilt.mk +include /usr/share/cdbs/1/rules/utils.mk + +DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include +DEB_CONFIGURE_MANDIR := /opt/trinity/share/man +DEB_CONFIGURE_PREFIX := /opt/trinity +DEB_CONFIGURE_INFODIR := /opt/trinity/share/info + +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + +post-patches:: debian/stamp-bootstrap + +debian/stamp-bootstrap: + dh_testdir + + # Regenerate build system + ! [ -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 + + autoreconf --install && automake -f && \ + $(MAKE) -f admin/Makefile.common && \ + touch debian/stamp-bootstrap + +build/kscope-trinity:: + /usr/bin/docbook2x-man debian/kscope.xml + +binary-install/kscope-trinity:: + mv debian/$(cdbs_curpkg)/usr/share/man debian/$(cdbs_curpkg)/opt/trinity/share/ + +clean:: + rm -f kscope.1 + rm -f debian/stamp-bootstrap diff --git a/debian/wheezy/applications/kscope/debian/source/format b/debian/wheezy/applications/kscope/debian/source/format new file mode 100644 index 000000000..89ae9db8f --- /dev/null +++ b/debian/wheezy/applications/kscope/debian/source/format @@ -0,0 +1 @@ +3.0 (native) diff --git a/debian/wheezy/applications/kscope/debian/source/options b/debian/wheezy/applications/kscope/debian/source/options new file mode 100644 index 000000000..72f1f5450 --- /dev/null +++ b/debian/wheezy/applications/kscope/debian/source/options @@ -0,0 +1,6 @@ +# Use xz instead of gzip +compression = "xz" +compression-level = 9 + +# Don't run differences +diff-ignore = .* diff --git a/debian/wheezy/applications/kscope/debian/watch b/debian/wheezy/applications/kscope/debian/watch new file mode 100644 index 000000000..6825f61dd --- /dev/null +++ b/debian/wheezy/applications/kscope/debian/watch @@ -0,0 +1,2 @@ +version=3 +http://sf.net/kscope/kscope-(.*)\.tar\.gz debian svn-upgrade diff --git a/debian/wheezy/applications/kvpnc/debian/patches/13_add_kuser_issuperuser.diff b/debian/wheezy/applications/kvpnc/debian/patches/13_add_kuser_issuperuser.diff index 826d4e236..0729793b7 100644 --- a/debian/wheezy/applications/kvpnc/debian/patches/13_add_kuser_issuperuser.diff +++ b/debian/wheezy/applications/kvpnc/debian/patches/13_add_kuser_issuperuser.diff @@ -14,16 +14,16 @@ index 7c45fcf..b933832 100644 } else { --// if (getenv("USER") != "root") +-// if (getenv("USER") != TQString("root")) -// { -// KMessageBox::error( 0, I18N_NOOP( "Kvpnc must be started as root!" ) ); -// exit(0); -// } -+ if (getenv("USER") != "root") -+ { -+ KMessageBox::error( 0, I18N_NOOP( "Kvpnc must be started as root!" ) ); -+ exit(0); -+ } ++ if (getenv("USER") != TQString("root")) ++ { ++ KMessageBox::error( 0, I18N_NOOP( "Kvpnc must be started as root!" ) ); ++ exit(0); ++ } TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); diff --git a/debian/wheezy/applications/kvpnc/debian/patches/series b/debian/wheezy/applications/kvpnc/debian/patches/series index 09040ada9..d29c3ca91 100644 --- a/debian/wheezy/applications/kvpnc/debian/patches/series +++ b/debian/wheezy/applications/kvpnc/debian/patches/series @@ -1,2 +1,2 @@ -10_su-to-root_usage.diff +# 10_su-to-root_usage.diff 13_add_kuser_issuperuser.diff diff --git a/debian/wheezy/applications/tdepowersave/debian/cdbs/debian-qt-kde.mk b/debian/wheezy/applications/tdepowersave/debian/cdbs/debian-qt-kde.mk index c807eed8c..33a932634 100644 --- a/debian/wheezy/applications/tdepowersave/debian/cdbs/debian-qt-kde.mk +++ b/debian/wheezy/applications/tdepowersave/debian/cdbs/debian-qt-kde.mk @@ -10,9 +10,11 @@ _cdbs_class_debian-qt-kde := 1 # Note: This _must_ be included before autotools.mk, or it won't work. common-configure-arch common-configure-indep:: debian/stamp-cvs-make debian/stamp-cvs-make: +ifndef _cdbs_class_cmake cp -Rp /usr/share/aclocal/libtool.m4 admin/libtool.m4.in cp -Rp /usr/share/libtool/config/ltmain.sh admin/ltmain.sh $(MAKE) -C $(DEB_SRCDIR) -f admin/Makefile.common dist; +endif touch debian/stamp-cvs-make include debian/cdbs/kde.mk$(_cdbs_makefile_suffix) @@ -98,6 +100,7 @@ binary-install/$(DEB_SOURCE_PACKAGE)-doc-html:: done clean:: +ifndef _cdbs_class_cmake if test -n "$(DEB_KDE_CVS_MAKE)" && test -d $(DEB_SRCDIR); then \ cd $(DEB_SRCDIR); \ find . -name Makefile.in -print | \ @@ -106,6 +109,7 @@ clean:: configure configure.files configure.in stamp-h.in \ subdirs; \ fi +endif rm -f debian/stamp-cvs-make endif diff --git a/debian/wheezy/applications/tdepowersave/debian/cdbs/kde.mk b/debian/wheezy/applications/tdepowersave/debian/cdbs/kde.mk index 765560c89..023886fc8 100644 --- a/debian/wheezy/applications/tdepowersave/debian/cdbs/kde.mk +++ b/debian/wheezy/applications/tdepowersave/debian/cdbs/kde.mk @@ -35,7 +35,9 @@ else DEB_BUILDDIR = obj-$(DEB_BUILD_GNU_TYPE) endif +ifndef _cdbs_class_cmake include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix) +endif export kde_cgidir = \$${libdir}/cgi-bin export kde_confdir = \$${sysconfdir}/trinity @@ -59,7 +61,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/debian/wheezy/applications/tdepowersave/debian/control b/debian/wheezy/applications/tdepowersave/debian/control index ca4a5def2..7882039dd 100644 --- a/debian/wheezy/applications/tdepowersave/debian/control +++ b/debian/wheezy/applications/tdepowersave/debian/control @@ -3,7 +3,7 @@ Section: tde Priority: optional Maintainer: Timothy Pearson XSBC-Original-Maintainer: Michael Biebl -Build-Depends: cdbs, debhelper (>= 5.0.0), quilt, tdelibs14-trinity-dev, libxss-dev, libxtst-dev, libdbus-1-dev (>= 0.6), libdbus-tqt-1-dev, automake, autoconf, libtool, libltdl-dev +Build-Depends: cdbs, debhelper (>= 5.0.0), quilt, tdelibs14-trinity-dev, libxss-dev, libxtst-dev, libdbus-1-dev (>= 0.6), libdbus-tqt-1-dev, cmake, automake, autoconf, libtool, libltdl-dev Build-Conflicts: autoconf2.13 Standards-Version: 3.8.4 Homepage: http://sourceforge.net/projects/powersave/ diff --git a/debian/wheezy/applications/tdepowersave/debian/rules b/debian/wheezy/applications/tdepowersave/debian/rules index f74a76605..a891b0150 100755 --- a/debian/wheezy/applications/tdepowersave/debian/rules +++ b/debian/wheezy/applications/tdepowersave/debian/rules @@ -1,5 +1,6 @@ #!/usr/bin/make -f +include /usr/share/cdbs/1/class/cmake.mk include debian/cdbs/kde.mk include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/rules/patchsys-quilt.mk @@ -17,9 +18,20 @@ DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinit DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ && echo xz || echo bzip2) +DEB_CMAKE_EXTRA_FLAGS := \ + -DCMAKE_INSTALL_PREFIX="/opt/trinity" \ + -DCONFIG_INSTALL_DIR="/etc/trinity" \ + -DSYSCONF_INSTALL_DIR="/etc/trinity" \ + -DXDG_MENU_INSTALL_DIR="/etc/xdg/menus" \ + -DCMAKE_BUILD_TYPE=RelWithDebInfo \ + -DCMAKE_VERBOSE_MAKEFILE="ON" \ + -DCMAKE_SKIP_RPATH="OFF" \ + -DBUILD_ALL="ON" + post-patches:: debian/stamp-bootstrap debian/stamp-bootstrap: +ifndef _cdbs_class_cmake ! [ -f /usr/share/libtool/ltmain.sh ] || \ cp -f /usr/share/libtool/ltmain.sh admin/ltmain.sh ! [ -f /usr/share/libtool/config/ltmain.sh ] || \ @@ -27,6 +39,7 @@ debian/stamp-bootstrap: cp -f /usr/share/aclocal/libtool.m4 admin/libtool.m4.in make -f admin/Makefile.common cvs +endif touch debian/stamp-bootstrap install/tdepowersave-trinity:: diff --git a/debian/wheezy/tdelibs/debian/control b/debian/wheezy/tdelibs/debian/control index d38f9b418..cb73309e6 100644 --- a/debian/wheezy/tdelibs/debian/control +++ b/debian/wheezy/tdelibs/debian/control @@ -60,7 +60,7 @@ Replaces: kdelibs4c2a-kde3 (<< 4:14.0.0~), kdelibs4c2a-trinity (<< 4:14.0.0~), t Breaks: kdelibs4c2a-kde3 (<< 4:14.0.0~), kdelibs4c2a-trinity (<< 4:14.0.0~), tdelibs4c2a-trinity Depends: ${shlibs:Depends}, tdelibs-data-trinity, tdelibs-data-trinity, libart-2.0-2 (>= 4:14.0.0~), perl, xbase-clients, sudo -Recommends: xdg-user-dirs +Recommends: xdg-user-dirs, consolekit Suggests: fam, perl-suid Conflicts: tdelibs4-trinity, tdelibs4c2-trinity (>> 4:1.0.0), tdelibs-bin-trinity (<< 4:3.3.3), tdelibs4-trinity-dev (<< 4:3.5.7.dfsg.1-6) Description: core libraries and binaries for all TDE applications diff --git a/redhat/applications/gtk-qt-engine/gtk-qt-engine-14.0.0-fix_gtk3_segv.patch b/redhat/applications/gtk-qt-engine/gtk-qt-engine-14.0.0-fix_gtk3_segv.patch deleted file mode 100644 index 73021cb11..000000000 --- a/redhat/applications/gtk-qt-engine/gtk-qt-engine-14.0.0-fix_gtk3_segv.patch +++ /dev/null @@ -1,28 +0,0 @@ ---- gtk-qt-engine/kcm_gtk/kcmgtk.cpp.ORI 2013-07-23 23:35:16.614406882 +0200 -+++ gtk-qt-engine/kcm_gtk/kcmgtk.cpp 2013-07-23 23:56:39.121594541 +0200 -@@ -261,13 +261,21 @@ - } - } - -+ bool gtk3installed = false; - widget->styleBox3->clear(); - TQStringList otherGtk3Styles = gtk3Themes.keys(); -- otherGtk3Styles.remove(otherGtk3Styles.find("tdegtk")); -- widget->styleBox3->insertStringList(otherGtk3Styles); -- -- bool gtk3installed = (gtk3Themes.find("tdegtk") != gtk3Themes.end()); -+ if(!otherGtk3Styles.empty()) { -+ otherGtk3Styles.remove(otherGtk3Styles.find("tdegtk")); -+ if(!otherGtk3Styles.empty()) { -+ gtk3installed = (gtk3Themes.find("tdegtk") != gtk3Themes.end()); -+ } -+ } -+ if(gtk3installed) { -+ widget->styleBox3->insertStringList(otherGtk3Styles); -+ } - widget->styleKde3->setEnabled(gtk3installed); -+ widget->styleBox3->setEnabled(gtk3installed); -+ widget->styleOther3->setEnabled(gtk3installed); - widget->warning4->setHidden(gtk3installed); - widget->warning5->setHidden(gtk3installed); - widget->warning6->setHidden(gtk3installed); diff --git a/redhat/applications/gtk-qt-engine/gtk-qt-engine-14.0.0.spec b/redhat/applications/gtk-qt-engine/gtk-qt-engine-14.0.0.spec index d51ec3f2e..79c275e09 100644 --- a/redhat/applications/gtk-qt-engine/gtk-qt-engine-14.0.0.spec +++ b/redhat/applications/gtk-qt-engine/gtk-qt-engine-14.0.0.spec @@ -44,7 +44,7 @@ Source1: gtk-qt-engine.rc.sh Source2: gtkrc-2.0-kde4 Source3: gtkrc-2.0-kde-kde4 -Patch1: gtk-qt-engine-14.0.0-fix_gtk3_segv.patch +Patch0: gtk-qt-engine-14.0.0-debug.patch BuildRequires: trinity-tqtinterface-devel >= %{tde_version} BuildRequires: trinity-arts-devel >= 1:1.5.10 @@ -72,7 +72,7 @@ a way to configure it from within KControl. %prep %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} -%patch1 -p1 -b .segv +%patch0 -p1 -b .debug %build diff --git a/redhat/applications/kbfx/kbfx-14.0.0.spec b/redhat/applications/kbfx/kbfx-14.0.0.spec index b8be0817c..8661e7e81 100644 --- a/redhat/applications/kbfx/kbfx-14.0.0.spec +++ b/redhat/applications/kbfx/kbfx-14.0.0.spec @@ -105,13 +105,13 @@ cd build -DDATA_INSTALL_DIR=%{tde_datadir}/apps \ -DMIME_INSTALL_DIR=%{tde_datadir}/mimelnk \ -DXDG_APPS_INSTALL_DIR=%{tde_tdeappdir} \ + -DSHARE_INSTALL_PREFIX="%{tde_datadir}"\ -DDOC_INSTALL_DIR=%{tde_tdedocdir} \ -DLIB_INSTALL_DIR=%{tde_libdir} \ \ -DUSE_STRIGI=OFF \ -DUSE_MENUDRAKE=OFF \ - -DBUILD_DOC=ON \ - -DBUILD_ALL=OFF \ + -DBUILD_ALL=ON \ .. # Not SMP safe ! @@ -166,12 +166,14 @@ update-desktop-database %{tde_appdir} &> /dev/null %{tde_datadir}/apps/kicker/applets/kbfxspinx.desktop %{tde_datadir}/apps/konqueror/servicemenus/kbfx_install_theme.desktop %{tde_datadir}/apps/konqueror/servicemenus/kbfx_prepare_theme.desktop -#%{tde_tdedocdir}/HTML/en/common/kbfx-*.jpg -#%{tde_tdedocdir}/HTML/en/kbfxconfigapp/ -%{tde_tdedocdir}/kbfx/ +%{tde_tdedocdir}/HTML/en/kbfxconfigapp/ +%{tde_docdir}/kbfx/ %{tde_datadir}/icons/hicolor/*/apps/kbfx.png %{tde_datadir}/icons/hicolor/*/apps/kbfxconfigapp.png -#%{tde_datadir}/locale/*/LC_MESSAGES/kbfxconfigapp.mo +%lang(bg) %{tde_datadir}/locale/bg/LC_MESSAGES/kbfxconfigapp.mo +%lang(hu) %{tde_datadir}/locale/hu/LC_MESSAGES/kbfxconfigapp.mo +%lang(it) %{tde_datadir}/locale/it/LC_MESSAGES/kbfxconfigapp.mo +%lang(nl) %{tde_datadir}/locale/nl/LC_MESSAGES/kbfxconfigapp.mo %{tde_datadir}/mimelnk/application/x-kbfxtheme.desktop diff --git a/redhat/applications/klcddimmer/klcddimmer-14.0.0.spec b/redhat/applications/klcddimmer/klcddimmer-14.0.0.spec index de2535703..337caedd4 100644 --- a/redhat/applications/klcddimmer/klcddimmer-14.0.0.spec +++ b/redhat/applications/klcddimmer/klcddimmer-14.0.0.spec @@ -99,8 +99,6 @@ export PATH="%{tde_bindir}:${PATH}" %__rm -rf %{buildroot} %__make install DESTDIR=%{buildroot} -%find_lang %{tde_pkg} - %clean %__rm -rf %{buildroot} @@ -115,7 +113,7 @@ touch --no-create %{tde_datadir}/icons/hicolor || : gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || : -%files -f %{tde_pkg}.lang +%files %defattr(-,root,root,-) %doc AUTHORS COPYING LICENSE NEWS README %{tde_libdir}/klcddimmer_panelapplet.la diff --git a/redhat/applications/soundkonverter/soundkonverter-14.0.0.spec b/redhat/applications/soundkonverter/soundkonverter-14.0.0.spec index 971e26a8c..14c2f88d8 100644 --- a/redhat/applications/soundkonverter/soundkonverter-14.0.0.spec +++ b/redhat/applications/soundkonverter/soundkonverter-14.0.0.spec @@ -111,9 +111,7 @@ export PATH="%{tde_bindir}:${PATH}" --enable-new-ldflags \ --enable-closure \ --enable-rpath \ - --enable-gcc-hidden-visibility \ - \ - --with-extra-includes=/usr/include/cdda + --enable-gcc-hidden-visibility %__make %{?_smp_mflags} diff --git a/redhat/applications/tde-guidance/tde-guidance-14.0.0.spec b/redhat/applications/tde-guidance/tde-guidance-14.0.0.spec index 1cd956ab3..65838ef05 100644 --- a/redhat/applications/tde-guidance/tde-guidance-14.0.0.spec +++ b/redhat/applications/tde-guidance/tde-guidance-14.0.0.spec @@ -46,7 +46,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz -Patch1: tde-guidance-14.0.0-tqt3.patch +#Patch1: tde-guidance-14.0.0-tqt3.patch BuildRequires: trinity-tqtinterface-devel >= %{tde_version} BuildRequires: trinity-arts-devel >= 1:1.5.10 @@ -146,7 +146,9 @@ or can be run as standalone applications. %exclude %{tde_datadir}/apps/guidance/MonitorsDB # Files from powermanager +%if 0%{?with_powermanager} %exclude %{tde_datadir}/icons/hicolor/22x22/apps/power-manager.png +%endif %exclude %{tde_datadir}/apps/guidance/pics/ac-adapter.png %exclude %{tde_datadir}/apps/guidance/pics/battery*.png %exclude %{tde_datadir}/apps/guidance/pics/processor.png @@ -259,7 +261,7 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || : %prep %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} -%patch1 -p1 -b .tqt3 +#patch1 -p1 -b .tqt3 %if 0%{?rhel} || 0%{?mgaversion} || 0%{?mdkversion} %__sed -i "userconfig/unixauthdb.py" \ diff --git a/redhat/applications/tdepowersave/tdepowersave-14.0.0.spec b/redhat/applications/tdepowersave/tdepowersave-14.0.0.spec index 2dd719162..121915ed9 100644 --- a/redhat/applications/tdepowersave/tdepowersave-14.0.0.spec +++ b/redhat/applications/tdepowersave/tdepowersave-14.0.0.spec @@ -41,10 +41,6 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz -Patch1: trinity-cmake-translations.patch -Patch2: tdepowersave-cmake-add-translation-and-documentation.patch -Patch3: tdepowersave-14.0.0-test.patch - BuildRequires: trinity-tqtinterface-devel >= %{tde_version} BuildRequires: trinity-arts-devel >= 1:1.5.10 BuildRequires: trinity-tdelibs-devel >= %{tde_version} @@ -91,9 +87,6 @@ settings for: %prep %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} -%patch1 -p1 -b .lang -%patch2 -p1 -b .lang -#patch3 -p1 -b .test %build diff --git a/redhat/applications/tdepowersave/tdepowersave-cmake-add-translation-and-documentation.patch b/redhat/applications/tdepowersave/tdepowersave-cmake-add-translation-and-documentation.patch deleted file mode 100644 index a30f264a4..000000000 --- a/redhat/applications/tdepowersave/tdepowersave-cmake-add-translation-and-documentation.patch +++ /dev/null @@ -1,32 +0,0 @@ ---- trinity-tdepowersave-14.0.0~pre158+340d2058/po/CMakeLists.txt 2013-08-19 06:54:55.000000000 +0200 -+++ trinity-tdepowersave-14.0.0~pre158+340d2058/po/CMakeLists.txt.new 2013-08-19 19:25:41.566465666 +0200 -@@ -9,9 +9,4 @@ - # - ################################################# - --# file( GLOB_RECURSE po_files RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} tdepowersave.po ) -- --foreach( _po ${po_files} ) -- get_filename_component( _lang ${_po} PATH ) -- tde_create_translation( FILES ${_po} LANG ${_lang} ) --endforeach( ) -+tde_create_translation( LANG auto OUTPUT_NAME tdepowersave ) -diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake -index c257983..68fca16 100644 ---- a/ConfigureChecks.cmake -+++ b/ConfigureChecks.cmake -@@ -57,6 +57,14 @@ if( NOT DBUS_TQT_FOUND ) - tde_message_fatal( "dbus-tqt is required, but was not found on your system" ) - endif( ) - -+# check for msgfmt -+if( NOT DEFINED MSGFMT_EXECUTABLE ) -+ find_program( MSGFMT_EXECUTABLE msgfmt ) -+ if( NOT MSGFMT_EXECUTABLE ) -+ tde_message_fatal( "msgfmt program is required, but was not found on your system" ) -+ endif( ) -+endif( ) -+ - - # required stuff - find_package( TQt ) diff --git a/redhat/applications/tdepowersave/trinity-cmake-translations.patch b/redhat/applications/tdepowersave/trinity-cmake-translations.patch deleted file mode 100644 index d97302ba3..000000000 --- a/redhat/applications/tdepowersave/trinity-cmake-translations.patch +++ /dev/null @@ -1,98 +0,0 @@ -diff --git a/modules/TDEMacros.cmake b/modules/TDEMacros.cmake -index f290e2b..282b765 100644 ---- a/cmake/modules/TDEMacros.cmake -+++ b/cmake/modules/TDEMacros.cmake -@@ -1049,6 +1049,7 @@ macro( tde_create_translation ) - unset( _srcs ) - unset( _lang ) - unset( _dest ) -+ unset( _out_name ) - unset( _directive ) - unset( _var ) - -@@ -1075,6 +1076,13 @@ macro( tde_create_translation ) - set( _directive 1 ) - endif( ) - -+ # found directive "DESTINATION" -+ if( "${_arg}" STREQUAL "OUTPUT_NAME" ) -+ unset( _proj ) -+ set( _var _out_name ) -+ set( _directive 1 ) -+ endif( ) -+ - # collect data - if( _directive ) - unset( _directive ) -@@ -1088,30 +1096,60 @@ macro( tde_create_translation ) - tde_message_fatal( "MSGFMT_EXECUTABLE variable is not defined" ) - elseif( NOT _lang ) - tde_message_fatal( "missing LANG directive" ) -- elseif( NOT _dest ) -- set( _dest "${LOCALE_INSTALL_DIR}/${_lang}/LC_MESSAGES" ) - endif( ) - - # if no file specified, include all *.po files - if( NOT _srcs ) - file( GLOB _srcs RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.po ) -- endif() -+ endif( ) - if( NOT _srcs ) - tde_message_fatal( "no source files" ) -- endif() -+ endif( ) -+ -+ if( NOT _lang STREQUAL "auto") -+ set( _real_lang ${_lang} ) -+ -+ if( NOT _dest ) -+ set( _dest "${LOCALE_INSTALL_DIR}/${_lang}/LC_MESSAGES" ) -+ endif( ) -+ -+ # OUTPUT_NAME can only be used if we have only one file -+ list( LENGTH _srcs _srcs_num) -+ if( _out_name AND _srcs_num GREATER 1 ) -+ tde_message_fatal( "OUTPUT_NAME can be supplied only with single file or LANG=auto" ) -+ endif( ) -+ -+ elseif( NOT _out_name ) -+ tde_message_fatal( "LANG=auto reqires OUTPUT_NAME directive to be set" ) -+ elseif( _dest ) -+ tde_message_fatal( "DESTINATION cannot be used with LANG=auto" ) -+ endif( ) - - # generate *.mo files - foreach( _src ${_srcs} ) -+ - get_filename_component( _src ${_src} ABSOLUTE ) -- get_filename_component( _out ${_src} NAME_WE ) -- set( _out_name "${_out}-${_lang}.mo" ) -- set( _out_real_name "${_out}.mo" ) -+ -+ if( _out_name ) -+ set( _out ${_out_name} ) -+ if( _lang STREQUAL "auto" ) -+ get_filename_component( _real_lang ${_src} NAME_WE ) -+ set( _dest "${LOCALE_INSTALL_DIR}/${_real_lang}/LC_MESSAGES" ) -+ endif( ) -+ else( ) -+ get_filename_component( _out ${_src} NAME_WE ) -+ endif( ) -+ -+ set( _out_filename "${_out}-${_real_lang}.mo" ) -+ set( _install_filename "${_out}.mo" ) -+ - add_custom_command( -- OUTPUT ${_out_name} -- COMMAND ${MSGFMT_EXECUTABLE} ${_src} -o ${_out_name} -+ OUTPUT ${_out_filename} -+ COMMAND ${MSGFMT_EXECUTABLE} ${_src} -o ${_out_filename} - DEPENDS ${_src} ) -- add_custom_target( "${_out}-${_lang}-translation" ALL DEPENDS ${_out_name} ) -- install( FILES ${CMAKE_CURRENT_BINARY_DIR}/${_out_name} RENAME ${_out_real_name} DESTINATION ${_dest} ) -+ add_custom_target( "${_out}-${_real_lang}-translation" ALL DEPENDS ${_out_filename} ) -+ install( FILES ${CMAKE_CURRENT_BINARY_DIR}/${_out_filename} RENAME ${_install_filename} DESTINATION ${_dest} ) -+ - endforeach( ) - - endmacro( ) diff --git a/redhat/buildall-r14.sh b/redhat/buildall-r14.sh index 72a98a317..8e77efba1 100755 --- a/redhat/buildall-r14.sh +++ b/redhat/buildall-r14.sh @@ -8,6 +8,7 @@ grp='./genrpm.sh -v 14.0.0 -a' BUILDDIR="/dev/shm/BUILD${DIST}.$(uname -i)" BUILDROOTDIR="/dev/shm/BUILDROOT${DIST}.$(uname -i)" DIST="$(rpm -E %{dist})" +LIB="$(rpm -E %_lib)" if [ -x /usr/sbin/urpmi ]; then PKGMGR="urpmi" @@ -91,17 +92,26 @@ grpiud() { # TQT3 grpiud dependencies/tqt3 +if [ "${DIST}" = ".el4" ] || [ "${DIST}" = ".el5" ]; then + grpiud 3rdparty/poppler +fi +if [ "${DIST}" = ".el4" ] || [ "${DIST}" = ".el5" ]; then + grpiud 3rdparty/sip +fi + # TDE dependencies grpiud dependencies/tqtinterface grpiud dependencies/arts -grpiud dependencies/avahi-tqt -grpiud dependencies/dbus-1-tqt -grpiud dependencies/dbus-tqt grpiud dependencies/libart-lgpl grpiud dependencies/libcaldav grpiud dependencies/libcarddav grpiud dependencies/tqca -grpiui dependencies/tqca-tls +if [ "${DIST}" != ".el4" ]; then + grpiud dependencies/avahi-tqt + grpiud dependencies/dbus-1-tqt + grpiud dependencies/dbus-tqt + grpiui dependencies/tqca-tls +fi # Extra dependencies grpiud extras/akode @@ -135,10 +145,10 @@ grpiui tdeutils if ! is_installed trinity-desktop; then grpiu extras/trinity-desktop eval ${PKGINST} trinity-desktop || exit 1 - # Disable trinity repository from here !!! - if [ -r "/etc/yum.repos.d/trinity-3.5.13.repo" ]; then - sed -i "/etc/yum.repos.d/trinity-3.5.13.repo" -e "s|enabled=.*|enabled=0|g" - fi +fi +# Disable trinity repository from here !!! +if [ -r "/etc/yum.repos.d/trinity-3.5.13.repo" ]; then + sudo sed -i "/etc/yum.repos.d/trinity-3.5.13.repo" -e "s|enabled=.*|enabled=0|g" fi # devel packages @@ -149,10 +159,10 @@ if ! is_installed trinity-desktop-devel; then eval ${PKGINST} trinity-desktop-devel || exit 1 fi -# Extra libraries +# 3rd party libraries ## IMLIB1: required for kuickshow -if ! is_installed imlib1-devel; then +if ! is_installed imlib1-devel && ! is_installed imlib-devel; then grpiu 3rdparty/imlib1 eval ${PKGINST} imlib1-devel || exit 1 fi @@ -165,18 +175,42 @@ if [ "${DIST:0:4}" != ".mga" ]; then eval ${PKGINST} wv2-devel || exit 1 fi fi + +## LIBOTR3: required for kopete-otr +if [ "${DIST:0:5}" = ".mga3" ]; then + if ! is_installed libotr3; then + grpiu 3rdparty/libotr3 + eval ${PKGINST} libotr3 || exit 1 + eval ${PKGINST} libotr3-devel || exit 1 + fi +fi + ## TORSOCKS: required for tork if ! is_installed torsocks; then grpiu 3rdparty/torsocks eval ${PKGINST} torsocks || exit 1 fi -if [ "${DIST:0:4}" = ".oss" ]; then + +## PCSC-PERL: for smartcardauth +if [ "${DIST:0:4}" = ".oss" ] || [ "${DIST:0:3}" = ".el" ]; then if ! is_installed pcsc-perl; then grpiu 3rdparty/pcsc-perl eval ${PKGINST} pcsc-perl || exit 1 fi fi +## Lilypond: needed for rosegarden +if [ "${DIST}" = ".el6" ]; then + if ! is_installed mftrace; then + grpiu 3rdparty/mftrace + eval ${PKGINST} mftrace || exit 1 + fi + if ! is_installed lilypond; then + grpiu 3rdparty/lilypond + eval ${PKGINST} lilypond || exit 1 + fi +fi + # TDE libraries grpiud libraries/libkdcraw grpiud libraries/libkexiv2 @@ -220,7 +254,9 @@ grpiui applications/kcmldapcontroller grpiui applications/kcmldapmanager grpiui applications/kcpuload grpiui applications/kdbg -grpiui applications/kdbusnotification +if [ "${DIST}" != ".el4" ]; then + grpiui applications/kdbusnotification +fi grpiui applications/kdiff3 grpiui applications/kdirstat grpiui applications/keep @@ -228,11 +264,15 @@ grpiui applications/kerberostray #grpiui applications/kerry grpiui applications/kftpgrabber grpiui applications/kile -grpiui applications/kima +if [ "${DIST}" != ".el4" ]; then + grpiui applications/kima +fi grpiui applications/kiosktool grpiui applications/kkbswitch grpiui applications/klcddimmer -grpiui applications/kmplayer +if [ "${DIST}" != ".el4" ]; then + grpiui applications/kmplayer +fi grpiui applications/kmyfirewall grpiui applications/kmymoney grpiui applications/knemo @@ -249,7 +289,9 @@ fi grpiui applications/konversation grpiui applications/kopete-otr grpiui applications/kpicosim -grpiui applications/kpilot +if [ "${DIST}" != ".el4" ]; then + grpiui applications/kpilot +fi grpiui applications/krecipes grpiui applications/krename grpiui applications/krusader @@ -269,7 +311,9 @@ grpiui applications/kvpnc grpiui applications/mplayerthumbs grpiui applications/piklab grpiui applications/potracegui -grpiui applications/rosegarden +if [ "${DIST}" != ".el4" ] && [ "${DIST}" != ".el5" ]; then + grpiui applications/rosegarden +fi grpiui applications/smartcardauth grpiui applications/smb4k grpiui applications/soundkonverter @@ -277,6 +321,7 @@ grpiui applications/tde-guidance grpiui applications/tdeio-apt grpiui applications/tdeio-ftps grpiui applications/tdeio-locate +grpiui applications/tdeio-sword grpiui applications/tdeio-umountwrapper grpiui applications/tdenetworkmanager grpiui applications/tdepowersave @@ -284,7 +329,9 @@ grpiui applications/tderadio grpiui applications/tde-style-lipstik grpiui applications/tde-style-qtcurve grpiui applications/tdesudo -grpiui applications/tdesvn +if [ "${DIST}" != ".el4" ]; then + grpiui applications/tdesvn +fi grpiui applications/tde-systemsettings grpiui applications/tdmtheme grpiui applications/tellico diff --git a/redhat/dependencies/libcaldav/libcaldav-14.0.0.spec b/redhat/dependencies/libcaldav/libcaldav-14.0.0.spec index 67b2d884c..904985358 100644 --- a/redhat/dependencies/libcaldav/libcaldav-14.0.0.spec +++ b/redhat/dependencies/libcaldav/libcaldav-14.0.0.spec @@ -27,7 +27,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz -Patch1: libcaldav-14.0.0-older_libcurl.patch +#Patch1: libcaldav-14.0.0-older_libcurl.patch BuildRequires: libtool %if 0%{?rhel} == 4 @@ -75,7 +75,7 @@ Provides: libcaldav-devel = %{version}-%{release} %prep %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} -%patch1 -p1 -b .libcurl +#patch1 -p1 -b .libcurl ./autogen.sh diff --git a/redhat/dependencies/python-tqt/python-tqt-14.0.0-ftbfs.patch b/redhat/dependencies/python-tqt/python-tqt-14.0.0-ftbfs.patch deleted file mode 100644 index 069111d3e..000000000 --- a/redhat/dependencies/python-tqt/python-tqt-14.0.0-ftbfs.patch +++ /dev/null @@ -1,33 +0,0 @@ ---- trinity-python-tqt-14.0.0~pre36+d3f27c3e/sip/qt/qobject.sip.ORI 2013-07-03 20:23:06.054830311 +0200 -+++ trinity-python-tqt-14.0.0~pre36+d3f27c3e/sip/qt/qobject.sip 2013-07-03 20:23:14.833911835 +0200 -@@ -2196,7 +2196,7 @@ - // See if it is a TQt signal. - if (*sig == '2') - { -- pyqt3TQtSignal *tab; -+ pyqt3QtSignal *tab; - - // Search the table. - for (tab = ((pyqt3ClassTypeDef *)((sipWrapperType *)(self->ob_type))->type)->qt3_emit; tab->st_name != NULL; ++tab) ---- trinity-python-tqt-14.0.0~pre36+d3f27c3e/configure.py.ORI 2013-07-23 18:00:47.017942165 +0200 -+++ trinity-python-tqt-14.0.0~pre36+d3f27c3e/configure.py 2013-07-23 18:01:40.757575552 +0200 -@@ -321,6 +321,9 @@ - makefile.extra_include_dirs.append(qt_dir + "/src/3rdparty/zlib") - makefile.extra_include_dirs.append(os.path.join(src_dir, "pyuic3")) - -+ if not os.access("pyuic3", os.F_OK): -+ os.mkdir("pyuic3") -+ - makefile.generate() - tool_dirs.append("pyuic3") - -@@ -350,6 +353,9 @@ - - makefile.extra_include_dirs.append(os.path.join(src_dir, "pylupdate3")) - -+ if not os.access("pylupdate3", os.F_OK): -+ os.mkdir("pylupdate3") -+ - makefile.generate() - tool_dirs.append("pylupdate3") - elif qt_version >= 0x020000: diff --git a/redhat/dependencies/python-tqt/python-tqt-14.0.0.spec b/redhat/dependencies/python-tqt/python-tqt-14.0.0.spec index f516327d7..9a564dc75 100644 --- a/redhat/dependencies/python-tqt/python-tqt-14.0.0.spec +++ b/redhat/dependencies/python-tqt/python-tqt-14.0.0.spec @@ -14,6 +14,7 @@ License: GPL Summary: TQt bindings for Python Group: System Environment/Libraries +Obsoletes: PyQt Obsoletes: trinity-PyQt Obsoletes: trinity-python-qt3 @@ -24,10 +25,9 @@ Prefix: %{tde_prefix} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz -Patch0: python-tqt-14.0.0-ftbfs.patch BuildRequires: gcc-c++ -BuildRequires: trinity-tqtinterface-devel >= %{version} +BuildRequires: trinity-tqtinterface-devel >= %{tde_version} BuildRequires: trinity-tqscintilla-devel %if 0%{?rhel} || 0%{?fedora} @@ -140,7 +140,6 @@ packages based on them, like PyTDE. %prep %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} -%patch0 -p1 %build diff --git a/redhat/extras/trinity-desktop/trinity-desktop-14.0.0.spec b/redhat/extras/trinity-desktop/trinity-desktop-14.0.0.spec index f16039020..f45e193a5 100644 --- a/redhat/extras/trinity-desktop/trinity-desktop-14.0.0.spec +++ b/redhat/extras/trinity-desktop/trinity-desktop-14.0.0.spec @@ -93,7 +93,6 @@ Requires: trinity-digikam Requires: trinity-dolphin Requires: trinity-filelight Requires: trinity-gwenview -Requires: trinity-gwenview-i18n Requires: trinity-k3b Requires: trinity-k9copy Requires: trinity-kaffeine @@ -168,6 +167,7 @@ Requires: trinity-tde-systemsettings Requires: trinity-tdeio-apt Requires: trinity-tdeio-ftps Requires: trinity-tdeio-locate +Requires: trinity-tdeio-sword Requires: trinity-tdeio-umountwrapper Requires: trinity-tdenetworkmanager Requires: trinity-tdepowersave @@ -204,6 +204,7 @@ Obsoletes: trinity-tde-guidance-powermanager # Debian/Ubuntu specific ... #Requires: trinity-adept +#Requires: trinity-gwenview-i18n # Beagle does not exist anymore, so Kerry is now useless. #Requires: trinity-kerry @@ -309,7 +310,7 @@ Summary: Default wallpaper for Trinity %__sed %{SOURCE0} \ -e 's/\$releasever/%{fedora}/g' \ -e 's/-fedora/-f%{fedora}/g' \ - >"%{?buildroot}%{_sysconfdir}/yum.repos.d/trinity-3.5.13.repo" + >"%{?buildroot}%{_sysconfdir}/yum.repos.d/trinity.repo" %endif # RHEL configuration for YUM @@ -317,10 +318,11 @@ Summary: Default wallpaper for Trinity %if 0%{?rhel} %__sed %{SOURCE1} \ -e 's/\$releasever/%{rhel}/g' \ - >"%{?buildroot}%{_sysconfdir}/yum.repos.d/trinity-3.5.13.repo" + >"%{?buildroot}%{_sysconfdir}/yum.repos.d/trinity.repo" %endif %if 0%{?fedora} || 0%{?rhel} +%__sed -i %{?buildroot}%{_sysconfdir}/yum.repos.d/*.repo -e "s|3.5.13|r14|g" %__chmod 644 %{?buildroot}%{_sysconfdir}/yum.repos.d/*.repo %endif @@ -336,26 +338,5 @@ Summary: Default wallpaper for Trinity %endif %changelog -* Mon Jun 03 2013 Francois Andriot - 3.5.13.2-1 -- Update to version 3.5.13.2 -- Add GPG signing key - -* Mon Oct 01 2012 Francois Andriot - 3.5.13.1-1 -- Update to version 3.5.13.1 - -* Mon Aug 06 2012 Francois Andriot - 3.5.13-6 -- Add 'applications' subpackage - -* Wed Aug 01 2012 Francois Andriot - 3.5.13-5 -- Updates to reflect new packages names -- Add Mageia 2 support -- Removes 'extras' packages - -* Wed Jun 06 2012 Francois Andriot - 3.5.13-4 -- Enable mirrorlist - -* Wed Nov 30 2011 Francois Andriot - 3.5.13-3 -- Fix repo files name and content - -* Sat Nov 12 2011 Francois Andriot - 3.5.13-2 -- Add 'repo' package +* Mon Jun 03 2013 Francois Andriot - 14.0.0-1 +- Initial build for TDE R14 diff --git a/redhat/tdeaddons/tdeaddons-14.0.0.spec b/redhat/tdeaddons/tdeaddons-14.0.0.spec index 5fe73356f..222d41f73 100644 --- a/redhat/tdeaddons/tdeaddons-14.0.0.spec +++ b/redhat/tdeaddons/tdeaddons-14.0.0.spec @@ -244,8 +244,8 @@ a tab bar, a Python browser and even more. Summary: Trinity file dialog plugins for text files and folders Group: Applications/Utilities -Obsoletes: trinity-kfile-plugins < %{version}-%{release} -Provides: trinity-kfile-plugins = %{version}-%{release} +Obsoletes: trinity-tdeaddons-kfile-plugins < %{version}-%{release} +Provides: trinity-tdeaddons-kfile-plugins = %{version}-%{release} %description tdefile-plugins This is a collection of plugins for the TDE file dialog. These plugins diff --git a/redhat/tdebase/tdebase-14.0.0.spec b/redhat/tdebase/tdebase-14.0.0.spec index 1aa7230c3..c5deaff0e 100644 --- a/redhat/tdebase/tdebase-14.0.0.spec +++ b/redhat/tdebase/tdebase-14.0.0.spec @@ -389,6 +389,7 @@ BuildRequires: gnome-screensaver BuildRequires: %{_lib}xscrnsaver%{?mgaversion:1}-devel %endif %if 0%{?fedora} || 0%{?rhel} >= 6 || 0%{?suse_version} >= 1220 +BuildRequires: xscreensaver BuildRequires: libXScrnSaver-devel %endif %if 0%{?suse_version} == 1140 @@ -544,9 +545,6 @@ Requires: openssl # RHEL 6 Configuration files are provided in separate packages %if 0%{?rhel} || 0%{?fedora} -%if "%{?tde_prefix}" == "/usr" -Requires: kde-settings-kdm -%endif Requires: redhat-menus %endif @@ -3337,20 +3335,22 @@ cd build -DSYSCONF_INSTALL_DIR="%{_sysconfdir}/trinity" \ -DXDG_MENU_INSTALL_DIR="%{_sysconfdir}/xdg/menus" \ \ + -DWITH_ALL_OPTIONS=ON \ -DWITH_SASL=ON \ -DWITH_LDAP=ON \ -DWITH_SAMBA=ON \ - %{?with_exr:-DWITH_OPENEXR=ON} \ + %{?!with_exr:-DWITH_OPENEXR=OFF} \ -DWITH_XCOMPOSITE=ON \ -DWITH_XCURSOR=ON \ -DWITH_XFIXES=ON \ - %{?with_xrandr:-DWITH_XRANDR=ON} \ + %{?!with_xrandr:-DWITH_XRANDR=OFF} \ -DWITH_XRENDER=ON \ -DWITH_XDAMAGE=ON \ -DWITH_XEXT=ON \ - %{?with_xtest:-DWITH_XTEST=ON} \ - %{?with_xscreensaver:-DWITH_XSCREENSAVER=ON} \ - %{?with_libart:-DWITH_LIBART=ON} \ + %{?!with_xtest:-DWITH_XTEST=OFF} \ + -DWITH_OPENGL=ON \ + %{?!with_xscreensaver:-DWITH_XSCREENSAVER=OFF} \ + %{?!with_libart:-DWITH_LIBART=OFF} \ -DWITH_LIBUSB=ON \ -DWITH_LIBRAW1394=ON \ -DWITH_SUDO_TDESU_BACKEND=OFF \ @@ -3360,11 +3360,12 @@ cd build -DWITH_XINERAMA=ON \ -DWITH_ARTS=ON \ -DWITH_I8K=ON \ - %{?with_hal:-DWITH_HAL=ON} \ + -DWITH_SENSORS=ON \ + -DWITH_HAL=OFF \ -DWITH_TDEHWLIB=ON \ -DWITH_UPOWER=ON \ -DWITH_GCC_VISIBILITY=ON \ - -DWITH_KDESKTOP_LOCK_BACKTRACE=OFF \ + \ -DBUILD_ALL=ON \ %if 0%{?suse_version} -DKCHECKPASS_PAM_SERVICE="xdm" \ @@ -3396,10 +3397,6 @@ cd build %__install -D -m 644 \ "%{?buildroot}%{tde_datadir}/apps/tdm/sessions/tde.desktop" \ "%{?buildroot}%{_datadir}/xsessions/tde.desktop" - -# Force session name to be 'TDE' -%__sed -i "%{?buildroot}%{_datadir}/xsessions/tde.desktop" \ - -e "s,^Name=.*,Name=TDE," %endif # Mageia/Mandriva/PCLinuxOS stores its session file in different folder than RHEL/Fedora @@ -3435,7 +3432,7 @@ EOF # TDM configuration %__sed -i "%{?buildroot}%{_sysconfdir}/trinity/tdm/tdmrc" \ -%if 0%{?fedora} >= 16 || 0%{?suse_version} >= 1220 +%if 0%{?fedora} >= 16 || 0%{?suse_version} >= 1210 -e "s/^#*MinShowUID=.*/MinShowUID=1000/" %else -e "s/^#*MinShowUID=.*/MinShowUID=500/" @@ -3455,9 +3452,9 @@ EOF %__mkdir_p "%{?buildroot}%{_sysconfdir}/alternatives" %__ln_s "%{tde_datadir}/apps/konqueror/servicemenus/media_safelyremove.desktop_tdebase" "%{?buildroot}%{_sysconfdir}/alternatives/media_safelyremove.desktop_tdebase" -# SUSE: creates DM config file, used by '/etc/init.d/xdm' +# SUSE >= 12 : creates DM config file, used by '/etc/init.d/xdm' # You must set 'DISPLAYMANAGER=tdm' in '/etc/sysconfig/displaymanager' -%if 0%{?suse_version} +%if 0%{?suse_version} >= 1210 %__install -D -m 644 "%{SOURCE6}" "%{?buildroot}/usr/lib/X11/displaymanagers/tdm" %__sed -i "%{?buildroot}/usr/lib/X11/displaymanagers/tdm" -e "s|/opt/trinity/bin|%{tde_bindir}|g" %endif diff --git a/redhat/tdenetwork/tdenetwork-14.0.0.spec b/redhat/tdenetwork/tdenetwork-14.0.0.spec index 2d2405e8d..5701a1e14 100644 --- a/redhat/tdenetwork/tdenetwork-14.0.0.spec +++ b/redhat/tdenetwork/tdenetwork-14.0.0.spec @@ -54,8 +54,6 @@ Source2: ktalk # RedHat/Fedora legacy patches Patch4: kdenetwork-3.2.3-resolv.patch -# include more/proper ppp headers -Patch6: kdenetwork-3.5.9-krfb_httpd.patch # [kdenetwork] Missing LDFLAGS cause FTBFS Patch1: kdenetwork-3.5.13-missing_ldflags.patch @@ -1078,7 +1076,6 @@ update-desktop-database 2> /dev/null || : %patch1 -p1 -b .ldflags %patch4 -p1 -b .resolv -%patch6 -p1 -b .krfb_httpd %if 0%{?rhel} == 4 %patch201 -p1 -b .rhel4 diff --git a/ubuntu/maverick/applications/kscope/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/applications/kscope/debian/cdbs/debian-qt-kde.mk new file mode 100644 index 000000000..d81e0a12f --- /dev/null +++ b/ubuntu/maverick/applications/kscope/debian/cdbs/debian-qt-kde.mk @@ -0,0 +1,115 @@ +ifndef _cdbs_bootstrap +_cdbs_scripts_path ?= /usr/lib/cdbs +_cdbs_rules_path ?= /usr/share/cdbs/1/rules +_cdbs_class_path ?= /usr/share/cdbs/1/class +endif + +ifndef _cdbs_class_debian-qt-kde +_cdbs_class_debian-qt-kde := 1 + +# Note: This _must_ be included before autotools.mk, or it won't work. +common-configure-arch common-configure-indep:: debian/stamp-cvs-make +debian/stamp-cvs-make: +ifndef _cdbs_class_cmake + cp -Rp /usr/share/aclocal/libtool.m4 admin/libtool.m4.in + cp -Rp /usr/share/libtool/config/ltmain.sh admin/ltmain.sh + $(MAKE) -C $(DEB_SRCDIR) -f admin/Makefile.common dist; +endif + touch 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 := + +DEB_DH_MAKESHLIBS_ARGS_ALL := -V +DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib) + +ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) + cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb + ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches))) + cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,) + else + cdbs_kde_enable_final = + endif +endif + +common-build-arch:: debian/stamp-man-pages +debian/stamp-man-pages: + if ! test -d debian/man/out; then mkdir -p debian/man/out; fi + for f in $$(find debian/man -name '*.sgml'); do \ + docbook-to-man $$f > debian/man/out/`basename $$f .sgml`.1; \ + done + for f in $$(find debian/man -name '*.man'); do \ + soelim -I debian/man $$f \ + > debian/man/out/`basename $$f .man`.`head -n1 $$f | awk '{print $$NF}'`; \ + done + touch debian/stamp-man-pages + +common-binary-indep:: + ( set -e; \ + tmpf=`mktemp debian/versions.XXXXXX`; \ + perl debian/cdbs/versions.pl >$$tmpf; \ + for p in $(DEB_INDEP_PACKAGES); do \ + cat $$tmpf >>debian/$$p.substvars; \ + done; \ + rm -f $$tmpf ) + +common-binary-arch:: + ( set -e; \ + tmpf=`mktemp debian/versions.XXXXXX`; \ + perl debian/cdbs/versions.pl >$$tmpf; \ + for p in $(DEB_ARCH_PACKAGES); do \ + cat $$tmpf >>debian/$$p.substvars; \ + done; \ + rm -f $$tmpf ) + +clean:: + rm -rf debian/man/out + -rmdir debian/man + rm -f debian/stamp-man-pages + rm -rf debian/shlibs-check + +$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: + if test -x /usr/bin/dh_desktop; then dh_desktop -p$(cdbs_curpkg) $(DEB_DH_DESKTOP_ARGS); fi + if test -e debian/$(cdbs_curpkg).lintian; then \ + install -p -D -m644 debian/$(cdbs_curpkg).lintian \ + debian/$(cdbs_curpkg)/usr/share/lintian/overrides/$(cdbs_curpkg); \ + fi + if test -e debian/$(cdbs_curpkg).presubj; then \ + install -p -D -m644 debian/$(cdbs_curpkg).presubj \ + debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \ + fi + +binary-install/$(DEB_SOURCE_PACKAGE)-doc-html:: + set -e; \ + for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \ + pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \ + echo Building $$pkg HTML docs...; \ + mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \ + cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \ + /opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \ + done + for pkg in $(DOC_HTML_PRUNE) ; do \ + rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \ + done + +clean:: +ifndef _cdbs_class_cmake + if test -n "$(DEB_KDE_CVS_MAKE)" && test -d $(DEB_SRCDIR); then \ + cd $(DEB_SRCDIR); \ + find . -name Makefile.in -print | \ + xargs --no-run-if-empty rm -f; \ + rm -f Makefile.am acinclude.m4 aclocal.m4 config.h.in \ + configure configure.files configure.in stamp-h.in \ + subdirs; \ + fi +endif + rm -f debian/stamp-cvs-make + +endif diff --git a/ubuntu/maverick/applications/kscope/debian/cdbs/kde.mk b/ubuntu/maverick/applications/kscope/debian/cdbs/kde.mk new file mode 100644 index 000000000..023886fc8 --- /dev/null +++ b/ubuntu/maverick/applications/kscope/debian/cdbs/kde.mk @@ -0,0 +1,99 @@ +# -*- mode: makefile; coding: utf-8 -*- +# Copyright © 2003 Christopher L Cheney +# Description: A class for KDE packages; sets KDE environment variables, etc +# +# This program 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, or (at +# your option) any later version. +# +# This program 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 program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA +# 02111-1307 USA. + +_cdbs_scripts_path ?= /usr/lib/cdbs +_cdbs_rules_path ?= /usr/share/cdbs/1/rules +_cdbs_class_path ?= /usr/share/cdbs/1/class + +ifndef _cdbs_class_kde +_cdbs_class_kde := 1 + +# for dh_icons +CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), debhelper (>= 5.0.7ubuntu4) + +include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix) + +ifdef _cdbs_tarball_dir +DEB_BUILDDIR = $(_cdbs_tarball_dir)/obj-$(DEB_BUILD_GNU_TYPE) +else +DEB_BUILDDIR = obj-$(DEB_BUILD_GNU_TYPE) +endif + +ifndef _cdbs_class_cmake +include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix) +endif + +export kde_cgidir = \$${libdir}/cgi-bin +export kde_confdir = \$${sysconfdir}/trinity +export kde_htmldir = \$${datadir}/doc/tde/HTML + +ifeq (,$(filter noopt,$(DEB_BUILD_OPTIONS))) + cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,) +endif + +ifneq (,$(filter nostrip,$(DEB_BUILD_OPTIONS))) + cdbs_kde_enable_final = + cdbs_kde_enable_debug = --enable-debug=yes +else + cdbs_kde_enable_debug = --disable-debug +endif + +ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS))) + cdbs_kde_enable_debug = --enable-debug=full +endif + +cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) + +DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include" +DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el + +$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: + if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi + +cleanbuilddir:: + -$(if $(call cdbs_streq,$(DEB_BUILDDIR),$(DEB_SRCDIR)),,rm -rf $(DEB_BUILDDIR)) + +common-build-arch common-build-indep:: debian/stamp-kde-apidox +debian/stamp-kde-apidox: + $(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox) + touch $@ + +common-install-prehook-impl:: + mkdir -p po + -XGETTEXT=/usr/bin/kde-xgettext EXTRACTATTR=/opt/trinity/bin/extractattr sh $(DEB_SRCDIR)/admin/cvs.sh extract-messages + -for file in po/*pot; do \ + sed "s/charset=CHARSET/charset=UTF-8/" -i $$file; \ + done + +common-install-arch common-install-indep:: common-install-kde-apidox +common-install-kde-apidox:: + $(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) install-apidox DESTDIR=$(DEB_DESTDIR)) + +clean:: + rm -f debian/stamp-kde-apidox + rm -rf po/*.pot + +# This is a convenience target for calling manually. It's not part of +# the build process. +buildprep: clean apply-patches + $(MAKE) -f admin/Makefile.common dist + debian/rules clean + +endif diff --git a/ubuntu/maverick/applications/kscope/debian/cdbs/versions.pl b/ubuntu/maverick/applications/kscope/debian/cdbs/versions.pl new file mode 100644 index 000000000..75c9add4b --- /dev/null +++ b/ubuntu/maverick/applications/kscope/debian/cdbs/versions.pl @@ -0,0 +1,19 @@ +#!/usr/bin/env perl + +use strict; +use warnings; + +my $version = `dpkg-parsechangelog | awk '/^Version/ {print \$2}'`; +my ($version3, $version3_next); +my ($version2, $version2_next); + +($version3 = $version) =~ s/^(([^.]+\.){2}[^.+~-]+)[.+~-]?[^-]*-[^-]+$/$1/; +($version2 = $version3) =~ s/\.[^.]+$//; + +($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e; +($version2_next = $version2) =~ s/(?<=\.)(\d+)$/($1+1)/e; + +print "KDE-Version3=$version3\n"; +print "KDE-Version2=$version2\n"; +print "KDE-Next-Version3=$version3_next\n"; +print "KDE-Next-Version2=$version2_next\n"; diff --git a/ubuntu/maverick/applications/kscope/debian/changelog b/ubuntu/maverick/applications/kscope/debian/changelog new file mode 100644 index 000000000..d3689c28f --- /dev/null +++ b/ubuntu/maverick/applications/kscope/debian/changelog @@ -0,0 +1,97 @@ +kscope-trinity (1.6.2-1ubuntu1) maverick; urgency=low + + * Initial Release for TDE + + -- Slávek Banko Mon, 07 Sep 2013 23:43:53 +0200 + +kscope (1.6.2-1ubuntu1) maverick; urgency=low + + * Port to Ubuntu. + + -- Eugene San (eugenesan) Fri, 04 Feb 2011 22:02:59 +0200 + +kscope (1.6.2-1) unstable; urgency=low + + * New upstream release (bugfix release). + * Bump Standards-Version to 3.8.0 (no changes needed). + + -- Fathi Boudra Sat, 09 Aug 2008 10:20:14 +0200 + +kscope (1.6.1-1) unstable; urgency=low + + * New upstream release. + * Refresh patches. + * Bump Standards-Version to 3.7.3. + * Use Homepage, Vcs-Browser and Vcs-Svn fields. + * Switch to quilt patch system. + * Remove embedded copy of GFDL as it can be found in common-licences. + + -- Fathi Boudra Sat, 01 Mar 2008 19:33:31 +0100 + +kscope (1.6.0-1) unstable; urgency=low + + * New upstream release. + + -- Fathi Boudra Thu, 12 Jul 2007 21:22:32 +0200 + +kscope (1.5.2-1) unstable; urgency=low + + * New upstream release. (Closes: #420874) + + -- Fathi Boudra Tue, 15 May 2007 19:47:50 +0200 + +kscope (1.5.1-2) unstable; urgency=low + + * Upload to unstable + + -- Mark Purcell Sat, 3 Mar 2007 13:23:12 +0000 + +kscope (1.5.1-1) experimental; urgency=low + + * New upstream release. + + -- Fathi Boudra Thu, 15 Feb 2007 18:56:31 +0100 + +kscope (1.5.0-1) unstable; urgency=low + + * New upstream release + * Add ./debian/rules get-orig-source for http://buildserver.net + * Build-Depends: autotools-dev fixes outdated-autotools-helper-file + + -- Mark Purcell Wed, 7 Feb 2007 21:08:10 +0000 + +kscope (1.4.2-1) unstable; urgency=low + + * New upstream release + + -- Fathi Boudra Mon, 16 Oct 2006 22:03:21 +0200 + +kscope (1.4.1-2) unstable; urgency=low + + * Add patch to load default config + + -- Fathi Boudra Fri, 8 Sep 2006 18:13:30 +0200 + +kscope (1.4.1-1) unstable; urgency=low + + * New upstream release + * Remove 11_crashfix.diff, merged upstream + + -- Fathi Boudra Thu, 24 Aug 2006 12:24:23 +0200 + +kscope (1.4.0-1) unstable; urgency=low + + * New upstream release + * Merge kubuntu patches, thanks to Tom Albers + * Add kscope manpage from kubuntu package, + thanks to Jonathan Patrick Davies + * Update copyright file: add kscope manpage license + + -- Fathi Boudra Thu, 10 Aug 2006 14:42:31 +0200 + +kscope (1.3.4-1) unstable; urgency=low + + * Initial release (Closes: #309669) + + -- Fathi Boudra Fri, 28 Apr 2006 08:05:15 +0100 + diff --git a/ubuntu/maverick/applications/kscope/debian/compat b/ubuntu/maverick/applications/kscope/debian/compat new file mode 100644 index 000000000..7ed6ff82d --- /dev/null +++ b/ubuntu/maverick/applications/kscope/debian/compat @@ -0,0 +1 @@ +5 diff --git a/ubuntu/maverick/applications/kscope/debian/control b/ubuntu/maverick/applications/kscope/debian/control new file mode 100644 index 000000000..f48fa899a --- /dev/null +++ b/ubuntu/maverick/applications/kscope/debian/control @@ -0,0 +1,45 @@ +Source: kscope-trinity +Section: tde +Priority: optional +Maintainer: Timothy Pearson +XSBC-Original-Maintainer: Debian KDE Extras Team +Uploaders: Fathi Boudra , Mark Purcell +Build-Depends: cdbs, debhelper (>= 5), quilt, automake, libtool, bison, flex, + tdebase-trinity-dev, docbook2x, docbook-xml +Standards-Version: 3.8.0 +Homepage: http://kscope.sourceforge.net +Vcs-Browser: http://svn.debian.org/wsvn/pkg-kde/kde-extras/kscope/?op=log +Vcs-Svn: svn://svn.debian.org/pkg-kde/kde-extras/kscope/trunk + +Package: kscope-trinity +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends}, cscope, exuberant-ctags, graphviz +Description: source editing environment for TDE + KScope is a TDE front-end to Cscope. It provides a source-editing environment + for large C projects. KScope is focused on source editing and analysis. + . + KScope is built around an efficient mechanism for code-navigation, which + allows the user to run queries on the code. + . + The types of queries KScope can run include: + * Get all references to a symbol + * Find the definition of a symbol + * Find all functions called by or calling to a function + * Find an EGrep pattern + * Find all files #including some file + . + These queries are handled by an underlying Cscope process. KScope simply + serves as a front-end to this process, feeding it with queries, and parsing + its output into result lists. The items in those lists can later be selected + to open an editor at the matching line. + . + Main Features: + * Multiple editor windows (using your favourite TDE editor) + * Project management + * Front-end to most Cscope queries + * Tag list for every open editor + * Call-tree window + * Session management, including saving and restoring queries + * Works with externally-built cscope.out files + . + Homepage: http://kscope.sourceforge.net diff --git a/ubuntu/maverick/applications/kscope/debian/copyright b/ubuntu/maverick/applications/kscope/debian/copyright new file mode 100644 index 000000000..6149f4244 --- /dev/null +++ b/ubuntu/maverick/applications/kscope/debian/copyright @@ -0,0 +1,62 @@ +This package was debianized by Fathi Boudra on +Tue, 11 Apr 2006 11:44:04 +0200. + +It was downloaded from http://kscope.sourceforge.net + +Copyright Holder: Elad Lahav + +The kscope manpage is © 2006 Jonathan Patrick Davies +and is licensed under the GPL, see below. + +manpage 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-2'. + +kscope license: + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions +are met: + +1. Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. +2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + +THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR +IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES +OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. +IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, +INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT +NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF +THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +On Debian systems, the complete text of the BSD License can be +found in `/usr/share/common-licenses/BSD'. + +The documentations provided with kscope is distributed under +the GNU Free Documentation License (FDL). They are considered free with +regards to the Debian Free Software Guidelines (DFSG) because they don't +contain any unmodifiable parts (invariant sections). + +On Debian systems, the complete text of the GNU Free Documentation +License can be found in `/usr/share/common-licenses/GFDL'. diff --git a/ubuntu/maverick/applications/kscope/debian/docs b/ubuntu/maverick/applications/kscope/debian/docs new file mode 100644 index 000000000..1333ed77b --- /dev/null +++ b/ubuntu/maverick/applications/kscope/debian/docs @@ -0,0 +1 @@ +TODO diff --git a/ubuntu/maverick/applications/kscope/debian/kscope.xml b/ubuntu/maverick/applications/kscope/debian/kscope.xml new file mode 100644 index 000000000..a70b1be45 --- /dev/null +++ b/ubuntu/maverick/applications/kscope/debian/kscope.xml @@ -0,0 +1,124 @@ + + + + + + Jonathan Patrick + Davies + jpatrick@ubuntu.com + + + 2006 + Jonathan Patrick Davies + + + + 2006-02-18 + + + + kscope + 1 + + + kscope + a source browsing and editing environment + + + + kscope + + + + + + + + + + DESCRIPTION + + KScope is a source browsing and editing environment for large projects written + in C (such as the Linux kernel). + + + KScope uses the Cscope code analysis engine to provide valuable information to + coders. + + + KScope also provides call-tree and call-graph views that can help developers + by visualising the relationships between different functions in the code base. + + + + OPTIONS + + All TDE and Qt + programs accept a some common command-line options. KScope has no + application-specific options. + + + + Generic options: + + + Show help about options + + + + Show Qt specific options + + + + Show TDE specific options + + + + Show all options + + + + Show author information + + + , + Show version information + + + + Show license information + + + + Indicates end of options + + + + + + + AUTHOR + + KScope was written by Elad Lahav elad_lahav@users.sf.net. + + + + COPYRIGHT + + This manual page was written by Jonathan Patrick Davies + jpatrick@ubuntu.com for the + Ubuntu system (but may be used by others). + Permission is granted to copy, distribute and/or modify this document + under the terms of the GNU General Public License, + Version 2 or any later version published by the Free Software Foundation. + + + On Debian systems, the complete text of the GNU General Public + License can be found in + /usr/share/common-licenses/GPL. + + + diff --git a/ubuntu/maverick/applications/kscope/debian/manpages b/ubuntu/maverick/applications/kscope/debian/manpages new file mode 100644 index 000000000..03ff43b50 --- /dev/null +++ b/ubuntu/maverick/applications/kscope/debian/manpages @@ -0,0 +1 @@ +kscope.1 diff --git a/ubuntu/maverick/applications/kscope/debian/patches/04_am_maintainer_mode.diff b/ubuntu/maverick/applications/kscope/debian/patches/04_am_maintainer_mode.diff new file mode 100644 index 000000000..391a80285 --- /dev/null +++ b/ubuntu/maverick/applications/kscope/debian/patches/04_am_maintainer_mode.diff @@ -0,0 +1,11 @@ +--- a/admin/configure.in.min ++++ b/admin/configure.in.min +@@ -38,6 +38,8 @@ + dnl Automake doc recommends to do this only here. (Janos) + AM_INIT_AUTOMAKE(@MODULENAME@, @VERSION@) dnl searches for some needed programs + ++AM_MAINTAINER_MODE ++ + KDE_SET_PREFIX + + dnl generate the config header diff --git a/ubuntu/maverick/applications/kscope/debian/patches/06_disable_no_undefined.diff b/ubuntu/maverick/applications/kscope/debian/patches/06_disable_no_undefined.diff new file mode 100644 index 000000000..05c932c3c --- /dev/null +++ b/ubuntu/maverick/applications/kscope/debian/patches/06_disable_no_undefined.diff @@ -0,0 +1,18 @@ +--- a/admin/acinclude.m4.in ++++ b/admin/acinclude.m4.in +@@ -1689,15 +1689,6 @@ + KDE_USE_CLOSURE_TRUE="#" + KDE_USE_CLOSURE_FALSE="" + KDE_NO_UNDEFINED="" +- case $host in +- *-*-linux-gnu) +- KDE_CHECK_COMPILER_FLAG([Wl,--no-undefined], +- [KDE_CHECK_COMPILER_FLAG([Wl,--allow-shlib-undefined], +- [KDE_NO_UNDEFINED="-Wl,--no-undefined -Wl,--allow-shlib-undefined"], +- [KDE_NO_UNDEFINED=""])], +- [KDE_NO_UNDEFINED=""]) +- ;; +- esac + fi + AC_SUBST(KDE_USE_CLOSURE_TRUE) + AC_SUBST(KDE_USE_CLOSURE_FALSE) diff --git a/ubuntu/maverick/applications/kscope/debian/patches/series b/ubuntu/maverick/applications/kscope/debian/patches/series new file mode 100644 index 000000000..b8743ddd9 --- /dev/null +++ b/ubuntu/maverick/applications/kscope/debian/patches/series @@ -0,0 +1,2 @@ +04_am_maintainer_mode.diff +06_disable_no_undefined.diff diff --git a/ubuntu/maverick/applications/kscope/debian/rules b/ubuntu/maverick/applications/kscope/debian/rules new file mode 100755 index 000000000..65883a481 --- /dev/null +++ b/ubuntu/maverick/applications/kscope/debian/rules @@ -0,0 +1,40 @@ +#!/usr/bin/make -f + +include /usr/share/cdbs/1/rules/debhelper.mk +include debian/cdbs/kde.mk +include /usr/share/cdbs/1/rules/patchsys-quilt.mk +include /usr/share/cdbs/1/rules/utils.mk + +DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include +DEB_CONFIGURE_MANDIR := /opt/trinity/share/man +DEB_CONFIGURE_PREFIX := /opt/trinity +DEB_CONFIGURE_INFODIR := /opt/trinity/share/info + +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + +post-patches:: debian/stamp-bootstrap + +debian/stamp-bootstrap: + dh_testdir + + # Regenerate build system + ! [ -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 + + autoreconf --install && automake -f && \ + $(MAKE) -f admin/Makefile.common && \ + touch debian/stamp-bootstrap + +build/kscope-trinity:: + /usr/bin/docbook2x-man debian/kscope.xml + +binary-install/kscope-trinity:: + mv debian/$(cdbs_curpkg)/usr/share/man debian/$(cdbs_curpkg)/opt/trinity/share/ + +clean:: + rm -f kscope.1 + rm -f debian/stamp-bootstrap diff --git a/ubuntu/maverick/applications/kscope/debian/source/format b/ubuntu/maverick/applications/kscope/debian/source/format new file mode 100644 index 000000000..89ae9db8f --- /dev/null +++ b/ubuntu/maverick/applications/kscope/debian/source/format @@ -0,0 +1 @@ +3.0 (native) diff --git a/ubuntu/maverick/applications/kscope/debian/source/options b/ubuntu/maverick/applications/kscope/debian/source/options new file mode 100644 index 000000000..72f1f5450 --- /dev/null +++ b/ubuntu/maverick/applications/kscope/debian/source/options @@ -0,0 +1,6 @@ +# Use xz instead of gzip +compression = "xz" +compression-level = 9 + +# Don't run differences +diff-ignore = .* diff --git a/ubuntu/maverick/applications/kscope/debian/watch b/ubuntu/maverick/applications/kscope/debian/watch new file mode 100644 index 000000000..6825f61dd --- /dev/null +++ b/ubuntu/maverick/applications/kscope/debian/watch @@ -0,0 +1,2 @@ +version=3 +http://sf.net/kscope/kscope-(.*)\.tar\.gz debian svn-upgrade diff --git a/ubuntu/maverick/applications/kvpnc/debian/patches/13_add_kuser_issuperuser.diff b/ubuntu/maverick/applications/kvpnc/debian/patches/13_add_kuser_issuperuser.diff index 826d4e236..0729793b7 100644 --- a/ubuntu/maverick/applications/kvpnc/debian/patches/13_add_kuser_issuperuser.diff +++ b/ubuntu/maverick/applications/kvpnc/debian/patches/13_add_kuser_issuperuser.diff @@ -14,16 +14,16 @@ index 7c45fcf..b933832 100644 } else { --// if (getenv("USER") != "root") +-// if (getenv("USER") != TQString("root")) -// { -// KMessageBox::error( 0, I18N_NOOP( "Kvpnc must be started as root!" ) ); -// exit(0); -// } -+ if (getenv("USER") != "root") -+ { -+ KMessageBox::error( 0, I18N_NOOP( "Kvpnc must be started as root!" ) ); -+ exit(0); -+ } ++ if (getenv("USER") != TQString("root")) ++ { ++ KMessageBox::error( 0, I18N_NOOP( "Kvpnc must be started as root!" ) ); ++ exit(0); ++ } TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); diff --git a/ubuntu/maverick/applications/kvpnc/debian/patches/series b/ubuntu/maverick/applications/kvpnc/debian/patches/series index 09040ada9..d29c3ca91 100644 --- a/ubuntu/maverick/applications/kvpnc/debian/patches/series +++ b/ubuntu/maverick/applications/kvpnc/debian/patches/series @@ -1,2 +1,2 @@ -10_su-to-root_usage.diff +# 10_su-to-root_usage.diff 13_add_kuser_issuperuser.diff diff --git a/ubuntu/maverick/applications/tdepowersave/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/applications/tdepowersave/debian/cdbs/debian-qt-kde.mk index c807eed8c..33a932634 100644 --- a/ubuntu/maverick/applications/tdepowersave/debian/cdbs/debian-qt-kde.mk +++ b/ubuntu/maverick/applications/tdepowersave/debian/cdbs/debian-qt-kde.mk @@ -10,9 +10,11 @@ _cdbs_class_debian-qt-kde := 1 # Note: This _must_ be included before autotools.mk, or it won't work. common-configure-arch common-configure-indep:: debian/stamp-cvs-make debian/stamp-cvs-make: +ifndef _cdbs_class_cmake cp -Rp /usr/share/aclocal/libtool.m4 admin/libtool.m4.in cp -Rp /usr/share/libtool/config/ltmain.sh admin/ltmain.sh $(MAKE) -C $(DEB_SRCDIR) -f admin/Makefile.common dist; +endif touch debian/stamp-cvs-make include debian/cdbs/kde.mk$(_cdbs_makefile_suffix) @@ -98,6 +100,7 @@ binary-install/$(DEB_SOURCE_PACKAGE)-doc-html:: done clean:: +ifndef _cdbs_class_cmake if test -n "$(DEB_KDE_CVS_MAKE)" && test -d $(DEB_SRCDIR); then \ cd $(DEB_SRCDIR); \ find . -name Makefile.in -print | \ @@ -106,6 +109,7 @@ clean:: configure configure.files configure.in stamp-h.in \ subdirs; \ fi +endif rm -f debian/stamp-cvs-make endif diff --git a/ubuntu/maverick/applications/tdepowersave/debian/cdbs/kde.mk b/ubuntu/maverick/applications/tdepowersave/debian/cdbs/kde.mk index 765560c89..023886fc8 100644 --- a/ubuntu/maverick/applications/tdepowersave/debian/cdbs/kde.mk +++ b/ubuntu/maverick/applications/tdepowersave/debian/cdbs/kde.mk @@ -35,7 +35,9 @@ else DEB_BUILDDIR = obj-$(DEB_BUILD_GNU_TYPE) endif +ifndef _cdbs_class_cmake include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix) +endif export kde_cgidir = \$${libdir}/cgi-bin export kde_confdir = \$${sysconfdir}/trinity @@ -59,7 +61,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/ubuntu/maverick/applications/tdepowersave/debian/control b/ubuntu/maverick/applications/tdepowersave/debian/control index ca4a5def2..7882039dd 100644 --- a/ubuntu/maverick/applications/tdepowersave/debian/control +++ b/ubuntu/maverick/applications/tdepowersave/debian/control @@ -3,7 +3,7 @@ Section: tde Priority: optional Maintainer: Timothy Pearson XSBC-Original-Maintainer: Michael Biebl -Build-Depends: cdbs, debhelper (>= 5.0.0), quilt, tdelibs14-trinity-dev, libxss-dev, libxtst-dev, libdbus-1-dev (>= 0.6), libdbus-tqt-1-dev, automake, autoconf, libtool, libltdl-dev +Build-Depends: cdbs, debhelper (>= 5.0.0), quilt, tdelibs14-trinity-dev, libxss-dev, libxtst-dev, libdbus-1-dev (>= 0.6), libdbus-tqt-1-dev, cmake, automake, autoconf, libtool, libltdl-dev Build-Conflicts: autoconf2.13 Standards-Version: 3.8.4 Homepage: http://sourceforge.net/projects/powersave/ diff --git a/ubuntu/maverick/applications/tdepowersave/debian/rules b/ubuntu/maverick/applications/tdepowersave/debian/rules index f74a76605..a891b0150 100755 --- a/ubuntu/maverick/applications/tdepowersave/debian/rules +++ b/ubuntu/maverick/applications/tdepowersave/debian/rules @@ -1,5 +1,6 @@ #!/usr/bin/make -f +include /usr/share/cdbs/1/class/cmake.mk include debian/cdbs/kde.mk include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/rules/patchsys-quilt.mk @@ -17,9 +18,20 @@ DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinit DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ && echo xz || echo bzip2) +DEB_CMAKE_EXTRA_FLAGS := \ + -DCMAKE_INSTALL_PREFIX="/opt/trinity" \ + -DCONFIG_INSTALL_DIR="/etc/trinity" \ + -DSYSCONF_INSTALL_DIR="/etc/trinity" \ + -DXDG_MENU_INSTALL_DIR="/etc/xdg/menus" \ + -DCMAKE_BUILD_TYPE=RelWithDebInfo \ + -DCMAKE_VERBOSE_MAKEFILE="ON" \ + -DCMAKE_SKIP_RPATH="OFF" \ + -DBUILD_ALL="ON" + post-patches:: debian/stamp-bootstrap debian/stamp-bootstrap: +ifndef _cdbs_class_cmake ! [ -f /usr/share/libtool/ltmain.sh ] || \ cp -f /usr/share/libtool/ltmain.sh admin/ltmain.sh ! [ -f /usr/share/libtool/config/ltmain.sh ] || \ @@ -27,6 +39,7 @@ debian/stamp-bootstrap: cp -f /usr/share/aclocal/libtool.m4 admin/libtool.m4.in make -f admin/Makefile.common cvs +endif touch debian/stamp-bootstrap install/tdepowersave-trinity:: diff --git a/ubuntu/maverick/tdelibs/debian/control b/ubuntu/maverick/tdelibs/debian/control index 305e3ca68..11250f1d4 100644 --- a/ubuntu/maverick/tdelibs/debian/control +++ b/ubuntu/maverick/tdelibs/debian/control @@ -62,7 +62,7 @@ Replaces: kdelibs4c2a-kde3 (<< 4:14.0.0~), kdelibs4c2a-trinity (<< 4:14.0.0~), t Breaks: kdelibs4c2a-kde3 (<< 4:14.0.0~), kdelibs4c2a-trinity (<< 4:14.0.0~), tdelibs4c2a-trinity Depends: ${shlibs:Depends}, tdelibs-data-trinity, tdelibs-data-trinity, libart-2.0-2 (>= 4:14.0.0~), perl, xbase-clients, sudo -Recommends: xdg-user-dirs +Recommends: xdg-user-dirs, consolekit Suggests: fam, perl-suid Description: core libraries and binaries for all TDE applications This package contains all the shared libraries and common core binaries diff --git a/ubuntu/precise/applications/kscope/debian/cdbs/debian-qt-kde.mk b/ubuntu/precise/applications/kscope/debian/cdbs/debian-qt-kde.mk new file mode 100644 index 000000000..d81e0a12f --- /dev/null +++ b/ubuntu/precise/applications/kscope/debian/cdbs/debian-qt-kde.mk @@ -0,0 +1,115 @@ +ifndef _cdbs_bootstrap +_cdbs_scripts_path ?= /usr/lib/cdbs +_cdbs_rules_path ?= /usr/share/cdbs/1/rules +_cdbs_class_path ?= /usr/share/cdbs/1/class +endif + +ifndef _cdbs_class_debian-qt-kde +_cdbs_class_debian-qt-kde := 1 + +# Note: This _must_ be included before autotools.mk, or it won't work. +common-configure-arch common-configure-indep:: debian/stamp-cvs-make +debian/stamp-cvs-make: +ifndef _cdbs_class_cmake + cp -Rp /usr/share/aclocal/libtool.m4 admin/libtool.m4.in + cp -Rp /usr/share/libtool/config/ltmain.sh admin/ltmain.sh + $(MAKE) -C $(DEB_SRCDIR) -f admin/Makefile.common dist; +endif + touch 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 := + +DEB_DH_MAKESHLIBS_ARGS_ALL := -V +DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib) + +ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) + cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb + ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches))) + cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,) + else + cdbs_kde_enable_final = + endif +endif + +common-build-arch:: debian/stamp-man-pages +debian/stamp-man-pages: + if ! test -d debian/man/out; then mkdir -p debian/man/out; fi + for f in $$(find debian/man -name '*.sgml'); do \ + docbook-to-man $$f > debian/man/out/`basename $$f .sgml`.1; \ + done + for f in $$(find debian/man -name '*.man'); do \ + soelim -I debian/man $$f \ + > debian/man/out/`basename $$f .man`.`head -n1 $$f | awk '{print $$NF}'`; \ + done + touch debian/stamp-man-pages + +common-binary-indep:: + ( set -e; \ + tmpf=`mktemp debian/versions.XXXXXX`; \ + perl debian/cdbs/versions.pl >$$tmpf; \ + for p in $(DEB_INDEP_PACKAGES); do \ + cat $$tmpf >>debian/$$p.substvars; \ + done; \ + rm -f $$tmpf ) + +common-binary-arch:: + ( set -e; \ + tmpf=`mktemp debian/versions.XXXXXX`; \ + perl debian/cdbs/versions.pl >$$tmpf; \ + for p in $(DEB_ARCH_PACKAGES); do \ + cat $$tmpf >>debian/$$p.substvars; \ + done; \ + rm -f $$tmpf ) + +clean:: + rm -rf debian/man/out + -rmdir debian/man + rm -f debian/stamp-man-pages + rm -rf debian/shlibs-check + +$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: + if test -x /usr/bin/dh_desktop; then dh_desktop -p$(cdbs_curpkg) $(DEB_DH_DESKTOP_ARGS); fi + if test -e debian/$(cdbs_curpkg).lintian; then \ + install -p -D -m644 debian/$(cdbs_curpkg).lintian \ + debian/$(cdbs_curpkg)/usr/share/lintian/overrides/$(cdbs_curpkg); \ + fi + if test -e debian/$(cdbs_curpkg).presubj; then \ + install -p -D -m644 debian/$(cdbs_curpkg).presubj \ + debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \ + fi + +binary-install/$(DEB_SOURCE_PACKAGE)-doc-html:: + set -e; \ + for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \ + pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \ + echo Building $$pkg HTML docs...; \ + mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \ + cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \ + /opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \ + done + for pkg in $(DOC_HTML_PRUNE) ; do \ + rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \ + done + +clean:: +ifndef _cdbs_class_cmake + if test -n "$(DEB_KDE_CVS_MAKE)" && test -d $(DEB_SRCDIR); then \ + cd $(DEB_SRCDIR); \ + find . -name Makefile.in -print | \ + xargs --no-run-if-empty rm -f; \ + rm -f Makefile.am acinclude.m4 aclocal.m4 config.h.in \ + configure configure.files configure.in stamp-h.in \ + subdirs; \ + fi +endif + rm -f debian/stamp-cvs-make + +endif diff --git a/ubuntu/precise/applications/kscope/debian/cdbs/kde.mk b/ubuntu/precise/applications/kscope/debian/cdbs/kde.mk new file mode 100644 index 000000000..023886fc8 --- /dev/null +++ b/ubuntu/precise/applications/kscope/debian/cdbs/kde.mk @@ -0,0 +1,99 @@ +# -*- mode: makefile; coding: utf-8 -*- +# Copyright © 2003 Christopher L Cheney +# Description: A class for KDE packages; sets KDE environment variables, etc +# +# This program 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, or (at +# your option) any later version. +# +# This program 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 program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA +# 02111-1307 USA. + +_cdbs_scripts_path ?= /usr/lib/cdbs +_cdbs_rules_path ?= /usr/share/cdbs/1/rules +_cdbs_class_path ?= /usr/share/cdbs/1/class + +ifndef _cdbs_class_kde +_cdbs_class_kde := 1 + +# for dh_icons +CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), debhelper (>= 5.0.7ubuntu4) + +include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix) + +ifdef _cdbs_tarball_dir +DEB_BUILDDIR = $(_cdbs_tarball_dir)/obj-$(DEB_BUILD_GNU_TYPE) +else +DEB_BUILDDIR = obj-$(DEB_BUILD_GNU_TYPE) +endif + +ifndef _cdbs_class_cmake +include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix) +endif + +export kde_cgidir = \$${libdir}/cgi-bin +export kde_confdir = \$${sysconfdir}/trinity +export kde_htmldir = \$${datadir}/doc/tde/HTML + +ifeq (,$(filter noopt,$(DEB_BUILD_OPTIONS))) + cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,) +endif + +ifneq (,$(filter nostrip,$(DEB_BUILD_OPTIONS))) + cdbs_kde_enable_final = + cdbs_kde_enable_debug = --enable-debug=yes +else + cdbs_kde_enable_debug = --disable-debug +endif + +ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS))) + cdbs_kde_enable_debug = --enable-debug=full +endif + +cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) + +DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include" +DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el + +$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: + if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi + +cleanbuilddir:: + -$(if $(call cdbs_streq,$(DEB_BUILDDIR),$(DEB_SRCDIR)),,rm -rf $(DEB_BUILDDIR)) + +common-build-arch common-build-indep:: debian/stamp-kde-apidox +debian/stamp-kde-apidox: + $(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox) + touch $@ + +common-install-prehook-impl:: + mkdir -p po + -XGETTEXT=/usr/bin/kde-xgettext EXTRACTATTR=/opt/trinity/bin/extractattr sh $(DEB_SRCDIR)/admin/cvs.sh extract-messages + -for file in po/*pot; do \ + sed "s/charset=CHARSET/charset=UTF-8/" -i $$file; \ + done + +common-install-arch common-install-indep:: common-install-kde-apidox +common-install-kde-apidox:: + $(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) install-apidox DESTDIR=$(DEB_DESTDIR)) + +clean:: + rm -f debian/stamp-kde-apidox + rm -rf po/*.pot + +# This is a convenience target for calling manually. It's not part of +# the build process. +buildprep: clean apply-patches + $(MAKE) -f admin/Makefile.common dist + debian/rules clean + +endif diff --git a/ubuntu/precise/applications/kscope/debian/cdbs/versions.pl b/ubuntu/precise/applications/kscope/debian/cdbs/versions.pl new file mode 100644 index 000000000..75c9add4b --- /dev/null +++ b/ubuntu/precise/applications/kscope/debian/cdbs/versions.pl @@ -0,0 +1,19 @@ +#!/usr/bin/env perl + +use strict; +use warnings; + +my $version = `dpkg-parsechangelog | awk '/^Version/ {print \$2}'`; +my ($version3, $version3_next); +my ($version2, $version2_next); + +($version3 = $version) =~ s/^(([^.]+\.){2}[^.+~-]+)[.+~-]?[^-]*-[^-]+$/$1/; +($version2 = $version3) =~ s/\.[^.]+$//; + +($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e; +($version2_next = $version2) =~ s/(?<=\.)(\d+)$/($1+1)/e; + +print "KDE-Version3=$version3\n"; +print "KDE-Version2=$version2\n"; +print "KDE-Next-Version3=$version3_next\n"; +print "KDE-Next-Version2=$version2_next\n"; diff --git a/ubuntu/precise/applications/kscope/debian/changelog b/ubuntu/precise/applications/kscope/debian/changelog new file mode 100644 index 000000000..d3689c28f --- /dev/null +++ b/ubuntu/precise/applications/kscope/debian/changelog @@ -0,0 +1,97 @@ +kscope-trinity (1.6.2-1ubuntu1) maverick; urgency=low + + * Initial Release for TDE + + -- Slávek Banko Mon, 07 Sep 2013 23:43:53 +0200 + +kscope (1.6.2-1ubuntu1) maverick; urgency=low + + * Port to Ubuntu. + + -- Eugene San (eugenesan) Fri, 04 Feb 2011 22:02:59 +0200 + +kscope (1.6.2-1) unstable; urgency=low + + * New upstream release (bugfix release). + * Bump Standards-Version to 3.8.0 (no changes needed). + + -- Fathi Boudra Sat, 09 Aug 2008 10:20:14 +0200 + +kscope (1.6.1-1) unstable; urgency=low + + * New upstream release. + * Refresh patches. + * Bump Standards-Version to 3.7.3. + * Use Homepage, Vcs-Browser and Vcs-Svn fields. + * Switch to quilt patch system. + * Remove embedded copy of GFDL as it can be found in common-licences. + + -- Fathi Boudra Sat, 01 Mar 2008 19:33:31 +0100 + +kscope (1.6.0-1) unstable; urgency=low + + * New upstream release. + + -- Fathi Boudra Thu, 12 Jul 2007 21:22:32 +0200 + +kscope (1.5.2-1) unstable; urgency=low + + * New upstream release. (Closes: #420874) + + -- Fathi Boudra Tue, 15 May 2007 19:47:50 +0200 + +kscope (1.5.1-2) unstable; urgency=low + + * Upload to unstable + + -- Mark Purcell Sat, 3 Mar 2007 13:23:12 +0000 + +kscope (1.5.1-1) experimental; urgency=low + + * New upstream release. + + -- Fathi Boudra Thu, 15 Feb 2007 18:56:31 +0100 + +kscope (1.5.0-1) unstable; urgency=low + + * New upstream release + * Add ./debian/rules get-orig-source for http://buildserver.net + * Build-Depends: autotools-dev fixes outdated-autotools-helper-file + + -- Mark Purcell Wed, 7 Feb 2007 21:08:10 +0000 + +kscope (1.4.2-1) unstable; urgency=low + + * New upstream release + + -- Fathi Boudra Mon, 16 Oct 2006 22:03:21 +0200 + +kscope (1.4.1-2) unstable; urgency=low + + * Add patch to load default config + + -- Fathi Boudra Fri, 8 Sep 2006 18:13:30 +0200 + +kscope (1.4.1-1) unstable; urgency=low + + * New upstream release + * Remove 11_crashfix.diff, merged upstream + + -- Fathi Boudra Thu, 24 Aug 2006 12:24:23 +0200 + +kscope (1.4.0-1) unstable; urgency=low + + * New upstream release + * Merge kubuntu patches, thanks to Tom Albers + * Add kscope manpage from kubuntu package, + thanks to Jonathan Patrick Davies + * Update copyright file: add kscope manpage license + + -- Fathi Boudra Thu, 10 Aug 2006 14:42:31 +0200 + +kscope (1.3.4-1) unstable; urgency=low + + * Initial release (Closes: #309669) + + -- Fathi Boudra Fri, 28 Apr 2006 08:05:15 +0100 + diff --git a/ubuntu/precise/applications/kscope/debian/compat b/ubuntu/precise/applications/kscope/debian/compat new file mode 100644 index 000000000..7ed6ff82d --- /dev/null +++ b/ubuntu/precise/applications/kscope/debian/compat @@ -0,0 +1 @@ +5 diff --git a/ubuntu/precise/applications/kscope/debian/control b/ubuntu/precise/applications/kscope/debian/control new file mode 100644 index 000000000..f48fa899a --- /dev/null +++ b/ubuntu/precise/applications/kscope/debian/control @@ -0,0 +1,45 @@ +Source: kscope-trinity +Section: tde +Priority: optional +Maintainer: Timothy Pearson +XSBC-Original-Maintainer: Debian KDE Extras Team +Uploaders: Fathi Boudra , Mark Purcell +Build-Depends: cdbs, debhelper (>= 5), quilt, automake, libtool, bison, flex, + tdebase-trinity-dev, docbook2x, docbook-xml +Standards-Version: 3.8.0 +Homepage: http://kscope.sourceforge.net +Vcs-Browser: http://svn.debian.org/wsvn/pkg-kde/kde-extras/kscope/?op=log +Vcs-Svn: svn://svn.debian.org/pkg-kde/kde-extras/kscope/trunk + +Package: kscope-trinity +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends}, cscope, exuberant-ctags, graphviz +Description: source editing environment for TDE + KScope is a TDE front-end to Cscope. It provides a source-editing environment + for large C projects. KScope is focused on source editing and analysis. + . + KScope is built around an efficient mechanism for code-navigation, which + allows the user to run queries on the code. + . + The types of queries KScope can run include: + * Get all references to a symbol + * Find the definition of a symbol + * Find all functions called by or calling to a function + * Find an EGrep pattern + * Find all files #including some file + . + These queries are handled by an underlying Cscope process. KScope simply + serves as a front-end to this process, feeding it with queries, and parsing + its output into result lists. The items in those lists can later be selected + to open an editor at the matching line. + . + Main Features: + * Multiple editor windows (using your favourite TDE editor) + * Project management + * Front-end to most Cscope queries + * Tag list for every open editor + * Call-tree window + * Session management, including saving and restoring queries + * Works with externally-built cscope.out files + . + Homepage: http://kscope.sourceforge.net diff --git a/ubuntu/precise/applications/kscope/debian/copyright b/ubuntu/precise/applications/kscope/debian/copyright new file mode 100644 index 000000000..6149f4244 --- /dev/null +++ b/ubuntu/precise/applications/kscope/debian/copyright @@ -0,0 +1,62 @@ +This package was debianized by Fathi Boudra on +Tue, 11 Apr 2006 11:44:04 +0200. + +It was downloaded from http://kscope.sourceforge.net + +Copyright Holder: Elad Lahav + +The kscope manpage is © 2006 Jonathan Patrick Davies +and is licensed under the GPL, see below. + +manpage 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-2'. + +kscope license: + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions +are met: + +1. Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. +2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + +THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR +IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES +OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. +IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, +INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT +NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF +THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +On Debian systems, the complete text of the BSD License can be +found in `/usr/share/common-licenses/BSD'. + +The documentations provided with kscope is distributed under +the GNU Free Documentation License (FDL). They are considered free with +regards to the Debian Free Software Guidelines (DFSG) because they don't +contain any unmodifiable parts (invariant sections). + +On Debian systems, the complete text of the GNU Free Documentation +License can be found in `/usr/share/common-licenses/GFDL'. diff --git a/ubuntu/precise/applications/kscope/debian/docs b/ubuntu/precise/applications/kscope/debian/docs new file mode 100644 index 000000000..1333ed77b --- /dev/null +++ b/ubuntu/precise/applications/kscope/debian/docs @@ -0,0 +1 @@ +TODO diff --git a/ubuntu/precise/applications/kscope/debian/kscope.xml b/ubuntu/precise/applications/kscope/debian/kscope.xml new file mode 100644 index 000000000..a70b1be45 --- /dev/null +++ b/ubuntu/precise/applications/kscope/debian/kscope.xml @@ -0,0 +1,124 @@ + + + + + + Jonathan Patrick + Davies + jpatrick@ubuntu.com + + + 2006 + Jonathan Patrick Davies + + + + 2006-02-18 + + + + kscope + 1 + + + kscope + a source browsing and editing environment + + + + kscope + + + + + + + + + + DESCRIPTION + + KScope is a source browsing and editing environment for large projects written + in C (such as the Linux kernel). + + + KScope uses the Cscope code analysis engine to provide valuable information to + coders. + + + KScope also provides call-tree and call-graph views that can help developers + by visualising the relationships between different functions in the code base. + + + + OPTIONS + + All TDE and Qt + programs accept a some common command-line options. KScope has no + application-specific options. + + + + Generic options: + + + Show help about options + + + + Show Qt specific options + + + + Show TDE specific options + + + + Show all options + + + + Show author information + + + , + Show version information + + + + Show license information + + + + Indicates end of options + + + + + + + AUTHOR + + KScope was written by Elad Lahav elad_lahav@users.sf.net. + + + + COPYRIGHT + + This manual page was written by Jonathan Patrick Davies + jpatrick@ubuntu.com for the + Ubuntu system (but may be used by others). + Permission is granted to copy, distribute and/or modify this document + under the terms of the GNU General Public License, + Version 2 or any later version published by the Free Software Foundation. + + + On Debian systems, the complete text of the GNU General Public + License can be found in + /usr/share/common-licenses/GPL. + + + diff --git a/ubuntu/precise/applications/kscope/debian/manpages b/ubuntu/precise/applications/kscope/debian/manpages new file mode 100644 index 000000000..03ff43b50 --- /dev/null +++ b/ubuntu/precise/applications/kscope/debian/manpages @@ -0,0 +1 @@ +kscope.1 diff --git a/ubuntu/precise/applications/kscope/debian/patches/04_am_maintainer_mode.diff b/ubuntu/precise/applications/kscope/debian/patches/04_am_maintainer_mode.diff new file mode 100644 index 000000000..391a80285 --- /dev/null +++ b/ubuntu/precise/applications/kscope/debian/patches/04_am_maintainer_mode.diff @@ -0,0 +1,11 @@ +--- a/admin/configure.in.min ++++ b/admin/configure.in.min +@@ -38,6 +38,8 @@ + dnl Automake doc recommends to do this only here. (Janos) + AM_INIT_AUTOMAKE(@MODULENAME@, @VERSION@) dnl searches for some needed programs + ++AM_MAINTAINER_MODE ++ + KDE_SET_PREFIX + + dnl generate the config header diff --git a/ubuntu/precise/applications/kscope/debian/patches/06_disable_no_undefined.diff b/ubuntu/precise/applications/kscope/debian/patches/06_disable_no_undefined.diff new file mode 100644 index 000000000..05c932c3c --- /dev/null +++ b/ubuntu/precise/applications/kscope/debian/patches/06_disable_no_undefined.diff @@ -0,0 +1,18 @@ +--- a/admin/acinclude.m4.in ++++ b/admin/acinclude.m4.in +@@ -1689,15 +1689,6 @@ + KDE_USE_CLOSURE_TRUE="#" + KDE_USE_CLOSURE_FALSE="" + KDE_NO_UNDEFINED="" +- case $host in +- *-*-linux-gnu) +- KDE_CHECK_COMPILER_FLAG([Wl,--no-undefined], +- [KDE_CHECK_COMPILER_FLAG([Wl,--allow-shlib-undefined], +- [KDE_NO_UNDEFINED="-Wl,--no-undefined -Wl,--allow-shlib-undefined"], +- [KDE_NO_UNDEFINED=""])], +- [KDE_NO_UNDEFINED=""]) +- ;; +- esac + fi + AC_SUBST(KDE_USE_CLOSURE_TRUE) + AC_SUBST(KDE_USE_CLOSURE_FALSE) diff --git a/ubuntu/precise/applications/kscope/debian/patches/series b/ubuntu/precise/applications/kscope/debian/patches/series new file mode 100644 index 000000000..b8743ddd9 --- /dev/null +++ b/ubuntu/precise/applications/kscope/debian/patches/series @@ -0,0 +1,2 @@ +04_am_maintainer_mode.diff +06_disable_no_undefined.diff diff --git a/ubuntu/precise/applications/kscope/debian/rules b/ubuntu/precise/applications/kscope/debian/rules new file mode 100755 index 000000000..65883a481 --- /dev/null +++ b/ubuntu/precise/applications/kscope/debian/rules @@ -0,0 +1,40 @@ +#!/usr/bin/make -f + +include /usr/share/cdbs/1/rules/debhelper.mk +include debian/cdbs/kde.mk +include /usr/share/cdbs/1/rules/patchsys-quilt.mk +include /usr/share/cdbs/1/rules/utils.mk + +DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include +DEB_CONFIGURE_MANDIR := /opt/trinity/share/man +DEB_CONFIGURE_PREFIX := /opt/trinity +DEB_CONFIGURE_INFODIR := /opt/trinity/share/info + +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + +post-patches:: debian/stamp-bootstrap + +debian/stamp-bootstrap: + dh_testdir + + # Regenerate build system + ! [ -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 + + autoreconf --install && automake -f && \ + $(MAKE) -f admin/Makefile.common && \ + touch debian/stamp-bootstrap + +build/kscope-trinity:: + /usr/bin/docbook2x-man debian/kscope.xml + +binary-install/kscope-trinity:: + mv debian/$(cdbs_curpkg)/usr/share/man debian/$(cdbs_curpkg)/opt/trinity/share/ + +clean:: + rm -f kscope.1 + rm -f debian/stamp-bootstrap diff --git a/ubuntu/precise/applications/kscope/debian/source/format b/ubuntu/precise/applications/kscope/debian/source/format new file mode 100644 index 000000000..89ae9db8f --- /dev/null +++ b/ubuntu/precise/applications/kscope/debian/source/format @@ -0,0 +1 @@ +3.0 (native) diff --git a/ubuntu/precise/applications/kscope/debian/source/options b/ubuntu/precise/applications/kscope/debian/source/options new file mode 100644 index 000000000..72f1f5450 --- /dev/null +++ b/ubuntu/precise/applications/kscope/debian/source/options @@ -0,0 +1,6 @@ +# Use xz instead of gzip +compression = "xz" +compression-level = 9 + +# Don't run differences +diff-ignore = .* diff --git a/ubuntu/precise/applications/kscope/debian/watch b/ubuntu/precise/applications/kscope/debian/watch new file mode 100644 index 000000000..6825f61dd --- /dev/null +++ b/ubuntu/precise/applications/kscope/debian/watch @@ -0,0 +1,2 @@ +version=3 +http://sf.net/kscope/kscope-(.*)\.tar\.gz debian svn-upgrade diff --git a/ubuntu/precise/applications/kvpnc/debian/patches/13_add_kuser_issuperuser.diff b/ubuntu/precise/applications/kvpnc/debian/patches/13_add_kuser_issuperuser.diff index 826d4e236..0729793b7 100644 --- a/ubuntu/precise/applications/kvpnc/debian/patches/13_add_kuser_issuperuser.diff +++ b/ubuntu/precise/applications/kvpnc/debian/patches/13_add_kuser_issuperuser.diff @@ -14,16 +14,16 @@ index 7c45fcf..b933832 100644 } else { --// if (getenv("USER") != "root") +-// if (getenv("USER") != TQString("root")) -// { -// KMessageBox::error( 0, I18N_NOOP( "Kvpnc must be started as root!" ) ); -// exit(0); -// } -+ if (getenv("USER") != "root") -+ { -+ KMessageBox::error( 0, I18N_NOOP( "Kvpnc must be started as root!" ) ); -+ exit(0); -+ } ++ if (getenv("USER") != TQString("root")) ++ { ++ KMessageBox::error( 0, I18N_NOOP( "Kvpnc must be started as root!" ) ); ++ exit(0); ++ } TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); diff --git a/ubuntu/precise/applications/kvpnc/debian/patches/series b/ubuntu/precise/applications/kvpnc/debian/patches/series index 09040ada9..d29c3ca91 100644 --- a/ubuntu/precise/applications/kvpnc/debian/patches/series +++ b/ubuntu/precise/applications/kvpnc/debian/patches/series @@ -1,2 +1,2 @@ -10_su-to-root_usage.diff +# 10_su-to-root_usage.diff 13_add_kuser_issuperuser.diff diff --git a/ubuntu/precise/applications/tdepowersave/debian/cdbs/debian-qt-kde.mk b/ubuntu/precise/applications/tdepowersave/debian/cdbs/debian-qt-kde.mk index c807eed8c..33a932634 100644 --- a/ubuntu/precise/applications/tdepowersave/debian/cdbs/debian-qt-kde.mk +++ b/ubuntu/precise/applications/tdepowersave/debian/cdbs/debian-qt-kde.mk @@ -10,9 +10,11 @@ _cdbs_class_debian-qt-kde := 1 # Note: This _must_ be included before autotools.mk, or it won't work. common-configure-arch common-configure-indep:: debian/stamp-cvs-make debian/stamp-cvs-make: +ifndef _cdbs_class_cmake cp -Rp /usr/share/aclocal/libtool.m4 admin/libtool.m4.in cp -Rp /usr/share/libtool/config/ltmain.sh admin/ltmain.sh $(MAKE) -C $(DEB_SRCDIR) -f admin/Makefile.common dist; +endif touch debian/stamp-cvs-make include debian/cdbs/kde.mk$(_cdbs_makefile_suffix) @@ -98,6 +100,7 @@ binary-install/$(DEB_SOURCE_PACKAGE)-doc-html:: done clean:: +ifndef _cdbs_class_cmake if test -n "$(DEB_KDE_CVS_MAKE)" && test -d $(DEB_SRCDIR); then \ cd $(DEB_SRCDIR); \ find . -name Makefile.in -print | \ @@ -106,6 +109,7 @@ clean:: configure configure.files configure.in stamp-h.in \ subdirs; \ fi +endif rm -f debian/stamp-cvs-make endif diff --git a/ubuntu/precise/applications/tdepowersave/debian/cdbs/kde.mk b/ubuntu/precise/applications/tdepowersave/debian/cdbs/kde.mk index 765560c89..023886fc8 100644 --- a/ubuntu/precise/applications/tdepowersave/debian/cdbs/kde.mk +++ b/ubuntu/precise/applications/tdepowersave/debian/cdbs/kde.mk @@ -35,7 +35,9 @@ else DEB_BUILDDIR = obj-$(DEB_BUILD_GNU_TYPE) endif +ifndef _cdbs_class_cmake include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix) +endif export kde_cgidir = \$${libdir}/cgi-bin export kde_confdir = \$${sysconfdir}/trinity @@ -59,7 +61,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/ubuntu/precise/applications/tdepowersave/debian/control b/ubuntu/precise/applications/tdepowersave/debian/control index ca4a5def2..7882039dd 100644 --- a/ubuntu/precise/applications/tdepowersave/debian/control +++ b/ubuntu/precise/applications/tdepowersave/debian/control @@ -3,7 +3,7 @@ Section: tde Priority: optional Maintainer: Timothy Pearson XSBC-Original-Maintainer: Michael Biebl -Build-Depends: cdbs, debhelper (>= 5.0.0), quilt, tdelibs14-trinity-dev, libxss-dev, libxtst-dev, libdbus-1-dev (>= 0.6), libdbus-tqt-1-dev, automake, autoconf, libtool, libltdl-dev +Build-Depends: cdbs, debhelper (>= 5.0.0), quilt, tdelibs14-trinity-dev, libxss-dev, libxtst-dev, libdbus-1-dev (>= 0.6), libdbus-tqt-1-dev, cmake, automake, autoconf, libtool, libltdl-dev Build-Conflicts: autoconf2.13 Standards-Version: 3.8.4 Homepage: http://sourceforge.net/projects/powersave/ diff --git a/ubuntu/precise/applications/tdepowersave/debian/rules b/ubuntu/precise/applications/tdepowersave/debian/rules index f74a76605..a891b0150 100755 --- a/ubuntu/precise/applications/tdepowersave/debian/rules +++ b/ubuntu/precise/applications/tdepowersave/debian/rules @@ -1,5 +1,6 @@ #!/usr/bin/make -f +include /usr/share/cdbs/1/class/cmake.mk include debian/cdbs/kde.mk include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/rules/patchsys-quilt.mk @@ -17,9 +18,20 @@ DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinit DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ && echo xz || echo bzip2) +DEB_CMAKE_EXTRA_FLAGS := \ + -DCMAKE_INSTALL_PREFIX="/opt/trinity" \ + -DCONFIG_INSTALL_DIR="/etc/trinity" \ + -DSYSCONF_INSTALL_DIR="/etc/trinity" \ + -DXDG_MENU_INSTALL_DIR="/etc/xdg/menus" \ + -DCMAKE_BUILD_TYPE=RelWithDebInfo \ + -DCMAKE_VERBOSE_MAKEFILE="ON" \ + -DCMAKE_SKIP_RPATH="OFF" \ + -DBUILD_ALL="ON" + post-patches:: debian/stamp-bootstrap debian/stamp-bootstrap: +ifndef _cdbs_class_cmake ! [ -f /usr/share/libtool/ltmain.sh ] || \ cp -f /usr/share/libtool/ltmain.sh admin/ltmain.sh ! [ -f /usr/share/libtool/config/ltmain.sh ] || \ @@ -27,6 +39,7 @@ debian/stamp-bootstrap: cp -f /usr/share/aclocal/libtool.m4 admin/libtool.m4.in make -f admin/Makefile.common cvs +endif touch debian/stamp-bootstrap install/tdepowersave-trinity:: diff --git a/ubuntu/precise/tdelibs/debian/control b/ubuntu/precise/tdelibs/debian/control index 305e3ca68..11250f1d4 100644 --- a/ubuntu/precise/tdelibs/debian/control +++ b/ubuntu/precise/tdelibs/debian/control @@ -62,7 +62,7 @@ Replaces: kdelibs4c2a-kde3 (<< 4:14.0.0~), kdelibs4c2a-trinity (<< 4:14.0.0~), t Breaks: kdelibs4c2a-kde3 (<< 4:14.0.0~), kdelibs4c2a-trinity (<< 4:14.0.0~), tdelibs4c2a-trinity Depends: ${shlibs:Depends}, tdelibs-data-trinity, tdelibs-data-trinity, libart-2.0-2 (>= 4:14.0.0~), perl, xbase-clients, sudo -Recommends: xdg-user-dirs +Recommends: xdg-user-dirs, consolekit Suggests: fam, perl-suid Description: core libraries and binaries for all TDE applications This package contains all the shared libraries and common core binaries diff --git a/ubuntu/raring/applications/kscope/debian/cdbs/debian-qt-kde.mk b/ubuntu/raring/applications/kscope/debian/cdbs/debian-qt-kde.mk new file mode 100644 index 000000000..d81e0a12f --- /dev/null +++ b/ubuntu/raring/applications/kscope/debian/cdbs/debian-qt-kde.mk @@ -0,0 +1,115 @@ +ifndef _cdbs_bootstrap +_cdbs_scripts_path ?= /usr/lib/cdbs +_cdbs_rules_path ?= /usr/share/cdbs/1/rules +_cdbs_class_path ?= /usr/share/cdbs/1/class +endif + +ifndef _cdbs_class_debian-qt-kde +_cdbs_class_debian-qt-kde := 1 + +# Note: This _must_ be included before autotools.mk, or it won't work. +common-configure-arch common-configure-indep:: debian/stamp-cvs-make +debian/stamp-cvs-make: +ifndef _cdbs_class_cmake + cp -Rp /usr/share/aclocal/libtool.m4 admin/libtool.m4.in + cp -Rp /usr/share/libtool/config/ltmain.sh admin/ltmain.sh + $(MAKE) -C $(DEB_SRCDIR) -f admin/Makefile.common dist; +endif + touch 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 := + +DEB_DH_MAKESHLIBS_ARGS_ALL := -V +DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib) + +ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) + cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb + ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches))) + cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,) + else + cdbs_kde_enable_final = + endif +endif + +common-build-arch:: debian/stamp-man-pages +debian/stamp-man-pages: + if ! test -d debian/man/out; then mkdir -p debian/man/out; fi + for f in $$(find debian/man -name '*.sgml'); do \ + docbook-to-man $$f > debian/man/out/`basename $$f .sgml`.1; \ + done + for f in $$(find debian/man -name '*.man'); do \ + soelim -I debian/man $$f \ + > debian/man/out/`basename $$f .man`.`head -n1 $$f | awk '{print $$NF}'`; \ + done + touch debian/stamp-man-pages + +common-binary-indep:: + ( set -e; \ + tmpf=`mktemp debian/versions.XXXXXX`; \ + perl debian/cdbs/versions.pl >$$tmpf; \ + for p in $(DEB_INDEP_PACKAGES); do \ + cat $$tmpf >>debian/$$p.substvars; \ + done; \ + rm -f $$tmpf ) + +common-binary-arch:: + ( set -e; \ + tmpf=`mktemp debian/versions.XXXXXX`; \ + perl debian/cdbs/versions.pl >$$tmpf; \ + for p in $(DEB_ARCH_PACKAGES); do \ + cat $$tmpf >>debian/$$p.substvars; \ + done; \ + rm -f $$tmpf ) + +clean:: + rm -rf debian/man/out + -rmdir debian/man + rm -f debian/stamp-man-pages + rm -rf debian/shlibs-check + +$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: + if test -x /usr/bin/dh_desktop; then dh_desktop -p$(cdbs_curpkg) $(DEB_DH_DESKTOP_ARGS); fi + if test -e debian/$(cdbs_curpkg).lintian; then \ + install -p -D -m644 debian/$(cdbs_curpkg).lintian \ + debian/$(cdbs_curpkg)/usr/share/lintian/overrides/$(cdbs_curpkg); \ + fi + if test -e debian/$(cdbs_curpkg).presubj; then \ + install -p -D -m644 debian/$(cdbs_curpkg).presubj \ + debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \ + fi + +binary-install/$(DEB_SOURCE_PACKAGE)-doc-html:: + set -e; \ + for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \ + pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \ + echo Building $$pkg HTML docs...; \ + mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \ + cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \ + /opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \ + done + for pkg in $(DOC_HTML_PRUNE) ; do \ + rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \ + done + +clean:: +ifndef _cdbs_class_cmake + if test -n "$(DEB_KDE_CVS_MAKE)" && test -d $(DEB_SRCDIR); then \ + cd $(DEB_SRCDIR); \ + find . -name Makefile.in -print | \ + xargs --no-run-if-empty rm -f; \ + rm -f Makefile.am acinclude.m4 aclocal.m4 config.h.in \ + configure configure.files configure.in stamp-h.in \ + subdirs; \ + fi +endif + rm -f debian/stamp-cvs-make + +endif diff --git a/ubuntu/raring/applications/kscope/debian/cdbs/kde.mk b/ubuntu/raring/applications/kscope/debian/cdbs/kde.mk new file mode 100644 index 000000000..023886fc8 --- /dev/null +++ b/ubuntu/raring/applications/kscope/debian/cdbs/kde.mk @@ -0,0 +1,99 @@ +# -*- mode: makefile; coding: utf-8 -*- +# Copyright © 2003 Christopher L Cheney +# Description: A class for KDE packages; sets KDE environment variables, etc +# +# This program 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, or (at +# your option) any later version. +# +# This program 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 program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA +# 02111-1307 USA. + +_cdbs_scripts_path ?= /usr/lib/cdbs +_cdbs_rules_path ?= /usr/share/cdbs/1/rules +_cdbs_class_path ?= /usr/share/cdbs/1/class + +ifndef _cdbs_class_kde +_cdbs_class_kde := 1 + +# for dh_icons +CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), debhelper (>= 5.0.7ubuntu4) + +include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix) + +ifdef _cdbs_tarball_dir +DEB_BUILDDIR = $(_cdbs_tarball_dir)/obj-$(DEB_BUILD_GNU_TYPE) +else +DEB_BUILDDIR = obj-$(DEB_BUILD_GNU_TYPE) +endif + +ifndef _cdbs_class_cmake +include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix) +endif + +export kde_cgidir = \$${libdir}/cgi-bin +export kde_confdir = \$${sysconfdir}/trinity +export kde_htmldir = \$${datadir}/doc/tde/HTML + +ifeq (,$(filter noopt,$(DEB_BUILD_OPTIONS))) + cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,) +endif + +ifneq (,$(filter nostrip,$(DEB_BUILD_OPTIONS))) + cdbs_kde_enable_final = + cdbs_kde_enable_debug = --enable-debug=yes +else + cdbs_kde_enable_debug = --disable-debug +endif + +ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS))) + cdbs_kde_enable_debug = --enable-debug=full +endif + +cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) + +DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include" +DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el + +$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: + if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi + +cleanbuilddir:: + -$(if $(call cdbs_streq,$(DEB_BUILDDIR),$(DEB_SRCDIR)),,rm -rf $(DEB_BUILDDIR)) + +common-build-arch common-build-indep:: debian/stamp-kde-apidox +debian/stamp-kde-apidox: + $(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox) + touch $@ + +common-install-prehook-impl:: + mkdir -p po + -XGETTEXT=/usr/bin/kde-xgettext EXTRACTATTR=/opt/trinity/bin/extractattr sh $(DEB_SRCDIR)/admin/cvs.sh extract-messages + -for file in po/*pot; do \ + sed "s/charset=CHARSET/charset=UTF-8/" -i $$file; \ + done + +common-install-arch common-install-indep:: common-install-kde-apidox +common-install-kde-apidox:: + $(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) install-apidox DESTDIR=$(DEB_DESTDIR)) + +clean:: + rm -f debian/stamp-kde-apidox + rm -rf po/*.pot + +# This is a convenience target for calling manually. It's not part of +# the build process. +buildprep: clean apply-patches + $(MAKE) -f admin/Makefile.common dist + debian/rules clean + +endif diff --git a/ubuntu/raring/applications/kscope/debian/cdbs/versions.pl b/ubuntu/raring/applications/kscope/debian/cdbs/versions.pl new file mode 100644 index 000000000..75c9add4b --- /dev/null +++ b/ubuntu/raring/applications/kscope/debian/cdbs/versions.pl @@ -0,0 +1,19 @@ +#!/usr/bin/env perl + +use strict; +use warnings; + +my $version = `dpkg-parsechangelog | awk '/^Version/ {print \$2}'`; +my ($version3, $version3_next); +my ($version2, $version2_next); + +($version3 = $version) =~ s/^(([^.]+\.){2}[^.+~-]+)[.+~-]?[^-]*-[^-]+$/$1/; +($version2 = $version3) =~ s/\.[^.]+$//; + +($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e; +($version2_next = $version2) =~ s/(?<=\.)(\d+)$/($1+1)/e; + +print "KDE-Version3=$version3\n"; +print "KDE-Version2=$version2\n"; +print "KDE-Next-Version3=$version3_next\n"; +print "KDE-Next-Version2=$version2_next\n"; diff --git a/ubuntu/raring/applications/kscope/debian/changelog b/ubuntu/raring/applications/kscope/debian/changelog new file mode 100644 index 000000000..d3689c28f --- /dev/null +++ b/ubuntu/raring/applications/kscope/debian/changelog @@ -0,0 +1,97 @@ +kscope-trinity (1.6.2-1ubuntu1) maverick; urgency=low + + * Initial Release for TDE + + -- Slávek Banko Mon, 07 Sep 2013 23:43:53 +0200 + +kscope (1.6.2-1ubuntu1) maverick; urgency=low + + * Port to Ubuntu. + + -- Eugene San (eugenesan) Fri, 04 Feb 2011 22:02:59 +0200 + +kscope (1.6.2-1) unstable; urgency=low + + * New upstream release (bugfix release). + * Bump Standards-Version to 3.8.0 (no changes needed). + + -- Fathi Boudra Sat, 09 Aug 2008 10:20:14 +0200 + +kscope (1.6.1-1) unstable; urgency=low + + * New upstream release. + * Refresh patches. + * Bump Standards-Version to 3.7.3. + * Use Homepage, Vcs-Browser and Vcs-Svn fields. + * Switch to quilt patch system. + * Remove embedded copy of GFDL as it can be found in common-licences. + + -- Fathi Boudra Sat, 01 Mar 2008 19:33:31 +0100 + +kscope (1.6.0-1) unstable; urgency=low + + * New upstream release. + + -- Fathi Boudra Thu, 12 Jul 2007 21:22:32 +0200 + +kscope (1.5.2-1) unstable; urgency=low + + * New upstream release. (Closes: #420874) + + -- Fathi Boudra Tue, 15 May 2007 19:47:50 +0200 + +kscope (1.5.1-2) unstable; urgency=low + + * Upload to unstable + + -- Mark Purcell Sat, 3 Mar 2007 13:23:12 +0000 + +kscope (1.5.1-1) experimental; urgency=low + + * New upstream release. + + -- Fathi Boudra Thu, 15 Feb 2007 18:56:31 +0100 + +kscope (1.5.0-1) unstable; urgency=low + + * New upstream release + * Add ./debian/rules get-orig-source for http://buildserver.net + * Build-Depends: autotools-dev fixes outdated-autotools-helper-file + + -- Mark Purcell Wed, 7 Feb 2007 21:08:10 +0000 + +kscope (1.4.2-1) unstable; urgency=low + + * New upstream release + + -- Fathi Boudra Mon, 16 Oct 2006 22:03:21 +0200 + +kscope (1.4.1-2) unstable; urgency=low + + * Add patch to load default config + + -- Fathi Boudra Fri, 8 Sep 2006 18:13:30 +0200 + +kscope (1.4.1-1) unstable; urgency=low + + * New upstream release + * Remove 11_crashfix.diff, merged upstream + + -- Fathi Boudra Thu, 24 Aug 2006 12:24:23 +0200 + +kscope (1.4.0-1) unstable; urgency=low + + * New upstream release + * Merge kubuntu patches, thanks to Tom Albers + * Add kscope manpage from kubuntu package, + thanks to Jonathan Patrick Davies + * Update copyright file: add kscope manpage license + + -- Fathi Boudra Thu, 10 Aug 2006 14:42:31 +0200 + +kscope (1.3.4-1) unstable; urgency=low + + * Initial release (Closes: #309669) + + -- Fathi Boudra Fri, 28 Apr 2006 08:05:15 +0100 + diff --git a/ubuntu/raring/applications/kscope/debian/compat b/ubuntu/raring/applications/kscope/debian/compat new file mode 100644 index 000000000..7ed6ff82d --- /dev/null +++ b/ubuntu/raring/applications/kscope/debian/compat @@ -0,0 +1 @@ +5 diff --git a/ubuntu/raring/applications/kscope/debian/control b/ubuntu/raring/applications/kscope/debian/control new file mode 100644 index 000000000..f48fa899a --- /dev/null +++ b/ubuntu/raring/applications/kscope/debian/control @@ -0,0 +1,45 @@ +Source: kscope-trinity +Section: tde +Priority: optional +Maintainer: Timothy Pearson +XSBC-Original-Maintainer: Debian KDE Extras Team +Uploaders: Fathi Boudra , Mark Purcell +Build-Depends: cdbs, debhelper (>= 5), quilt, automake, libtool, bison, flex, + tdebase-trinity-dev, docbook2x, docbook-xml +Standards-Version: 3.8.0 +Homepage: http://kscope.sourceforge.net +Vcs-Browser: http://svn.debian.org/wsvn/pkg-kde/kde-extras/kscope/?op=log +Vcs-Svn: svn://svn.debian.org/pkg-kde/kde-extras/kscope/trunk + +Package: kscope-trinity +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends}, cscope, exuberant-ctags, graphviz +Description: source editing environment for TDE + KScope is a TDE front-end to Cscope. It provides a source-editing environment + for large C projects. KScope is focused on source editing and analysis. + . + KScope is built around an efficient mechanism for code-navigation, which + allows the user to run queries on the code. + . + The types of queries KScope can run include: + * Get all references to a symbol + * Find the definition of a symbol + * Find all functions called by or calling to a function + * Find an EGrep pattern + * Find all files #including some file + . + These queries are handled by an underlying Cscope process. KScope simply + serves as a front-end to this process, feeding it with queries, and parsing + its output into result lists. The items in those lists can later be selected + to open an editor at the matching line. + . + Main Features: + * Multiple editor windows (using your favourite TDE editor) + * Project management + * Front-end to most Cscope queries + * Tag list for every open editor + * Call-tree window + * Session management, including saving and restoring queries + * Works with externally-built cscope.out files + . + Homepage: http://kscope.sourceforge.net diff --git a/ubuntu/raring/applications/kscope/debian/copyright b/ubuntu/raring/applications/kscope/debian/copyright new file mode 100644 index 000000000..6149f4244 --- /dev/null +++ b/ubuntu/raring/applications/kscope/debian/copyright @@ -0,0 +1,62 @@ +This package was debianized by Fathi Boudra on +Tue, 11 Apr 2006 11:44:04 +0200. + +It was downloaded from http://kscope.sourceforge.net + +Copyright Holder: Elad Lahav + +The kscope manpage is © 2006 Jonathan Patrick Davies +and is licensed under the GPL, see below. + +manpage 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-2'. + +kscope license: + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions +are met: + +1. Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. +2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + +THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR +IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES +OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. +IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, +INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT +NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF +THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +On Debian systems, the complete text of the BSD License can be +found in `/usr/share/common-licenses/BSD'. + +The documentations provided with kscope is distributed under +the GNU Free Documentation License (FDL). They are considered free with +regards to the Debian Free Software Guidelines (DFSG) because they don't +contain any unmodifiable parts (invariant sections). + +On Debian systems, the complete text of the GNU Free Documentation +License can be found in `/usr/share/common-licenses/GFDL'. diff --git a/ubuntu/raring/applications/kscope/debian/docs b/ubuntu/raring/applications/kscope/debian/docs new file mode 100644 index 000000000..1333ed77b --- /dev/null +++ b/ubuntu/raring/applications/kscope/debian/docs @@ -0,0 +1 @@ +TODO diff --git a/ubuntu/raring/applications/kscope/debian/kscope.xml b/ubuntu/raring/applications/kscope/debian/kscope.xml new file mode 100644 index 000000000..a70b1be45 --- /dev/null +++ b/ubuntu/raring/applications/kscope/debian/kscope.xml @@ -0,0 +1,124 @@ + + + + + + Jonathan Patrick + Davies + jpatrick@ubuntu.com + + + 2006 + Jonathan Patrick Davies + + + + 2006-02-18 + + + + kscope + 1 + + + kscope + a source browsing and editing environment + + + + kscope + + + + + + + + + + DESCRIPTION + + KScope is a source browsing and editing environment for large projects written + in C (such as the Linux kernel). + + + KScope uses the Cscope code analysis engine to provide valuable information to + coders. + + + KScope also provides call-tree and call-graph views that can help developers + by visualising the relationships between different functions in the code base. + + + + OPTIONS + + All TDE and Qt + programs accept a some common command-line options. KScope has no + application-specific options. + + + + Generic options: + + + Show help about options + + + + Show Qt specific options + + + + Show TDE specific options + + + + Show all options + + + + Show author information + + + , + Show version information + + + + Show license information + + + + Indicates end of options + + + + + + + AUTHOR + + KScope was written by Elad Lahav elad_lahav@users.sf.net. + + + + COPYRIGHT + + This manual page was written by Jonathan Patrick Davies + jpatrick@ubuntu.com for the + Ubuntu system (but may be used by others). + Permission is granted to copy, distribute and/or modify this document + under the terms of the GNU General Public License, + Version 2 or any later version published by the Free Software Foundation. + + + On Debian systems, the complete text of the GNU General Public + License can be found in + /usr/share/common-licenses/GPL. + + + diff --git a/ubuntu/raring/applications/kscope/debian/manpages b/ubuntu/raring/applications/kscope/debian/manpages new file mode 100644 index 000000000..03ff43b50 --- /dev/null +++ b/ubuntu/raring/applications/kscope/debian/manpages @@ -0,0 +1 @@ +kscope.1 diff --git a/ubuntu/raring/applications/kscope/debian/patches/04_am_maintainer_mode.diff b/ubuntu/raring/applications/kscope/debian/patches/04_am_maintainer_mode.diff new file mode 100644 index 000000000..391a80285 --- /dev/null +++ b/ubuntu/raring/applications/kscope/debian/patches/04_am_maintainer_mode.diff @@ -0,0 +1,11 @@ +--- a/admin/configure.in.min ++++ b/admin/configure.in.min +@@ -38,6 +38,8 @@ + dnl Automake doc recommends to do this only here. (Janos) + AM_INIT_AUTOMAKE(@MODULENAME@, @VERSION@) dnl searches for some needed programs + ++AM_MAINTAINER_MODE ++ + KDE_SET_PREFIX + + dnl generate the config header diff --git a/ubuntu/raring/applications/kscope/debian/patches/06_disable_no_undefined.diff b/ubuntu/raring/applications/kscope/debian/patches/06_disable_no_undefined.diff new file mode 100644 index 000000000..05c932c3c --- /dev/null +++ b/ubuntu/raring/applications/kscope/debian/patches/06_disable_no_undefined.diff @@ -0,0 +1,18 @@ +--- a/admin/acinclude.m4.in ++++ b/admin/acinclude.m4.in +@@ -1689,15 +1689,6 @@ + KDE_USE_CLOSURE_TRUE="#" + KDE_USE_CLOSURE_FALSE="" + KDE_NO_UNDEFINED="" +- case $host in +- *-*-linux-gnu) +- KDE_CHECK_COMPILER_FLAG([Wl,--no-undefined], +- [KDE_CHECK_COMPILER_FLAG([Wl,--allow-shlib-undefined], +- [KDE_NO_UNDEFINED="-Wl,--no-undefined -Wl,--allow-shlib-undefined"], +- [KDE_NO_UNDEFINED=""])], +- [KDE_NO_UNDEFINED=""]) +- ;; +- esac + fi + AC_SUBST(KDE_USE_CLOSURE_TRUE) + AC_SUBST(KDE_USE_CLOSURE_FALSE) diff --git a/ubuntu/raring/applications/kscope/debian/patches/series b/ubuntu/raring/applications/kscope/debian/patches/series new file mode 100644 index 000000000..b8743ddd9 --- /dev/null +++ b/ubuntu/raring/applications/kscope/debian/patches/series @@ -0,0 +1,2 @@ +04_am_maintainer_mode.diff +06_disable_no_undefined.diff diff --git a/ubuntu/raring/applications/kscope/debian/rules b/ubuntu/raring/applications/kscope/debian/rules new file mode 100755 index 000000000..65883a481 --- /dev/null +++ b/ubuntu/raring/applications/kscope/debian/rules @@ -0,0 +1,40 @@ +#!/usr/bin/make -f + +include /usr/share/cdbs/1/rules/debhelper.mk +include debian/cdbs/kde.mk +include /usr/share/cdbs/1/rules/patchsys-quilt.mk +include /usr/share/cdbs/1/rules/utils.mk + +DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include +DEB_CONFIGURE_MANDIR := /opt/trinity/share/man +DEB_CONFIGURE_PREFIX := /opt/trinity +DEB_CONFIGURE_INFODIR := /opt/trinity/share/info + +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + +post-patches:: debian/stamp-bootstrap + +debian/stamp-bootstrap: + dh_testdir + + # Regenerate build system + ! [ -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 + + autoreconf --install && automake -f && \ + $(MAKE) -f admin/Makefile.common && \ + touch debian/stamp-bootstrap + +build/kscope-trinity:: + /usr/bin/docbook2x-man debian/kscope.xml + +binary-install/kscope-trinity:: + mv debian/$(cdbs_curpkg)/usr/share/man debian/$(cdbs_curpkg)/opt/trinity/share/ + +clean:: + rm -f kscope.1 + rm -f debian/stamp-bootstrap diff --git a/ubuntu/raring/applications/kscope/debian/source/format b/ubuntu/raring/applications/kscope/debian/source/format new file mode 100644 index 000000000..89ae9db8f --- /dev/null +++ b/ubuntu/raring/applications/kscope/debian/source/format @@ -0,0 +1 @@ +3.0 (native) diff --git a/ubuntu/raring/applications/kscope/debian/source/options b/ubuntu/raring/applications/kscope/debian/source/options new file mode 100644 index 000000000..72f1f5450 --- /dev/null +++ b/ubuntu/raring/applications/kscope/debian/source/options @@ -0,0 +1,6 @@ +# Use xz instead of gzip +compression = "xz" +compression-level = 9 + +# Don't run differences +diff-ignore = .* diff --git a/ubuntu/raring/applications/kscope/debian/watch b/ubuntu/raring/applications/kscope/debian/watch new file mode 100644 index 000000000..6825f61dd --- /dev/null +++ b/ubuntu/raring/applications/kscope/debian/watch @@ -0,0 +1,2 @@ +version=3 +http://sf.net/kscope/kscope-(.*)\.tar\.gz debian svn-upgrade diff --git a/ubuntu/raring/applications/kvpnc/debian/patches/13_add_kuser_issuperuser.diff b/ubuntu/raring/applications/kvpnc/debian/patches/13_add_kuser_issuperuser.diff index 826d4e236..0729793b7 100644 --- a/ubuntu/raring/applications/kvpnc/debian/patches/13_add_kuser_issuperuser.diff +++ b/ubuntu/raring/applications/kvpnc/debian/patches/13_add_kuser_issuperuser.diff @@ -14,16 +14,16 @@ index 7c45fcf..b933832 100644 } else { --// if (getenv("USER") != "root") +-// if (getenv("USER") != TQString("root")) -// { -// KMessageBox::error( 0, I18N_NOOP( "Kvpnc must be started as root!" ) ); -// exit(0); -// } -+ if (getenv("USER") != "root") -+ { -+ KMessageBox::error( 0, I18N_NOOP( "Kvpnc must be started as root!" ) ); -+ exit(0); -+ } ++ if (getenv("USER") != TQString("root")) ++ { ++ KMessageBox::error( 0, I18N_NOOP( "Kvpnc must be started as root!" ) ); ++ exit(0); ++ } TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); diff --git a/ubuntu/raring/applications/kvpnc/debian/patches/series b/ubuntu/raring/applications/kvpnc/debian/patches/series index 09040ada9..d29c3ca91 100644 --- a/ubuntu/raring/applications/kvpnc/debian/patches/series +++ b/ubuntu/raring/applications/kvpnc/debian/patches/series @@ -1,2 +1,2 @@ -10_su-to-root_usage.diff +# 10_su-to-root_usage.diff 13_add_kuser_issuperuser.diff diff --git a/ubuntu/raring/applications/tdepowersave/debian/cdbs/debian-qt-kde.mk b/ubuntu/raring/applications/tdepowersave/debian/cdbs/debian-qt-kde.mk index c807eed8c..33a932634 100644 --- a/ubuntu/raring/applications/tdepowersave/debian/cdbs/debian-qt-kde.mk +++ b/ubuntu/raring/applications/tdepowersave/debian/cdbs/debian-qt-kde.mk @@ -10,9 +10,11 @@ _cdbs_class_debian-qt-kde := 1 # Note: This _must_ be included before autotools.mk, or it won't work. common-configure-arch common-configure-indep:: debian/stamp-cvs-make debian/stamp-cvs-make: +ifndef _cdbs_class_cmake cp -Rp /usr/share/aclocal/libtool.m4 admin/libtool.m4.in cp -Rp /usr/share/libtool/config/ltmain.sh admin/ltmain.sh $(MAKE) -C $(DEB_SRCDIR) -f admin/Makefile.common dist; +endif touch debian/stamp-cvs-make include debian/cdbs/kde.mk$(_cdbs_makefile_suffix) @@ -98,6 +100,7 @@ binary-install/$(DEB_SOURCE_PACKAGE)-doc-html:: done clean:: +ifndef _cdbs_class_cmake if test -n "$(DEB_KDE_CVS_MAKE)" && test -d $(DEB_SRCDIR); then \ cd $(DEB_SRCDIR); \ find . -name Makefile.in -print | \ @@ -106,6 +109,7 @@ clean:: configure configure.files configure.in stamp-h.in \ subdirs; \ fi +endif rm -f debian/stamp-cvs-make endif diff --git a/ubuntu/raring/applications/tdepowersave/debian/cdbs/kde.mk b/ubuntu/raring/applications/tdepowersave/debian/cdbs/kde.mk index 765560c89..023886fc8 100644 --- a/ubuntu/raring/applications/tdepowersave/debian/cdbs/kde.mk +++ b/ubuntu/raring/applications/tdepowersave/debian/cdbs/kde.mk @@ -35,7 +35,9 @@ else DEB_BUILDDIR = obj-$(DEB_BUILD_GNU_TYPE) endif +ifndef _cdbs_class_cmake include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix) +endif export kde_cgidir = \$${libdir}/cgi-bin export kde_confdir = \$${sysconfdir}/trinity @@ -59,7 +61,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/ubuntu/raring/applications/tdepowersave/debian/control b/ubuntu/raring/applications/tdepowersave/debian/control index ca4a5def2..7882039dd 100644 --- a/ubuntu/raring/applications/tdepowersave/debian/control +++ b/ubuntu/raring/applications/tdepowersave/debian/control @@ -3,7 +3,7 @@ Section: tde Priority: optional Maintainer: Timothy Pearson XSBC-Original-Maintainer: Michael Biebl -Build-Depends: cdbs, debhelper (>= 5.0.0), quilt, tdelibs14-trinity-dev, libxss-dev, libxtst-dev, libdbus-1-dev (>= 0.6), libdbus-tqt-1-dev, automake, autoconf, libtool, libltdl-dev +Build-Depends: cdbs, debhelper (>= 5.0.0), quilt, tdelibs14-trinity-dev, libxss-dev, libxtst-dev, libdbus-1-dev (>= 0.6), libdbus-tqt-1-dev, cmake, automake, autoconf, libtool, libltdl-dev Build-Conflicts: autoconf2.13 Standards-Version: 3.8.4 Homepage: http://sourceforge.net/projects/powersave/ diff --git a/ubuntu/raring/applications/tdepowersave/debian/rules b/ubuntu/raring/applications/tdepowersave/debian/rules index f74a76605..a891b0150 100755 --- a/ubuntu/raring/applications/tdepowersave/debian/rules +++ b/ubuntu/raring/applications/tdepowersave/debian/rules @@ -1,5 +1,6 @@ #!/usr/bin/make -f +include /usr/share/cdbs/1/class/cmake.mk include debian/cdbs/kde.mk include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/rules/patchsys-quilt.mk @@ -17,9 +18,20 @@ DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinit DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ && echo xz || echo bzip2) +DEB_CMAKE_EXTRA_FLAGS := \ + -DCMAKE_INSTALL_PREFIX="/opt/trinity" \ + -DCONFIG_INSTALL_DIR="/etc/trinity" \ + -DSYSCONF_INSTALL_DIR="/etc/trinity" \ + -DXDG_MENU_INSTALL_DIR="/etc/xdg/menus" \ + -DCMAKE_BUILD_TYPE=RelWithDebInfo \ + -DCMAKE_VERBOSE_MAKEFILE="ON" \ + -DCMAKE_SKIP_RPATH="OFF" \ + -DBUILD_ALL="ON" + post-patches:: debian/stamp-bootstrap debian/stamp-bootstrap: +ifndef _cdbs_class_cmake ! [ -f /usr/share/libtool/ltmain.sh ] || \ cp -f /usr/share/libtool/ltmain.sh admin/ltmain.sh ! [ -f /usr/share/libtool/config/ltmain.sh ] || \ @@ -27,6 +39,7 @@ debian/stamp-bootstrap: cp -f /usr/share/aclocal/libtool.m4 admin/libtool.m4.in make -f admin/Makefile.common cvs +endif touch debian/stamp-bootstrap install/tdepowersave-trinity:: diff --git a/ubuntu/raring/tdelibs/debian/control b/ubuntu/raring/tdelibs/debian/control index 305e3ca68..11250f1d4 100644 --- a/ubuntu/raring/tdelibs/debian/control +++ b/ubuntu/raring/tdelibs/debian/control @@ -62,7 +62,7 @@ Replaces: kdelibs4c2a-kde3 (<< 4:14.0.0~), kdelibs4c2a-trinity (<< 4:14.0.0~), t Breaks: kdelibs4c2a-kde3 (<< 4:14.0.0~), kdelibs4c2a-trinity (<< 4:14.0.0~), tdelibs4c2a-trinity Depends: ${shlibs:Depends}, tdelibs-data-trinity, tdelibs-data-trinity, libart-2.0-2 (>= 4:14.0.0~), perl, xbase-clients, sudo -Recommends: xdg-user-dirs +Recommends: xdg-user-dirs, consolekit Suggests: fam, perl-suid Description: core libraries and binaries for all TDE applications This package contains all the shared libraries and common core binaries