rev 6581 - in kde-extras/kdebluetooth/trunk: . debian

Tue Jun 26 08:08:53 UTC 2007

Author: msp
Date: 2007-06-26 08:08:53 +0000 (Tue, 26 Jun 2007)
New Revision: 6581

Added:
   kde-extras/kdebluetooth/trunk/debian/kdebluetooth.install
   kde-extras/kdebluetooth/trunk/debian/libkdebluetooth-dev.install
   kde-extras/kdebluetooth/trunk/debian/libkdebluetooth0.install
Removed:
   kde-extras/kdebluetooth/trunk/Makefile.in
   kde-extras/kdebluetooth/trunk/aclocal.m4
   kde-extras/kdebluetooth/trunk/config.guess
   kde-extras/kdebluetooth/trunk/config.h.in
   kde-extras/kdebluetooth/trunk/config.sub
   kde-extras/kdebluetooth/trunk/configure
   kde-extras/kdebluetooth/trunk/configure.in
   kde-extras/kdebluetooth/trunk/configure.in.in
   kde-extras/kdebluetooth/trunk/debian/CVS/
   kde-extras/kdebluetooth/trunk/debian/README.Debian
   kde-extras/kdebluetooth/trunk/debian/debiandirs
   kde-extras/kdebluetooth/trunk/debian/kbluetoothd
   kde-extras/kdebluetooth/trunk/debian/passkey-agent/
   kde-extras/kdebluetooth/trunk/debian/patch
   kde-extras/kdebluetooth/trunk/debian/postinst
   kde-extras/kdebluetooth/trunk/debian/postrm
   kde-extras/kdebluetooth/trunk/debian/preinst
   kde-extras/kdebluetooth/trunk/debian/qobex.files
   kde-extras/kdebluetooth/trunk/doc/
   kde-extras/kdebluetooth/trunk/kdebluetooth/
   kde-extras/kdebluetooth/trunk/po/
   kde-extras/kdebluetooth/trunk/subdirs
Modified:
   kde-extras/kdebluetooth/trunk/debian/changelog
   kde-extras/kdebluetooth/trunk/debian/control
   kde-extras/kdebluetooth/trunk/debian/docs
   kde-extras/kdebluetooth/trunk/debian/rules
Log:
* (NOT RELEASED YET) New upstream release
  - Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org>
  - Thanks to Michael Meskes for maintence todate and welcome to the team
* Switch to cdbs
* Add Build-Depends: libdbus-qt-1-dev, libobexftp-dev, cdbs
* TODO: Cleanup debian/control descriptions
   - Check migration from beta2 packages
   - Cleanup any legacy cruft from beta2

Deleted: kde-extras/kdebluetooth/trunk/Makefile.in

Deleted: kde-extras/kdebluetooth/trunk/aclocal.m4

Deleted: kde-extras/kdebluetooth/trunk/config.guess

Deleted: kde-extras/kdebluetooth/trunk/config.h.in

Deleted: kde-extras/kdebluetooth/trunk/config.sub

Deleted: kde-extras/kdebluetooth/trunk/configure

Deleted: kde-extras/kdebluetooth/trunk/configure.in

Deleted: kde-extras/kdebluetooth/trunk/configure.in.in

Deleted: kde-extras/kdebluetooth/trunk/debian/README.Debian

Modified: kde-extras/kdebluetooth/trunk/debian/changelog
===================================================================

--- kde-extras/kdebluetooth/trunk/debian/changelog	2007-06-26 07:15:28 UTC (rev 6580)
+++ kde-extras/kdebluetooth/trunk/debian/changelog	2007-06-26 08:08:53 UTC (rev 6581)
@@ -1,11 +1,18 @@
-kdebluetooth (0.99+1.0beta2-8) UNRELEASED; urgency=low
+kdebluetooth (1.0~beta3-1) UNRELEASED; urgency=low
 
-  * NOT RELEASED YET
+  * (NOT RELEASED YET) New upstream release
   * As discussed during DebConf7 move this package to team maintence:
-     Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org>
+    - Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org>
+    - Thanks to Michael Meskes for maintence todate and welcome to the team
+  * Switch to cdbs
+  * Add Build-Depends: libdbus-qt-1-dev, libobexftp-dev, cdbs
 
- -- Mark Purcell <msp at debian.org>  Tue, 26 Jun 2007 08:07:06 +0100
+  * TODO: Cleanup debian/control descriptions
+     - Check migration from beta2 packages
+     - Cleanup any legacy cruft from beta2
 
