[Pkg-kde-commits] rev 2173 - in kde-extras: kfocus/branches
kmymoney2/branches kmymoney2/trunk kmymoney2/trunk/debian
taskjuggler taskjuggler/trunk taskjuggler/trunk/debian
Mark Purcell
msp at costa.debian.org
Thu Nov 10 19:06:01 UTC 2005
Author: msp
Date: 2005-11-10 19:05:59 +0000 (Thu, 10 Nov 2005)
New Revision: 2173
Added:
kde-extras/taskjuggler/build-area
kde-extras/taskjuggler/tarballs
Removed:
kde-extras/kfocus/branches/upstream/
kde-extras/kmymoney2/branches/upstream/
kde-extras/kmymoney2/trunk/Makefile.in
kde-extras/kmymoney2/trunk/aclocal.m4
kde-extras/kmymoney2/trunk/config.h.in
kde-extras/kmymoney2/trunk/configure
kde-extras/kmymoney2/trunk/configure.files
kde-extras/kmymoney2/trunk/configure.in
kde-extras/kmymoney2/trunk/configure.in.in
kde-extras/kmymoney2/trunk/developer-doc/
kde-extras/kmymoney2/trunk/doc/
kde-extras/kmymoney2/trunk/kmymoney2/
kde-extras/kmymoney2/trunk/libkgpgfile/
kde-extras/kmymoney2/trunk/po/
kde-extras/taskjuggler/trunk/Examples/
kde-extras/taskjuggler/trunk/admin/
kde-extras/taskjuggler/trunk/docs/
kde-extras/taskjuggler/trunk/tjx2gantt/
Modified:
kde-extras/kmymoney2/trunk/debian/changelog
kde-extras/kmymoney2/trunk/debian/control
kde-extras/kmymoney2/trunk/debian/rules
kde-extras/taskjuggler/trunk/debian/changelog
kde-extras/taskjuggler/trunk/debian/control
kde-extras/taskjuggler/trunk/debian/copyright
kde-extras/taskjuggler/trunk/debian/rules
Log:
Switch to cdbs
Deleted: kde-extras/kmymoney2/trunk/Makefile.in
Deleted: kde-extras/kmymoney2/trunk/aclocal.m4
Deleted: kde-extras/kmymoney2/trunk/config.h.in
Deleted: kde-extras/kmymoney2/trunk/configure
Deleted: kde-extras/kmymoney2/trunk/configure.files
Deleted: kde-extras/kmymoney2/trunk/configure.in
Deleted: kde-extras/kmymoney2/trunk/configure.in.in
Modified: kde-extras/kmymoney2/trunk/debian/changelog
===================================================================
--- kde-extras/kmymoney2/trunk/debian/changelog 2005-11-10 18:54:09 UTC (rev 2172)
+++ kde-extras/kmymoney2/trunk/debian/changelog 2005-11-10 19:05:59 UTC (rev 2173)
@@ -1,10 +1,32 @@
-kmymoney2 (0.8-7) UNRELEASED; urgency=low
+kmymoney2 (0.8.1-3) unstable; urgency=low
- * NOT RELEASED YET
- * Add debian/watch
+ * Switch to cdbs
- -- Mark Purcell <msp at debian.org> Sun, 2 Oct 2005 15:44:50 +0100
+ -- Mark Purcell <msp at debian.org> Thu, 10 Nov 2005 10:38:11 +0000
+kmymoney2 (0.8.1-2) unstable; urgency=low
+
+ * configure --enable-kbanking
+ * Build-Depends: libaqbanking0-dev >= 1.5.99)
+
+ -- Mark Purcell <msp at debian.org> Mon, 7 Nov 2005 07:54:17 +0000
+
+kmymoney2 (0.8.1-1) unstable; urgency=low
+
+ * New upstream release
+ * Disable --kbanking for this upload
+
+ -- Mark Purcell <msp at debian.org> Sun, 6 Nov 2005 23:01:59 +0000
+
+kmymoney2 (0.8-7) unstable; urgency=low
+
+ * Add Build-Depends: libkbanking-dev
+ * debian/rules --enable-kbanking
+ - Please enable HBCI support in kmymoney2 (Closes: #331564)
+ * Add debian/watch
+
+ -- Mark Purcell <msp at debian.org> Sun, 9 Oct 2005 17:11:17 +0100
+
kmymoney2 (0.8-6) unstable; urgency=low
* Rebuild for libofx
Modified: kde-extras/kmymoney2/trunk/debian/control
===================================================================
--- kde-extras/kmymoney2/trunk/debian/control 2005-11-10 18:54:09 UTC (rev 2172)
+++ kde-extras/kmymoney2/trunk/debian/control 2005-11-10 19:05:59 UTC (rev 2173)
@@ -2,7 +2,7 @@
Section: utils
Priority: optional
Maintainer: Mark Purcell <msp at debian.org>
-Build-Depends: debhelper (>> 4.0.0), gawk, gettext, kdelibs4-dev (>= 4:3.4.2-1), libxml2-dev (>= 2.0), libxml++-dev, libqt3-compat-headers, automake1.9 | automake, html2ps, gs-common, libofx-dev
+Build-Depends: debhelper (>> 4.0.0), gawk, gettext, kdelibs4-dev (>= 4:3.4.2-1), libxml2-dev (>= 2.0), libxml++-dev, libqt3-compat-headers, automake1.9 | automake, html2ps, gs-common, libofx-dev, libaqbanking0-dev (>= 1.5.99)
Standards-Version: 3.5.8.0
Package: kmymoney2
Modified: kde-extras/kmymoney2/trunk/debian/rules
===================================================================
--- kde-extras/kmymoney2/trunk/debian/rules 2005-11-10 18:54:09 UTC (rev 2172)
+++ kde-extras/kmymoney2/trunk/debian/rules 2005-11-10 19:05:59 UTC (rev 2173)
@@ -1,118 +1,16 @@
#!/usr/bin/make -f
-# Sample debian/rules that uses debhelper.
-# GNU copyright 1997 to 1999 by Joey Hess.
+# Sample debian/rules that uses cdbs. Originaly written by Robert Millan.
+# This file is public domain.
+
+# Add here any variable or target overrides you need
+export kde_cgidir = /usr/lib/cgi-bin
+export kde_confdir = /etc/kde3
+export kde_htmldir = /usr/share/doc/kde/HTML
+
+include /usr/share/cdbs/1/class/autotools.mk
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/rules/simple-patchsys.mk
+#include /usr/share/cdbs/1/class/kde.mk
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
-
-# This is the debhelper compatibility version to use.
-export DH_COMPAT=4
-
-
-export kde_htmldir="\$${prefix}/share/doc/kde/HTML"
-
-INSTALL_DIR=install -p -d -o root -g root -m 755
-INSTALL_FILE=install -p -o root -g root -m 644
-
-lintian_overrides=$(CURDIR)/debian/kmymoney2/usr/share/lintian/overrides
-
-# These are used for cross-compiling and for saving the configure script
-# from having to guess our platform (since we know it already)
-DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-
-ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
- CFLAGS += -g
-endif
-ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
- INSTALL_PROGRAM += -s
-endif
-
-#export kde_htmldir=/usr/share/doc/kde/HTML
-
-configure: configure-stamp
-configure-stamp:
- dh_testdir
-
- ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \
- --with-qt-includes=/usr/include/qt3 --with-qt-libraries=/usr/lib/qt3 \
- --prefix=/usr \
- --mandir=\$${prefix}/share/man \
- --infodir=\$${prefix}/share/info \
-# --enable-kbanking \
- --enable-ofxbanking \
- --enable-ofxplugin \
- --enable-pdf-docs \
- --disable-rpath
-
- # Without the following line, it won't build cleanly.
- $(MAKE) clean
-
- touch configure-stamp
-
-build: build-stamp
-
-build-stamp: configure-stamp
- dh_testdir
-
- $(MAKE)
-
- touch build-stamp
-
-clean: debian-clean
- dh_testdir
- dh_testroot
- rm -f build-stamp configure-stamp
-
- test -f Makefile && $(MAKE) distclean || true
- #rm -fR po/*.gmo
- # Cleanup what make clean doesn't
- rm -fR kmymoney config.log
-
-
-debian-clean:
- dh_testdir
- dh_testroot
- dh_clean
- -rm -fr debian/install-tmp debian/files
-
-install: build
- dh_testdir
- dh_testroot
- dh_clean -k
- dh_installdirs
-
- # Install debian lintian override
- $(INSTALL_DIR) $(lintian_overrides)
- $(INSTALL_FILE) debian/override $(lintian_overrides)/kmymoney2
-
- # Install pixmap
- $(INSTALL_DIR) $(CURDIR)/debian/kmymoney2/usr/share/pixmaps
- $(INSTALL_FILE) debian/kmymoney2.xpm $(CURDIR)/debian/kmymoney2/usr/share/pixmaps
- $(MAKE) install DESTDIR=$(CURDIR)/debian/kmymoney2
- rm -f $(CURDIR)/debian/kmymoney2/usr/bin/kmymoney
-
-binary-indep: build install
-
-binary-arch: build install
- dh_testdir
- dh_testroot
- dh_installdocs
- #dh_installexamples
- dh_installmenu
- dh_installman
- #dh_installinfo
- dh_installchangelogs ChangeLog
- dh_link
- dh_strip
- dh_compress -X.docbook -X.css -X-license -X.dcl -X.bz2
- dh_fixperms
- dh_makeshlibs
- dh_installdeb
- dh_shlibdeps
- dh_gencontrol
- dh_md5sums
- dh_builddeb
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install configure
+DEB_CONFIGURE_EXTRA_FLAGS := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama \
+ --enable-kbanking --enable-ofxbanking --enable-ofxplugin
Added: kde-extras/taskjuggler/build-area
===================================================================
--- kde-extras/taskjuggler/build-area 2005-11-10 18:54:09 UTC (rev 2172)
+++ kde-extras/taskjuggler/build-area 2005-11-10 19:05:59 UTC (rev 2173)
@@ -0,0 +1 @@
+link ../build-area/
\ No newline at end of file
Property changes on: kde-extras/taskjuggler/build-area
___________________________________________________________________
Name: svn:special
+ *
Added: kde-extras/taskjuggler/tarballs
===================================================================
--- kde-extras/taskjuggler/tarballs 2005-11-10 18:54:09 UTC (rev 2172)
+++ kde-extras/taskjuggler/tarballs 2005-11-10 19:05:59 UTC (rev 2173)
@@ -0,0 +1 @@
+link ../tarballs/
\ No newline at end of file
Property changes on: kde-extras/taskjuggler/tarballs
___________________________________________________________________
Name: svn:special
+ *
Modified: kde-extras/taskjuggler/trunk/debian/changelog
===================================================================
--- kde-extras/taskjuggler/trunk/debian/changelog 2005-11-10 18:54:09 UTC (rev 2172)
+++ kde-extras/taskjuggler/trunk/debian/changelog 2005-11-10 19:05:59 UTC (rev 2173)
@@ -1,3 +1,17 @@
+taskjuggler (2.2+beta1-2) unstable; urgency=low
+
+ * Switch to cdbs
+ * Remove -perl Depends: as txjgannt no longer supported upstream
+
+ -- Mark Purcell <msp at debian.org> Thu, 10 Nov 2005 17:14:49 +0000
+
+taskjuggler (2.2+beta1-1) unstable; urgency=low
+
+ * New upstream release
+ * Fix old-fsf-address-in-copyright-file
+
+ -- Mark Purcell <msp at debian.org> Sun, 6 Nov 2005 11:02:56 +0000
+
taskjuggler (2.1.1-5) unstable; urgency=low
* C++ migration package
Modified: kde-extras/taskjuggler/trunk/debian/control
===================================================================
--- kde-extras/taskjuggler/trunk/debian/control 2005-11-10 18:54:09 UTC (rev 2172)
+++ kde-extras/taskjuggler/trunk/debian/control 2005-11-10 19:05:59 UTC (rev 2173)
@@ -2,12 +2,12 @@
Section: kde
Priority: optional
Maintainer: Mark Purcell <msp at debian.org>
-Build-Depends: debhelper (>= 4.0.0), autotools-dev, kdelibs4-dev, libkcal2-dev, libdate-calc-perl, libpostscript-simple-perl, poster, docbook-utils, openjade, libxml-parser-perl, libclass-methodmaker-perl, xsltproc, docbook-xml, g++-3.4
+Build-Depends: debhelper (>= 4.0.0), autotools-dev, kdelibs4-dev, libkcal2-dev, poster, docbook-utils, openjade, xsltproc, docbook-xml, g++-3.4
Standards-Version: 3.6.1
Package: taskjuggler
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, libdate-calc-perl, libpostscript-simple-perl, poster, libxml-parser-perl, libclass-methodmaker-perl
+Depends: ${shlibs:Depends}, ${misc:Depends}, poster
Description: Project management application
TaskJuggler is a project management tool for Linux and UNIX based
operating systems. Whether you want to plan your college's shifts for
Modified: kde-extras/taskjuggler/trunk/debian/copyright
===================================================================
--- kde-extras/taskjuggler/trunk/debian/copyright 2005-11-10 18:54:09 UTC (rev 2172)
+++ kde-extras/taskjuggler/trunk/debian/copyright 2005-11-10 19:05:59 UTC (rev 2173)
@@ -10,6 +10,11 @@
Remo Behn <ray at suse.de>
Philippe Midol-Monnet <philippe at midol-monnet.org>
+As a special exception, you have permission to link this program with
+the Qt3 library and distribute executables, as long as you follow the
+requirements of the GNU GPL version 2 in regard to all of the software
+in the executable aside from Qt3.
+
License:
This package is free software; you can redistribute it and/or modify
@@ -24,8 +29,8 @@
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., 59 Temple Place - Suite 330, Boston, MA
- 02111-1307, USA.
+ 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'.
Modified: kde-extras/taskjuggler/trunk/debian/rules
===================================================================
--- kde-extras/taskjuggler/trunk/debian/rules 2005-11-10 18:54:09 UTC (rev 2172)
+++ kde-extras/taskjuggler/trunk/debian/rules 2005-11-10 19:05:59 UTC (rev 2173)
@@ -1,116 +1,15 @@
#!/usr/bin/make -f
-# -*- makefile -*-
-# Sample debian/rules that uses debhelper.
-# This file was originally written by Joey Hess and Craig Small.
-# As a special exception, when this file is copied by dh-make into a
-# dh-make output file, you may use that output file without restriction.
-# This special exception was added by Craig Small in version 0.37 of dh-make.
+# Sample debian/rules that uses cdbs. Originaly written by Robert Millan.
+# This file is public domain.
+
+# Add here any variable or target overrides you need
+export kde_cgidir = /usr/lib/cgi-bin
+export kde_confdir = /etc/kde3
+export kde_htmldir = /usr/share/doc/kde/HTML
+
+include /usr/share/cdbs/1/class/autotools.mk
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/rules/simple-patchsys.mk
+#include /usr/share/cdbs/1/class/kde.mk
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
-
-export kde_htmldir="\$${prefix}/share/doc/kde/HTML"
-export docprefix="\\$${prefix}/share/doc/taskjuggler"
-
-# These are used for cross-compiling and for saving the configure script
-# from having to guess our platform (since we know it already)
-DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-
-
-CFLAGS = -Wall -g
-
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
- CFLAGS += -O0
-else
- CFLAGS += -O2
-endif
-
-export CC=gcc-3.4
-export CPP=cpp-3.4
-export CXX=g++-3.4
-
-config.status: configure
- dh_testdir
- # Add here commands to configure the package.
- CFLAGS="$(CFLAGS)" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info --disable-rpath
-
-
-build: build-stamp
-
-build-stamp: config.status
- dh_testdir
-
- # Add here commands to compile the package.
- $(MAKE)
- #docbook-to-man debian/taskjuggler.sgml > taskjuggler.1
-
- touch build-stamp
-
-clean:
- dh_testdir
- dh_testroot
- rm -f build-stamp
-
- # Add here commands to clean up after the build process.
- -$(MAKE) distclean
- # Cleanup what distclean doesn't :-(
- rm -fR TestSuite/Syntax/log TestSuite/Scheduler/log config.log
-
-ifneq "$(wildcard /usr/share/misc/config.sub)" ""
- cp -f /usr/share/misc/config.sub admin/config.sub
-endif
-ifneq "$(wildcard /usr/share/misc/config.guess)" ""
- cp -f /usr/share/misc/config.guess admin/config.guess
-endif
-
-
- dh_clean
-
-install: build
- dh_testdir
- dh_testroot
- dh_clean -k
- dh_installdirs
-
- # Add here commands to install the package into debian/taskjuggler.
- $(MAKE) install DESTDIR=$(CURDIR)/debian/taskjuggler
-
-
-# Build architecture-independent files here.
-binary-indep: build install
-# We have nothing to do by default.
-
-# Build architecture-dependent files here.
-binary-arch: build install
- dh_testdir
- dh_testroot
- dh_installchangelogs ChangeLog
- dh_installdocs
- dh_installexamples
-# dh_install
-# dh_installmenu
-# dh_installdebconf
-# dh_installlogrotate
-# dh_installemacsen
-# dh_installpam
-# dh_installmime
-# dh_installinit
-# dh_installcron
-# dh_installinfo
- dh_installman
- dh_link
- dh_strip
- dh_compress
- dh_fixperms
-# dh_perl
-# dh_python
- dh_makeshlibs
- dh_installdeb
- dh_shlibdeps -L taskjuggler -l debian/taskjuggler/usr/lib
- dh_gencontrol
- dh_md5sums
- dh_builddeb
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install
+DEB_CONFIGURE_EXTRA_FLAGS := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama
More information about the pkg-kde-commits
mailing list