+ -- Mark Purcell <msp at debian.org>  Tue, 26 Jun 2007 08:54:56 +0100
+
 kdebluetooth (0.99+1.0beta2-7) unstable; urgency=low
 
   * Only create link in postinst if bluetooth device was found and

Modified: kde-extras/kdebluetooth/trunk/debian/control
===================================================================
--- kde-extras/kdebluetooth/trunk/debian/control	2007-06-26 07:15:28 UTC (rev 6580)
+++ kde-extras/kdebluetooth/trunk/debian/control	2007-06-26 08:08:53 UTC (rev 6581)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org>
 Uploaders: Michael Meskes <meskes at debian.org>
-Build-Depends: debhelper (>= 4.0.0), autotools-dev, kdelibs4-dev (>= 3.1.4), libbluetooth-dev (>= 3.7-1), kdepim-dev, libopenobex1-dev (>= 1.3)
+Build-Depends: debhelper (>= 4.0.0), autotools-dev, kdelibs4-dev (>= 3.1.4), libbluetooth-dev (>= 3.7-1), kdepim-dev, libopenobex1-dev (>= 1.3), libdbus-qt-1-dev, cdbs
 Standards-Version: 3.6.1
 
 Package: kdebluetooth
@@ -16,12 +16,16 @@
  .
  Homepage: http://bluetooth.kmobiletools.org/
 
-Package: qobex
+Package: libkdebluetooth0
 Architecture: any
 Section: net
 Depends: ${shlibs:Depends}
-Provides: flexmem
-Description: Swiss army knife for the OBject EXchange (obex) protocol
- This obex testing and development framework is provided by the
- KDE Bluetooth Framework. 
+Description: shared libs for kdebluetooth
+ Contains the shared libs for KDE Bluetooth Framework. 
 
+Package: libkdebluetooth-dev
+Architecture: any
+Section: libdevel
+Depends: ${shlibs:Depends}
+Description: development files and headers kdebluetooth
+ Contains the development files for kdebluetooth

Deleted: kde-extras/kdebluetooth/trunk/debian/debiandirs

Modified: kde-extras/kdebluetooth/trunk/debian/docs
===================================================================
--- kde-extras/kdebluetooth/trunk/debian/docs	2007-06-26 07:15:28 UTC (rev 6580)
+++ kde-extras/kdebluetooth/trunk/debian/docs	2007-06-26 08:08:53 UTC (rev 6581)
@@ -1,2 +1 @@
-NEWS
 README

Deleted: kde-extras/kdebluetooth/trunk/debian/kbluetoothd

Added: kde-extras/kdebluetooth/trunk/debian/kdebluetooth.install
===================================================================
--- kde-extras/kdebluetooth/trunk/debian/kdebluetooth.install	                        (rev 0)
+++ kde-extras/kdebluetooth/trunk/debian/kdebluetooth.install	2007-06-26 08:08:53 UTC (rev 6581)
@@ -0,0 +1,2 @@
+usr/share/*
+usr/bin/*

Added: kde-extras/kdebluetooth/trunk/debian/libkdebluetooth-dev.install
===================================================================
--- kde-extras/kdebluetooth/trunk/debian/libkdebluetooth-dev.install	                        (rev 0)
+++ kde-extras/kdebluetooth/trunk/debian/libkdebluetooth-dev.install	2007-06-26 08:08:53 UTC (rev 6581)
@@ -0,0 +1,7 @@
+usr/include/*
+usr/lib/lib*.a
+usr/lib/lib*.so
+usr/lib/pkgconfig/*
+usr/lib/*.la
+usr/lib/kde3/*.la
+usr/share/pkgconfig/*

Added: kde-extras/kdebluetooth/trunk/debian/libkdebluetooth0.install
===================================================================
--- kde-extras/kdebluetooth/trunk/debian/libkdebluetooth0.install	                        (rev 0)
+++ kde-extras/kdebluetooth/trunk/debian/libkdebluetooth0.install	2007-06-26 08:08:53 UTC (rev 6581)
@@ -0,0 +1,2 @@
+usr/lib/lib*.so.*
+usr/lib/kde3/*.so

Deleted: kde-extras/kdebluetooth/trunk/debian/patch

Deleted: kde-extras/kdebluetooth/trunk/debian/postinst

Deleted: kde-extras/kdebluetooth/trunk/debian/postrm

Deleted: kde-extras/kdebluetooth/trunk/debian/preinst

Deleted: kde-extras/kdebluetooth/trunk/debian/qobex.files

Modified: kde-extras/kdebluetooth/trunk/debian/rules
===================================================================
--- kde-extras/kdebluetooth/trunk/debian/rules	2007-06-26 07:15:28 UTC (rev 6580)
+++ kde-extras/kdebluetooth/trunk/debian/rules	2007-06-26 08:08:53 UTC (rev 6581)
@@ -1,126 +1,8 @@
 #!/usr/bin/make -f
-# Sample debian/rules that uses debhelper.
-# GNU copyright 1997 to 1999 by Joey Hess.
 
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/rules/simple-patchsys.mk
+include /usr/share/cdbs/1/rules/utils.mk
+include /usr/share/cdbs/1/class/kde.mk
 
-
-# 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)
-
--include debian/debiandirs
-
-debian/debiandirs: ./admin/debianrules
-	perl -w ./admin/debianrules echodirs > debian/debiandirs
-
-ifneq (, $(findstring true,$(CVS_BUILD)))
-configkde += --enable-debug=full
-else
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-CXXFLAGS += -O0
-else
-CXXFLAGS += -O2
-endif
-ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
-INSTALL_PROGRAM += -s
-endif
-endif
-
-configure: configure-stamp
-
-configure-stamp:
-	dh_testdir
-	# Add here commands to configure the package.
-	#
-	#  	# run configure with build tree $(objdir)
-	./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) $(configkde) --without-xmms --enable-irmcsynckonnector=no
-
-	touch configure-stamp
-
-build: build-stamp
-build-stamp: configure-stamp 
-	dh_testdir
-
-	# Add here commands to compile the package.
-	$(MAKE) OPENOBEX_CFLAGS=-I/usr/include/openobex -k
-	(cd debian/passkey-agent; $(MAKE))
-	
-	# generate manpages
-	#for i in debian/*.sgml; do \
-	#       docbook-to-man $$i > `dirname $$i`/`basename $$i .sgml`.1 ;\
-	##done
-
-	touch build-stamp
-
-
-clean:
-	dh_testdir
-	dh_testroot
-	rm -f build-stamp configure-stamp
-	rm -f debian/debianrules
-
-	# Add here commands to clean up after the build process.
-	-$(MAKE) distclean
-	-find po -name "*.gmo" -exec rm {} \;
-	-rm debian/passkey-agent/passkey-agent
-ifneq "$(wildcard /usr/share/misc/config.sub)" ""
-	cp -f /usr/share/misc/config.sub config.sub
-endif
-ifneq "$(wildcard /usr/share/misc/config.guess)" ""
-	cp -f /usr/share/misc/config.guess config.guess
-endif
-
-	dh_clean 
-
-install: build
-	dh_testdir
-	dh_testroot
-	dh_clean -k 
-	dh_installdirs
-	dh_installdirs -pqobex
-
-	# Add here commands to install the package into debian/kdebluetooth.
-	$(MAKE) install DESTDIR=$(CURDIR)/debian/kdebluetooth 
-	install -m755 debian/passkey-agent/passkey-agent $(CURDIR)/debian/kdebluetooth/usr/bin
-	-mv $(CURDIR)/debian/kdebluetooth/usr/bin/kbluetoothd $(CURDIR)/debian/kdebluetooth/usr/bin/kbluetoothd.real
-	install -m755 debian/kbluetoothd $(CURDIR)/debian/kdebluetooth/usr/bin
-
-
-	-mv $(CURDIR)/debian/kdebluetooth/usr/include/kde/qobex $(CURDIR)/debian/kdebluetooth/usr/include/
-	dh_movefiles --sourcedir=debian/kdebluetooth
-	-rmdir -p  $(CURDIR)/debian/kdebluetooth/usr/include/qobex $(CURDIR)/debian/kdebluetooth/usr/sbin/
-
-# 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 ./README ./AUTHORS -XNEWS
-	dh_installexamples
-	dh_installman
-	dh_link
-ifeq (, $(findstring true,$(CVS_BUILD)))
-	dh_strip
-endif
-	dh_compress -X.docbook -X.css -X-license -X.dcl -X.bz2
-	dh_fixperms
-	dh_makeshlibs
-	dh_installdeb
-	dh_installdeb -pqobex
-	dh_shlibdeps 
-	dh_shlibdeps -pqobex
-	dh_gencontrol
-	dh_gencontrol -pqobex
-	dh_md5sums
-	dh_md5sums -pqobex
-	dh_builddeb
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install configure
+DEB_DH_INSTALL_ARGS = --sourcedir=debian/tmp

Deleted: kde-extras/kdebluetooth/trunk/subdirs


