[pkg-ggz-commits] r34 - ggz-client-libs/trunk/debian ggz-docs/trunk/debian ggz-gnome-client/trunk/debian ggz-grubby/trunk/debian ggz-gtk-client/trunk/debian ggz-gtk-games/trunk/debian ggz-kde-client/trunk/debian ggz-kde-games/trunk/debian ggz-python/trunk/debian ggz-python/upstream ggz-sdl-games/trunk/debian ggz-server/trunk/debian ggz-txt-client/trunk/debian ggz-utils/trunk/debian libggz/trunk/debian meta-ggz/trunk/debian

Peter Eisentraut petere at costa.debian.org
Sun Jul 23 18:04:32 UTC 2006


Author: petere
Date: 2006-07-23 18:03:57 +0000 (Sun, 23 Jul 2006)
New Revision: 34

Added:
   ggz-gtk-games/trunk/debian/ggz-gtk-games-data.docs
   ggz-gtk-games/trunk/debian/ggz-gtk-games-data.install
   ggz-python/upstream/ggz-python_0.0.13.orig.tar.gz
   meta-ggz/trunk/debian/compat
Removed:
   ggz-client-libs/trunk/debian/libggzmod-dev.docs
   ggz-client-libs/trunk/debian/rules.common.mk
   ggz-docs/trunk/debian/ggz-docs.install
   ggz-docs/trunk/debian/rules.common.mk
   ggz-gnome-client/trunk/debian/ggz-gnome-client.install
   ggz-gnome-client/trunk/debian/rules.common.mk
   ggz-grubby/trunk/debian/ggz-grubby.docs
   ggz-grubby/trunk/debian/ggz-grubby.install
   ggz-grubby/trunk/debian/rules.common.mk
   ggz-gtk-client/trunk/debian/rules.common.mk
   ggz-gtk-games/trunk/debian/ggz-gtk-game-data.docs
   ggz-gtk-games/trunk/debian/ggz-gtk-game-data.install
   ggz-gtk-games/trunk/debian/rules.common.mk
   ggz-kde-client/trunk/debian/ggz-kde-client.install
   ggz-kde-client/trunk/debian/rules.common.mk
   ggz-kde-games/trunk/debian/rules.common.mk
   ggz-python/trunk/debian/rules.common.mk
   ggz-sdl-games/trunk/debian/rules.common.mk
   ggz-server/trunk/debian/rules.common.mk
   ggz-txt-client/trunk/debian/ggz-txt-client.install
   ggz-txt-client/trunk/debian/rules.common.mk
   ggz-utils/trunk/debian/ggz-utils.install
   ggz-utils/trunk/debian/rules.common.mk
   libggz/trunk/debian/rules.common.mk
Modified:
   ggz-client-libs/trunk/debian/changelog
   ggz-client-libs/trunk/debian/compat
   ggz-client-libs/trunk/debian/control
   ggz-client-libs/trunk/debian/ggzcore-bin.docs
   ggz-client-libs/trunk/debian/libggzcore7.docs
   ggz-client-libs/trunk/debian/libggzmod4.docs
   ggz-client-libs/trunk/debian/rules
   ggz-docs/trunk/debian/changelog
   ggz-docs/trunk/debian/compat
   ggz-docs/trunk/debian/control
   ggz-docs/trunk/debian/ggz-docs.docs
   ggz-docs/trunk/debian/rules
   ggz-gnome-client/trunk/debian/changelog
   ggz-gnome-client/trunk/debian/compat
   ggz-gnome-client/trunk/debian/control
   ggz-gnome-client/trunk/debian/ggz-gnome-client.docs
   ggz-gnome-client/trunk/debian/rules
   ggz-grubby/trunk/debian/changelog
   ggz-grubby/trunk/debian/compat
   ggz-grubby/trunk/debian/control
   ggz-grubby/trunk/debian/ggz-grubby.postinst
   ggz-grubby/trunk/debian/ggz-grubby.prerm
   ggz-grubby/trunk/debian/rules
   ggz-gtk-client/trunk/debian/changelog
   ggz-gtk-client/trunk/debian/compat
   ggz-gtk-client/trunk/debian/control
   ggz-gtk-client/trunk/debian/ggz-gtk-client.docs
   ggz-gtk-client/trunk/debian/rules
   ggz-gtk-games/trunk/debian/changelog
   ggz-gtk-games/trunk/debian/compat
   ggz-gtk-games/trunk/debian/control
   ggz-gtk-games/trunk/debian/ggz-gtk-games.postinst
   ggz-gtk-games/trunk/debian/ggz-gtk-games.prerm
   ggz-gtk-games/trunk/debian/rules
   ggz-kde-client/trunk/debian/changelog
   ggz-kde-client/trunk/debian/compat
   ggz-kde-client/trunk/debian/control
   ggz-kde-client/trunk/debian/ggz-kde-client.docs
   ggz-kde-client/trunk/debian/rules
   ggz-kde-games/trunk/debian/changelog
   ggz-kde-games/trunk/debian/compat
   ggz-kde-games/trunk/debian/control
   ggz-kde-games/trunk/debian/ggz-kde-games-data.docs
   ggz-kde-games/trunk/debian/ggz-kde-games.postinst
   ggz-kde-games/trunk/debian/ggz-kde-games.prerm
   ggz-kde-games/trunk/debian/rules
   ggz-python/trunk/debian/changelog
   ggz-python/trunk/debian/compat
   ggz-python/trunk/debian/control
   ggz-python/trunk/debian/ggz-python-games-data.docs
   ggz-python/trunk/debian/ggz-python-games.postinst
   ggz-python/trunk/debian/ggz-python-games.prerm
   ggz-python/trunk/debian/rules
   ggz-sdl-games/trunk/debian/changelog
   ggz-sdl-games/trunk/debian/compat
   ggz-sdl-games/trunk/debian/control
   ggz-sdl-games/trunk/debian/ggz-sdl-games-data.docs
   ggz-sdl-games/trunk/debian/ggz-sdl-games.postinst
   ggz-sdl-games/trunk/debian/ggz-sdl-games.prerm
   ggz-sdl-games/trunk/debian/rules
   ggz-server/trunk/debian/changelog
   ggz-server/trunk/debian/compat
   ggz-server/trunk/debian/control
   ggz-server/trunk/debian/ggz-game-servers.docs
   ggz-server/trunk/debian/ggzd.docs
   ggz-server/trunk/debian/ggzd.postinst
   ggz-server/trunk/debian/ggzd.postrm
   ggz-server/trunk/debian/rules
   ggz-txt-client/trunk/debian/changelog
   ggz-txt-client/trunk/debian/compat
   ggz-txt-client/trunk/debian/control
   ggz-txt-client/trunk/debian/ggz-txt-client.docs
   ggz-txt-client/trunk/debian/ggz-txt-client.postinst
   ggz-txt-client/trunk/debian/ggz-txt-client.prerm
   ggz-txt-client/trunk/debian/rules
   ggz-utils/trunk/debian/changelog
   ggz-utils/trunk/debian/compat
   ggz-utils/trunk/debian/control
   ggz-utils/trunk/debian/ggz-utils.docs
   ggz-utils/trunk/debian/rules
   libggz/trunk/debian/changelog
   libggz/trunk/debian/compat
   libggz/trunk/debian/control
   libggz/trunk/debian/docs
   libggz/trunk/debian/rules
   meta-ggz/trunk/debian/changelog
   meta-ggz/trunk/debian/control
   meta-ggz/trunk/debian/rules
Log:
Changed build system to CDBS


Modified: ggz-client-libs/trunk/debian/changelog
===================================================================
--- ggz-client-libs/trunk/debian/changelog	2006-07-23 10:17:07 UTC (rev 33)
+++ ggz-client-libs/trunk/debian/changelog	2006-07-23 18:03:57 UTC (rev 34)
@@ -9,8 +9,10 @@
   [ Peter Eisentraut ]
   * Changed maintainer to mailing list
   * Updated standards version
+  * Changed build system to CDBS
+  * Updated to Debhelper level 5
 
- -- Peter Eisentraut <petere at debian.org>  Sun, 23 Jul 2006 11:52:36 +0200
+ -- Peter Eisentraut <petere at debian.org>  Sun, 23 Jul 2006 12:20:56 +0200
 
 ggz-client-libs (0.0.13-1) unstable; urgency=low
 

Modified: ggz-client-libs/trunk/debian/compat
===================================================================
--- ggz-client-libs/trunk/debian/compat	2006-07-23 10:17:07 UTC (rev 33)
+++ ggz-client-libs/trunk/debian/compat	2006-07-23 18:03:57 UTC (rev 34)
@@ -1 +1 @@
-4
+5

Modified: ggz-client-libs/trunk/debian/control
===================================================================
--- ggz-client-libs/trunk/debian/control	2006-07-23 10:17:07 UTC (rev 33)
+++ ggz-client-libs/trunk/debian/control	2006-07-23 18:03:57 UTC (rev 34)
@@ -4,7 +4,7 @@
 Maintainer: Debian GGZ Maintainers <pkg-ggz-maintainers at lists.alioth.debian.org>
 Uploaders: Josef Spillner <josef at ggzgamingzone.org>, Peter Eisentraut <petere at debian.org>
 Standards-Version: 3.7.2
-Build-Depends: autotools-dev, debhelper (>> 4.8), libggz-dev (>= 0.0.12), libexpat1-dev (>> 1.95.6)
+Build-Depends: cdbs, debhelper (>= 5), libggz-dev (>= 0.0.12), libexpat1-dev (>> 1.95.6)
 
 Package: libggzcore7
 Architecture: any

Modified: ggz-client-libs/trunk/debian/ggzcore-bin.docs
===================================================================
--- ggz-client-libs/trunk/debian/ggzcore-bin.docs	2006-07-23 10:17:07 UTC (rev 33)
+++ ggz-client-libs/trunk/debian/ggzcore-bin.docs	2006-07-23 18:03:57 UTC (rev 34)
@@ -1,4 +1 @@
-AUTHORS
-NEWS
-README
 README.GGZ

Modified: ggz-client-libs/trunk/debian/libggzcore7.docs
===================================================================
--- ggz-client-libs/trunk/debian/libggzcore7.docs	2006-07-23 10:17:07 UTC (rev 33)
+++ ggz-client-libs/trunk/debian/libggzcore7.docs	2006-07-23 18:03:57 UTC (rev 34)
@@ -1,4 +1 @@
-AUTHORS
-NEWS
-README
 README.GGZ

Deleted: ggz-client-libs/trunk/debian/libggzmod-dev.docs
===================================================================

Modified: ggz-client-libs/trunk/debian/libggzmod4.docs
===================================================================
--- ggz-client-libs/trunk/debian/libggzmod4.docs	2006-07-23 10:17:07 UTC (rev 33)
+++ ggz-client-libs/trunk/debian/libggzmod4.docs	2006-07-23 18:03:57 UTC (rev 34)
@@ -1,4 +1 @@
-AUTHORS
-NEWS
-README
 README.GGZ

Modified: ggz-client-libs/trunk/debian/rules
===================================================================
--- ggz-client-libs/trunk/debian/rules	2006-07-23 10:17:07 UTC (rev 33)
+++ ggz-client-libs/trunk/debian/rules	2006-07-23 18:03:57 UTC (rev 34)
@@ -1,7 +1,8 @@
 #!/usr/bin/make -f
-# debian/rules file for ggz-client-libs
 
-RULES_CONFIGURE := --disable-debug
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/autotools.mk
 
-include debian/rules.common.mk
-
+DEB_CONFIGURE_EXTRA_FLAGS = --disable-debug
+DEB_DH_MAKESHLIBS_ARGS_ALL = -V
+DEB_SHLIBDEPS_INCLUDE = $(DEB_DESTDIR)/usr/lib

Deleted: ggz-client-libs/trunk/debian/rules.common.mk
===================================================================
--- ggz-client-libs/trunk/debian/rules.common.mk	2006-07-23 10:17:07 UTC (rev 33)
+++ ggz-client-libs/trunk/debian/rules.common.mk	2006-07-23 18:03:57 UTC (rev 34)
@@ -1,99 +0,0 @@
-# Common debian rules
-# imports: RULES_CONFIGURE (and optionally RULES_MAKE)
-# sets for shell: CFLAGS, CXXFLAGS
-
-prefix	:= $(PWD)/debian/tmp
-share	:= /usr/share
-
-### enable cross-compilation
-
-DEB_HOST_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-
-config_flags	:= --prefix=/usr \
-	--sysconfdir=/etc \
-	--localstatedir=/var/lib \
-	--mandir=$(share)/man \
-	--build $(DEB_HOST_GNU_TYPE)
-ifneq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE))
-config_flags	+= --host $(DEB_HOST_GNU_TYPE)
-endif
-
-### setting options for C/C++ compilers
-
-cflags	:= -g -Wall
-ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-cflags	+= -O2
-else
-cflags	+= -O0
-endif
-
-export CFLAGS=$(cflags)
-export CXXFLAGS=$(cflags)
-
-### configure the package
-### the RULES_CONFIGURE come from debian/rules
-
-patches = $(wildcard debian/patches/*.diff)
-
-config:	config-stamp
-config-stamp:
-	dh_testdir
-	if ! test -z "$(patches)"; then \
-		cat $(patches) | patch -p1; \
-	fi
-	$(SHELL) ./configure $(config_flags) \
-		$(RULES_CONFIGURE)
-	touch $@
-
-### build the package and clean the build
-
-build:	config build-stamp
-build-stamp:
-	$(MAKE)
-	touch $@
-
-clean:	checkroot
-	rm -f *-stamp
-	-$(MAKE) distclean
-	-if ! test -z "$(patches)"; then \
-		cat $(patches) | patch -R -p1; \
-	fi
-	dh_clean
-
-### misc rules
-
-RULES_MAKE::
-
-binary-indep:	checkroot build
-
-binary-arch::	checkroot build
-	dh_clean
-	dh_installdirs
-
-	$(MAKE) install DESTDIR=$(prefix) $(RULES_MAKEINSTALL)
-	$(MAKE) -f debian/rules RULES_MAKE
-
-	dh_install
-
-	dh_installchangelogs ChangeLog
-	dh_installdocs
-
-	dh_strip
-	dh_compress -X.docbook
-	dh_link
-	dh_fixperms
-	dh_makeshlibs -V
-	dh_installdeb
-	dh_shlibdeps -l$(prefix)/usr/lib
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
-
-binary:	binary-indep binary-arch
-
-checkroot:
-	dh_testdir
-	dh_testroot
-
-.PHONY: binary binary-indep binary-arch clean checkroot build config

Modified: ggz-docs/trunk/debian/changelog
===================================================================
--- ggz-docs/trunk/debian/changelog	2006-07-23 10:17:07 UTC (rev 33)
+++ ggz-docs/trunk/debian/changelog	2006-07-23 18:03:57 UTC (rev 34)
@@ -2,6 +2,8 @@
 
   * Changed maintainer to mailing list
   * Updated standards version
+  * Changed build system to CDBS
+  * Updated to Debhelper level 5
 
  -- Peter Eisentraut <petere at debian.org>  Sun, 23 Jul 2006 11:52:37 +0200
 

Modified: ggz-docs/trunk/debian/compat
===================================================================
--- ggz-docs/trunk/debian/compat	2006-07-23 10:17:07 UTC (rev 33)
+++ ggz-docs/trunk/debian/compat	2006-07-23 18:03:57 UTC (rev 34)
@@ -1 +1 @@
-4
+5

Modified: ggz-docs/trunk/debian/control
===================================================================
--- ggz-docs/trunk/debian/control	2006-07-23 10:17:07 UTC (rev 33)
+++ ggz-docs/trunk/debian/control	2006-07-23 18:03:57 UTC (rev 34)
@@ -4,7 +4,8 @@
 Maintainer: Debian GGZ Maintainers <pkg-ggz-maintainers at lists.alioth.debian.org>
 Uploaders: Josef Spillner <josef at ggzgamingzone.org>, Peter Eisentraut <petere at debian.org>
 Standards-Version: 3.7.2
-Build-Depends-Indep: autotools-dev, debhelper (>> 4.8), texinfo, tetex-bin, texi2html, lynx, docbook-dsssl, sgml2x, transfig, jade, gs
+Build-Depends: cdbs, debhelper (>= 5)
+Build-Depends-Indep: texinfo, tetex-bin, texi2html, lynx, docbook-dsssl, sgml2x, transfig, jade, gs
 
 Package: ggz-docs
 Architecture: all

Modified: ggz-docs/trunk/debian/ggz-docs.docs
===================================================================
--- ggz-docs/trunk/debian/ggz-docs.docs	2006-07-23 10:17:07 UTC (rev 33)
+++ ggz-docs/trunk/debian/ggz-docs.docs	2006-07-23 18:03:57 UTC (rev 34)
@@ -1,4 +1 @@
-AUTHORS
-NEWS
-README
 README.GGZ

Deleted: ggz-docs/trunk/debian/ggz-docs.install
===================================================================
--- ggz-docs/trunk/debian/ggz-docs.install	2006-07-23 10:17:07 UTC (rev 33)
+++ ggz-docs/trunk/debian/ggz-docs.install	2006-07-23 18:03:57 UTC (rev 34)
@@ -1 +0,0 @@
-debian/tmp/usr/share/doc

Modified: ggz-docs/trunk/debian/rules
===================================================================
--- ggz-docs/trunk/debian/rules	2006-07-23 10:17:07 UTC (rev 33)
+++ ggz-docs/trunk/debian/rules	2006-07-23 18:03:57 UTC (rev 34)
@@ -1,7 +1,6 @@
 #!/usr/bin/make -f
-# debian/rules file for ggz-docs
 
-RULES_CONFIGURE := --enable-spec --enable-guides
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/autotools.mk
 
-include debian/rules.common.mk
-
+DEB_CONFIGURE_EXTRA_FLAGS = --enable-spec --enable-guides

Deleted: ggz-docs/trunk/debian/rules.common.mk
===================================================================
--- ggz-docs/trunk/debian/rules.common.mk	2006-07-23 10:17:07 UTC (rev 33)
+++ ggz-docs/trunk/debian/rules.common.mk	2006-07-23 18:03:57 UTC (rev 34)
@@ -1,99 +0,0 @@
-# Common debian rules
-# imports: RULES_CONFIGURE (and optionally RULES_MAKE)
-# sets for shell: CFLAGS, CXXFLAGS
-
-prefix	:= $(PWD)/debian/tmp
-share	:= /usr/share
-
-### enable cross-compilation
-
-DEB_HOST_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-
-config_flags	:= --prefix=/usr \
-	--sysconfdir=/etc \
-	--localstatedir=/var/lib \
-	--mandir=$(share)/man \
-	--build $(DEB_HOST_GNU_TYPE)
-ifneq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE))
-config_flags	+= --host $(DEB_HOST_GNU_TYPE)
-endif
-
-### setting options for C/C++ compilers
-
-cflags	:= -g -Wall
-ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-cflags	+= -O2
-else
-cflags	+= -O0
-endif
-
-export CFLAGS=$(cflags)
-export CXXFLAGS=$(cflags)
-
-### configure the package
-### the RULES_CONFIGURE come from debian/rules
-
-patches = $(wildcard debian/patches/*.diff)
-
-config:	config-stamp
-config-stamp:
-	dh_testdir
-	if ! test -z "$(patches)"; then \
-		cat $(patches) | patch -p1; \
-	fi
-	$(SHELL) ./configure $(config_flags) \
-		$(RULES_CONFIGURE)
-	touch $@
-
-### build the package and clean the build
-
-build:	config build-stamp
-build-stamp:
-	$(MAKE)
-	touch $@
-
-clean:	checkroot
-	rm -f *-stamp
-	-$(MAKE) distclean
-	-if ! test -z "$(patches)"; then \
-		cat $(patches) | patch -R -p1; \
-	fi
-	dh_clean
-
-### misc rules
-
-RULES_MAKE::
-
-binary-indep:	checkroot build
-
-binary-arch::	checkroot build
-	dh_clean
-	dh_installdirs
-
-	$(MAKE) install DESTDIR=$(prefix) $(RULES_MAKEINSTALL)
-	$(MAKE) -f debian/rules RULES_MAKE
-
-	dh_install
-
-	dh_installchangelogs ChangeLog
-	dh_installdocs
-
-	dh_strip
-	dh_compress -X.docbook
-	dh_link
-	dh_fixperms
-	dh_makeshlibs -V
-	dh_installdeb
-	dh_shlibdeps -l$(prefix)/usr/lib
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
-
-binary:	binary-indep binary-arch
-
-checkroot:
-	dh_testdir
-	dh_testroot
-
-.PHONY: binary binary-indep binary-arch clean checkroot build config

Modified: ggz-gnome-client/trunk/debian/changelog
===================================================================
--- ggz-gnome-client/trunk/debian/changelog	2006-07-23 10:17:07 UTC (rev 33)
+++ ggz-gnome-client/trunk/debian/changelog	2006-07-23 18:03:57 UTC (rev 34)
@@ -2,6 +2,8 @@
 
   * Changed maintainer to mailing list
   * Updated standards version
+  * Changed build system to CDBS
+  * Updated to Debhelper level 5
 
  -- Peter Eisentraut <petere at debian.org>  Sun, 23 Jul 2006 11:52:38 +0200
 

Modified: ggz-gnome-client/trunk/debian/compat
===================================================================
--- ggz-gnome-client/trunk/debian/compat	2006-07-23 10:17:07 UTC (rev 33)
+++ ggz-gnome-client/trunk/debian/compat	2006-07-23 18:03:57 UTC (rev 34)
@@ -1 +1 @@
-4
+5

Modified: ggz-gnome-client/trunk/debian/control
===================================================================
--- ggz-gnome-client/trunk/debian/control	2006-07-23 10:17:07 UTC (rev 33)
+++ ggz-gnome-client/trunk/debian/control	2006-07-23 18:03:57 UTC (rev 34)
@@ -4,7 +4,7 @@
 Maintainer: Debian GGZ Maintainers <pkg-ggz-maintainers at lists.alioth.debian.org>
 Uploaders: Josef Spillner <josef at ggzgamingzone.org>, Peter Eisentraut <petere at debian.org>
 Standards-Version: 3.7.2
-Build-Depends: autotools-dev, debhelper (>> 4.8), ggzcore-bin, libggz-dev (>= 0.0.12), libggzcore-dev (>= 0.0.12), libggzmod-dev, libgnomeui-dev
+Build-Depends: cdbs, debhelper (>= 5), ggzcore-bin, libggz-dev (>= 0.0.12), libggzcore-dev (>= 0.0.12), libggzmod-dev, libgnomeui-dev
 
 Package: ggz-gnome-client
 Architecture: any

Modified: ggz-gnome-client/trunk/debian/ggz-gnome-client.docs
===================================================================
--- ggz-gnome-client/trunk/debian/ggz-gnome-client.docs	2006-07-23 10:17:07 UTC (rev 33)
+++ ggz-gnome-client/trunk/debian/ggz-gnome-client.docs	2006-07-23 18:03:57 UTC (rev 34)
@@ -1,4 +1 @@
-AUTHORS
-NEWS
-README
 README.GGZ

Deleted: ggz-gnome-client/trunk/debian/ggz-gnome-client.install
===================================================================
--- ggz-gnome-client/trunk/debian/ggz-gnome-client.install	2006-07-23 10:17:07 UTC (rev 33)
+++ ggz-gnome-client/trunk/debian/ggz-gnome-client.install	2006-07-23 18:03:57 UTC (rev 34)
@@ -1 +0,0 @@
-debian/tmp/usr

Modified: ggz-gnome-client/trunk/debian/rules
===================================================================
--- ggz-gnome-client/trunk/debian/rules	2006-07-23 10:17:07 UTC (rev 33)
+++ ggz-gnome-client/trunk/debian/rules	2006-07-23 18:03:57 UTC (rev 34)
@@ -1,7 +1,4 @@
 #!/usr/bin/make -f
-# debian/rules file for ggz-gnome-client
 
-RULES_CONFIGURE :=
-
-include debian/rules.common.mk
-
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/autotools.mk

Deleted: ggz-gnome-client/trunk/debian/rules.common.mk
===================================================================
--- ggz-gnome-client/trunk/debian/rules.common.mk	2006-07-23 10:17:07 UTC (rev 33)
+++ ggz-gnome-client/trunk/debian/rules.common.mk	2006-07-23 18:03:57 UTC (rev 34)
@@ -1,99 +0,0 @@
-# Common debian rules
-# imports: RULES_CONFIGURE (and optionally RULES_MAKE)
-# sets for shell: CFLAGS, CXXFLAGS
-
-prefix	:= $(PWD)/debian/tmp
-share	:= /usr/share
-
-### enable cross-compilation
-
-DEB_HOST_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-
-config_flags	:= --prefix=/usr \
-	--sysconfdir=/etc \
-	--localstatedir=/var/lib \
-	--mandir=$(share)/man \
-	--build $(DEB_HOST_GNU_TYPE)
-ifneq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE))
-config_flags	+= --host $(DEB_HOST_GNU_TYPE)
-endif
-
-### setting options for C/C++ compilers
-
-cflags	:= -g -Wall
-ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-cflags	+= -O2
-else
-cflags	+= -O0
-endif
-
-export CFLAGS=$(cflags)
-export CXXFLAGS=$(cflags)
-
-### configure the package
-### the RULES_CONFIGURE come from debian/rules
-
-patches = $(wildcard debian/patches/*.diff)
-
-config:	config-stamp
-config-stamp:
-	dh_testdir
-	if ! test -z "$(patches)"; then \
-		cat $(patches) | patch -p1; \
-	fi
-	$(SHELL) ./configure $(config_flags) \
-		$(RULES_CONFIGURE)
-	touch $@
-
-### build the package and clean the build
-
-build:	config build-stamp
-build-stamp:
-	$(MAKE)
-	touch $@
-
-clean:	checkroot
-	rm -f *-stamp
-	-$(MAKE) distclean
-	-if ! test -z "$(patches)"; then \
-		cat $(patches) | patch -R -p1; \
-	fi
-	dh_clean
-
-### misc rules
-
-RULES_MAKE::
-
-binary-indep:	checkroot build
-
-binary-arch::	checkroot build
-	dh_clean
-	dh_installdirs
-
-	$(MAKE) install DESTDIR=$(prefix) $(RULES_MAKEINSTALL)
-	$(MAKE) -f debian/rules RULES_MAKE
-
-	dh_install
-
-	dh_installchangelogs ChangeLog
-	dh_installdocs
-
-	dh_strip
-	dh_compress -X.docbook
-	dh_link
-	dh_fixperms
-	dh_makeshlibs -V
-	dh_installdeb
-	dh_shlibdeps -l$(prefix)/usr/lib
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
-
-binary:	binary-indep binary-arch
-
-checkroot:
-	dh_testdir
-	dh_testroot
-
-.PHONY: binary binary-indep binary-arch clean checkroot build config

Modified: ggz-grubby/trunk/debian/changelog
===================================================================
--- ggz-grubby/trunk/debian/changelog	2006-07-23 10:17:07 UTC (rev 33)
+++ ggz-grubby/trunk/debian/changelog	2006-07-23 18:03:57 UTC (rev 34)
@@ -2,6 +2,8 @@
 
   * Changed maintainer to mailing list
   * Updated standards version
+  * Changed build system to CDBS
+  * Updated to Debhelper level 5
 
  -- Peter Eisentraut <petere at debian.org>  Sun, 23 Jul 2006 11:52:36 +0200
 

Modified: ggz-grubby/trunk/debian/compat
===================================================================
--- ggz-grubby/trunk/debian/compat	2006-07-23 10:17:07 UTC (rev 33)
+++ ggz-grubby/trunk/debian/compat	2006-07-23 18:03:57 UTC (rev 34)
@@ -1 +1 @@
-4
+5

Modified: ggz-grubby/trunk/debian/control
===================================================================
--- ggz-grubby/trunk/debian/control	2006-07-23 10:17:07 UTC (rev 33)
+++ ggz-grubby/trunk/debian/control	2006-07-23 18:03:57 UTC (rev 34)
@@ -4,7 +4,7 @@
 Maintainer: Debian GGZ Maintainers <pkg-ggz-maintainers at lists.alioth.debian.org>
 Uploaders: Josef Spillner <josef at ggzgamingzone.org>, Peter Eisentraut <petere at debian.org>
 Standards-Version: 3.7.2
-Build-Depends: autotools-dev, debhelper (>> 4.8), libggzcore-dev (>= 0.0.12), libggzmod-dev (>= 0.0.12), libperl-dev, ruby1.8-dev, ruby, python2.3-dev | python2.4-dev, libsilc-dev, ggzcore-bin (>= 0.0.12)
+Build-Depends: cdbs, debhelper (>= 5), libggzcore-dev (>= 0.0.12), libggzmod-dev (>= 0.0.12), libperl-dev, ruby1.8-dev, ruby, python2.3-dev | python2.4-dev, libsilc-dev, ggzcore-bin (>= 0.0.12)
 
 Package: ggz-grubby
 Architecture: any

Deleted: ggz-grubby/trunk/debian/ggz-grubby.docs
===================================================================
--- ggz-grubby/trunk/debian/ggz-grubby.docs	2006-07-23 10:17:07 UTC (rev 33)
+++ ggz-grubby/trunk/debian/ggz-grubby.docs	2006-07-23 18:03:57 UTC (rev 34)
@@ -1,3 +0,0 @@
-AUTHORS
-NEWS
-README

Deleted: ggz-grubby/trunk/debian/ggz-grubby.install
===================================================================
--- ggz-grubby/trunk/debian/ggz-grubby.install	2006-07-23 10:17:07 UTC (rev 33)
+++ ggz-grubby/trunk/debian/ggz-grubby.install	2006-07-23 18:03:57 UTC (rev 34)
@@ -1 +0,0 @@
-debian/tmp/usr

Modified: ggz-grubby/trunk/debian/ggz-grubby.postinst
===================================================================
--- ggz-grubby/trunk/debian/ggz-grubby.postinst	2006-07-23 10:17:07 UTC (rev 33)
+++ ggz-grubby/trunk/debian/ggz-grubby.postinst	2006-07-23 18:03:57 UTC (rev 34)
@@ -3,5 +3,3 @@
 ggz-config --install --force --noregistry=/usr/share/ggz/modules/ggz-grubby
 
 #DEBHELPER#
-
-exit 0

Modified: ggz-grubby/trunk/debian/ggz-grubby.prerm
===================================================================
--- ggz-grubby/trunk/debian/ggz-grubby.prerm	2006-07-23 10:17:07 UTC (rev 33)
+++ ggz-grubby/trunk/debian/ggz-grubby.prerm	2006-07-23 18:03:57 UTC (rev 34)
@@ -3,5 +3,3 @@
 ggz-config --remove --noregistry=/usr/share/ggz/modules/ggz-grubby
 
 #DEBHELPER#
-
-exit 0

Modified: ggz-grubby/trunk/debian/rules
===================================================================
--- ggz-grubby/trunk/debian/rules	2006-07-23 10:17:07 UTC (rev 33)
+++ ggz-grubby/trunk/debian/rules	2006-07-23 18:03:57 UTC (rev 34)
@@ -1,7 +1,6 @@
 #!/usr/bin/make -f
-# debian/rules file for ggz-grubby
 
-RULES_CONFIGURE := --enable-noregistry=/usr/share/ggz/modules/ggz-grubby
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/autotools.mk
 
-include debian/rules.common.mk
-
+DEB_CONFIGURE_EXTRA_FLAGS = --enable-noregistry=/usr/share/ggz/modules/ggz-grubby

Deleted: ggz-grubby/trunk/debian/rules.common.mk
===================================================================
--- ggz-grubby/trunk/debian/rules.common.mk	2006-07-23 10:17:07 UTC (rev 33)
+++ ggz-grubby/trunk/debian/rules.common.mk	2006-07-23 18:03:57 UTC (rev 34)
@@ -1,99 +0,0 @@
-# Common debian rules
-# imports: RULES_CONFIGURE (and optionally RULES_MAKE)
-# sets for shell: CFLAGS, CXXFLAGS
-
-prefix	:= $(PWD)/debian/tmp
-share	:= /usr/share
-
-### enable cross-compilation
-
-DEB_HOST_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-
-config_flags	:= --prefix=/usr \
-	--sysconfdir=/etc \
-	--localstatedir=/var/lib \
-	--mandir=$(share)/man \
-	--build $(DEB_HOST_GNU_TYPE)
-ifneq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE))
-config_flags	+= --host $(DEB_HOST_GNU_TYPE)
-endif
-
-### setting options for C/C++ compilers
-
-cflags	:= -g -Wall
-ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-cflags	+= -O2
-else
-cflags	+= -O0
-endif
-
-export CFLAGS=$(cflags)
-export CXXFLAGS=$(cflags)
-
-### configure the package
-### the RULES_CONFIGURE come from debian/rules
-
-patches = $(wildcard debian/patches/*.diff)
-
-config:	config-stamp
-config-stamp:
-	dh_testdir
-	if ! test -z "$(patches)"; then \
-		cat $(patches) | patch -p1; \
-	fi
-	$(SHELL) ./configure $(config_flags) \
-		$(RULES_CONFIGURE)
-	touch $@
-
-### build the package and clean the build
-
-build:	config build-stamp
-build-stamp:
-	$(MAKE)
-	touch $@
-
-clean:	checkroot
-	rm -f *-stamp
-	-$(MAKE) distclean
-	-if ! test -z "$(patches)"; then \
-		cat $(patches) | patch -R -p1; \
-	fi
-	dh_clean
-
-### misc rules
-
-RULES_MAKE::
-
-binary-indep:	checkroot build
-
-binary-arch::	checkroot build
-	dh_clean
-	dh_installdirs
-
-	$(MAKE) install DESTDIR=$(prefix) $(RULES_MAKEINSTALL)
-	$(MAKE) -f debian/rules RULES_MAKE
-
-	dh_install
-
-	dh_installchangelogs ChangeLog
-	dh_installdocs
-
-	dh_strip
-	dh_compress -X.docbook
-	dh_link
-	dh_fixperms
-	dh_makeshlibs -V
-	dh_installdeb
-	dh_shlibdeps -l$(prefix)/usr/lib
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
-
-binary:	binary-indep binary-arch
-
-checkroot:
-	dh_testdir
-	dh_testroot
-
-.PHONY: binary binary-indep binary-arch clean checkroot build config

Modified: ggz-gtk-client/trunk/debian/changelog
===================================================================
--- ggz-gtk-client/trunk/debian/changelog	2006-07-23 10:17:07 UTC (rev 33)
+++ ggz-gtk-client/trunk/debian/changelog	2006-07-23 18:03:57 UTC (rev 34)
@@ -2,6 +2,8 @@
 
   * Changed maintainer to mailing list
   * Updated standards version
+  * Changed build system to CDBS
+  * Updated to Debhelper level 5
 
  -- Peter Eisentraut <petere at debian.org>  Sun, 23 Jul 2006 11:52:37 +0200
 

Modified: ggz-gtk-client/trunk/debian/compat
===================================================================
--- ggz-gtk-client/trunk/debian/compat	2006-07-23 10:17:07 UTC (rev 33)
+++ ggz-gtk-client/trunk/debian/compat	2006-07-23 18:03:57 UTC (rev 34)
@@ -1 +1 @@
-4
+5

Modified: ggz-gtk-client/trunk/debian/control
===================================================================
--- ggz-gtk-client/trunk/debian/control	2006-07-23 10:17:07 UTC (rev 33)
+++ ggz-gtk-client/trunk/debian/control	2006-07-23 18:03:57 UTC (rev 34)
@@ -4,7 +4,7 @@
 Maintainer: Debian GGZ Maintainers <pkg-ggz-maintainers at lists.alioth.debian.org>
 Uploaders: Josef Spillner <josef at ggzgamingzone.org>, Peter Eisentraut <petere at debian.org>
 Standards-Version: 3.7.2
-Build-Depends: autotools-dev, debhelper (>> 4.8), libggz-dev (>= 0.0.12), libggzcore-dev (>= 0.0.12), libgtk2.0-dev, gaim-dev, libggzmod-dev
+Build-Depends: cdbs, debhelper (>= 5), libggz-dev (>= 0.0.12), libggzcore-dev (>= 0.0.12), libgtk2.0-dev, gaim-dev, libggzmod-dev
 
 Package: ggz-gtk-client
 Architecture: any

Modified: ggz-gtk-client/trunk/debian/ggz-gtk-client.docs
===================================================================
--- ggz-gtk-client/trunk/debian/ggz-gtk-client.docs	2006-07-23 10:17:07 UTC (rev 33)
+++ ggz-gtk-client/trunk/debian/ggz-gtk-client.docs	2006-07-23 18:03:57 UTC (rev 34)
@@ -1,5 +1 @@
-AUTHORS
-NEWS
-README
 README.GGZ
-TODO

Modified: ggz-gtk-client/trunk/debian/rules
===================================================================
--- ggz-gtk-client/trunk/debian/rules	2006-07-23 10:17:07 UTC (rev 33)
+++ ggz-gtk-client/trunk/debian/rules	2006-07-23 18:03:57 UTC (rev 34)
@@ -1,7 +1,8 @@
 #!/usr/bin/make -f
-# debian/rules file for ggz-gtk-client
 
-RULES_CONFIGURE := --disable-debug
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/autotools.mk
 
-include debian/rules.common.mk
-
+DEB_CONFIGURE_EXTRA_FLAGS = --disable-debug
+DEB_DH_MAKESHLIBS_ARGS_ALL = -V
+DEB_SHLIBDEPS_INCLUDE = $(DEB_DESTDIR)/usr/lib

Deleted: ggz-gtk-client/trunk/debian/rules.common.mk
===================================================================
--- ggz-gtk-client/trunk/debian/rules.common.mk	2006-07-23 10:17:07 UTC (rev 33)
+++ ggz-gtk-client/trunk/debian/rules.common.mk	2006-07-23 18:03:57 UTC (rev 34)
@@ -1,99 +0,0 @@
-# Common debian rules
-# imports: RULES_CONFIGURE (and optionally RULES_MAKE)
-# sets for shell: CFLAGS, CXXFLAGS
-
-prefix	:= $(PWD)/debian/tmp
-share	:= /usr/share
-
-### enable cross-compilation
-
-DEB_HOST_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-
-config_flags	:= --prefix=/usr \
-	--sysconfdir=/etc \
-	--localstatedir=/var/lib \
-	--mandir=$(share)/man \
-	--build $(DEB_HOST_GNU_TYPE)
-ifneq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE))
-config_flags	+= --host $(DEB_HOST_GNU_TYPE)
-endif
-
-### setting options for C/C++ compilers
-
-cflags	:= -g -Wall
-ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-cflags	+= -O2
-else
-cflags	+= -O0
-endif
-
-export CFLAGS=$(cflags)
-export CXXFLAGS=$(cflags)
-
-### configure the package
-### the RULES_CONFIGURE come from debian/rules
-
-patches = $(wildcard debian/patches/*.diff)
-
-config:	config-stamp
-config-stamp:
-	dh_testdir
-	if ! test -z "$(patches)"; then \
-		cat $(patches) | patch -p1; \
-	fi
-	$(SHELL) ./configure $(config_flags) \
-		$(RULES_CONFIGURE)
-	touch $@
-
-### build the package and clean the build
-
-build:	config build-stamp
-build-stamp:
-	$(MAKE)
-	touch $@
-
-clean:	checkroot
-	rm -f *-stamp
-	-$(MAKE) distclean
-	-if ! test -z "$(patches)"; then \
-		cat $(patches) | patch -R -p1; \
-	fi
-	dh_clean
-
-### misc rules
-
-RULES_MAKE::
-
-binary-indep:	checkroot build
-
-binary-arch::	checkroot build
-	dh_clean
-	dh_installdirs
-
-	$(MAKE) install DESTDIR=$(prefix) $(RULES_MAKEINSTALL)
-	$(MAKE) -f debian/rules RULES_MAKE
-
-	dh_install
-
-	dh_installchangelogs ChangeLog
-	dh_installdocs
-
-	dh_strip
-	dh_compress -X.docbook
-	dh_link
-	dh_fixperms
-	dh_makeshlibs -V
-	dh_installdeb
-	dh_shlibdeps -l$(prefix)/usr/lib
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
-
-binary:	binary-indep binary-arch
-
-checkroot:
-	dh_testdir
-	dh_testroot
-
-.PHONY: binary binary-indep binary-arch clean checkroot build config

Modified: ggz-gtk-games/trunk/debian/changelog
===================================================================
--- ggz-gtk-games/trunk/debian/changelog	2006-07-23 10:17:07 UTC (rev 33)
+++ ggz-gtk-games/trunk/debian/changelog	2006-07-23 18:03:57 UTC (rev 34)
@@ -2,6 +2,9 @@
 
   * Changed maintainer to mailing list
   * Updated standards version
+  * Changed build system to CDBS
+  * Updated to Debhelper level 5
+  * Renamed ggz-gtk-game-data to ggz-gtk-games-data, for consistency
 
  -- Peter Eisentraut <petere at debian.org>  Sun, 23 Jul 2006 11:52:38 +0200
 

Modified: ggz-gtk-games/trunk/debian/compat
===================================================================
--- ggz-gtk-games/trunk/debian/compat	2006-07-23 10:17:07 UTC (rev 33)
+++ ggz-gtk-games/trunk/debian/compat	2006-07-23 18:03:57 UTC (rev 34)
@@ -1 +1 @@
-4
+5

Modified: ggz-gtk-games/trunk/debian/control
===================================================================
--- ggz-gtk-games/trunk/debian/control	2006-07-23 10:17:07 UTC (rev 33)
+++ ggz-gtk-games/trunk/debian/control	2006-07-23 18:03:57 UTC (rev 34)
@@ -4,7 +4,7 @@
 Maintainer: Debian GGZ Maintainers <pkg-ggz-maintainers at lists.alioth.debian.org>
 Uploaders: Josef Spillner <josef at ggzgamingzone.org>, Peter Eisentraut <petere at debian.org>
 Standards-Version: 3.7.2
-Build-Depends: autotools-dev, debhelper (>> 4.8), libggz-dev (>= 0.0.12), libggzmod-dev (>= 0.0.12), ggzcore-bin (>= 0.0.12), gettext, libgtk2.0-dev
+Build-Depends: cdbs, debhelper (>= 5), libggz-dev (>= 0.0.12), libggzmod-dev (>= 0.0.12), ggzcore-bin (>= 0.0.12), gettext, libgtk2.0-dev
 
 Package: ggz-gtk-games
 Architecture: any
@@ -34,7 +34,7 @@
  More information can be found at the GGZ web site
  http://www.ggzgamingzone.org/
 
-Package: ggz-gtk-game-data
+Package: ggz-gtk-games-data
 Architecture: all
 Recommends: ggz-gtk-games (= ${Source-Version})
 Description: GGZ Gaming Zone: multimedia data for game clients for Gtk+

Deleted: ggz-gtk-games/trunk/debian/ggz-gtk-game-data.docs
===================================================================
--- ggz-gtk-games/trunk/debian/ggz-gtk-game-data.docs	2006-07-23 10:17:07 UTC (rev 33)
+++ ggz-gtk-games/trunk/debian/ggz-gtk-game-data.docs	2006-07-23 18:03:57 UTC (rev 34)
@@ -1,4 +0,0 @@
-AUTHORS
-NEWS
-README
-README.GGZ

Deleted: ggz-gtk-games/trunk/debian/ggz-gtk-game-data.install
===================================================================
--- ggz-gtk-games/trunk/debian/ggz-gtk-game-data.install	2006-07-23 10:17:07 UTC (rev 33)
+++ ggz-gtk-games/trunk/debian/ggz-gtk-game-data.install	2006-07-23 18:03:57 UTC (rev 34)
@@ -1 +0,0 @@
-debian/tmp/usr/share

Copied: ggz-gtk-games/trunk/debian/ggz-gtk-games-data.docs (from rev 30, ggz-gtk-games/trunk/debian/ggz-gtk-game-data.docs)
===================================================================
--- ggz-gtk-games/trunk/debian/ggz-gtk-game-data.docs	2006-07-23 01:35:10 UTC (rev 30)
+++ ggz-gtk-games/trunk/debian/ggz-gtk-games-data.docs	2006-07-23 18:03:57 UTC (rev 34)
@@ -0,0 +1 @@
+README.GGZ

Copied: ggz-gtk-games/trunk/debian/ggz-gtk-games-data.install (from rev 30, ggz-gtk-games/trunk/debian/ggz-gtk-game-data.install)

Modified: ggz-gtk-games/trunk/debian/ggz-gtk-games.postinst
===================================================================
--- ggz-gtk-games/trunk/debian/ggz-gtk-games.postinst	2006-07-23 10:17:07 UTC (rev 33)
+++ ggz-gtk-games/trunk/debian/ggz-gtk-games.postinst	2006-07-23 18:03:57 UTC (rev 34)
@@ -3,5 +3,3 @@
 ggz-config --install --force --noregistry=/usr/share/ggz/modules/ggz-gtk-games
 
 #DEBHELPER#
-
-exit 0

Modified: ggz-gtk-games/trunk/debian/ggz-gtk-games.prerm
===================================================================
--- ggz-gtk-games/trunk/debian/ggz-gtk-games.prerm	2006-07-23 10:17:07 UTC (rev 33)
+++ ggz-gtk-games/trunk/debian/ggz-gtk-games.prerm	2006-07-23 18:03:57 UTC (rev 34)
@@ -3,5 +3,3 @@
 ggz-config --remove --noregistry=/usr/share/ggz/modules/ggz-txt-client
 
 #DEBHELPER#
-
-exit 0

Modified: ggz-gtk-games/trunk/debian/rules
===================================================================
--- ggz-gtk-games/trunk/debian/rules	2006-07-23 10:17:07 UTC (rev 33)
+++ ggz-gtk-games/trunk/debian/rules	2006-07-23 18:03:57 UTC (rev 34)
@@ -1,7 +1,6 @@
 #!/usr/bin/make -f
-# debian/rules file for ggz-gtk-games
 
-RULES_CONFIGURE := --disable-debug --enable-noregistry=/usr/share/ggz/modules/ggz-gtk-games
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/autotools.mk
 
-include debian/rules.common.mk
-
+DEB_CONFIGURE_EXTRA_FLAGS = --disable-debug --enable-noregistry=/usr/share/ggz/modules/ggz-gtk-games

Deleted: ggz-gtk-games/trunk/debian/rules.common.mk
===================================================================
--- ggz-gtk-games/trunk/debian/rules.common.mk	2006-07-23 10:17:07 UTC (rev 33)
+++ ggz-gtk-games/trunk/debian/rules.common.mk	2006-07-23 18:03:57 UTC (rev 34)
@@ -1,99 +0,0 @@
-# Common debian rules
-# imports: RULES_CONFIGURE (and optionally RULES_MAKE)
-# sets for shell: CFLAGS, CXXFLAGS
-
-prefix	:= $(PWD)/debian/tmp
-share	:= /usr/share
-
-### enable cross-compilation
-
-DEB_HOST_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-
-config_flags	:= --prefix=/usr \
-	--sysconfdir=/etc \
-	--localstatedir=/var/lib \
-	--mandir=$(share)/man \
-	--build $(DEB_HOST_GNU_TYPE)
-ifneq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE))
-config_flags	+= --host $(DEB_HOST_GNU_TYPE)
-endif
-
-### setting options for C/C++ compilers
-
-cflags	:= -g -Wall
-ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-cflags	+= -O2
-else
-cflags	+= -O0
-endif
-
-export CFLAGS=$(cflags)
-export CXXFLAGS=$(cflags)
-
-### configure the package
-### the RULES_CONFIGURE come from debian/rules
-
-patches = $(wildcard debian/patches/*.diff)
-
-config:	config-stamp
-config-stamp:
-	dh_testdir
-	if ! test -z "$(patches)"; then \
-		cat $(patches) | patch -p1; \
-	fi
-	$(SHELL) ./configure $(config_flags) \
-		$(RULES_CONFIGURE)
-	touch $@
-
-### build the package and clean the build
-
-build:	config build-stamp
-build-stamp:
-	$(MAKE)
-	touch $@
-
-clean:	checkroot
-	rm -f *-stamp
-	-$(MAKE) distclean
-	-if ! test -z "$(patches)"; then \
-		cat $(patches) | patch -R -p1; \
-	fi
-	dh_clean
-
-### misc rules
-
-RULES_MAKE::
-
-binary-indep:	checkroot build
-
-binary-arch::	checkroot build
-	dh_clean
-	dh_installdirs
-
-	$(MAKE) install DESTDIR=$(prefix) $(RULES_MAKEINSTALL)
-	$(MAKE) -f debian/rules RULES_MAKE
-
-	dh_install
-
-	dh_installchangelogs ChangeLog
-	dh_installdocs
-
-	dh_strip
-	dh_compress -X.docbook
-	dh_link
-	dh_fixperms
-	dh_makeshlibs -V
-	dh_installdeb
-	dh_shlibdeps -l$(prefix)/usr/lib
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
-
-binary:	binary-indep binary-arch
-
-checkroot:
-	dh_testdir
-	dh_testroot
-
-.PHONY: binary binary-indep binary-arch clean checkroot build config

Modified: ggz-kde-client/trunk/debian/changelog
===================================================================
--- ggz-kde-client/trunk/debian/changelog	2006-07-23 10:17:07 UTC (rev 33)
+++ ggz-kde-client/trunk/debian/changelog	2006-07-23 18:03:57 UTC (rev 34)
@@ -6,6 +6,8 @@
   [ Peter Eisentraut ]
   * Changed maintainer to mailing list
   * Updated standards version
+  * Changed build system to CDBS
+  * Updated to Debhelper level 5
 
  -- Peter Eisentraut <petere at debian.org>  Sun, 23 Jul 2006 11:52:36 +0200
 

Modified: ggz-kde-client/trunk/debian/compat
===================================================================
--- ggz-kde-client/trunk/debian/compat	2006-07-23 10:17:07 UTC (rev 33)
+++ ggz-kde-client/trunk/debian/compat	2006-07-23 18:03:57 UTC (rev 34)
@@ -1 +1 @@
-4
+5

Modified: ggz-kde-client/trunk/debian/control
===================================================================
--- ggz-kde-client/trunk/debian/control	2006-07-23 10:17:07 UTC (rev 33)
+++ ggz-kde-client/trunk/debian/control	2006-07-23 18:03:57 UTC (rev 34)
@@ -4,7 +4,7 @@
 Maintainer: Debian GGZ Maintainers <pkg-ggz-maintainers at lists.alioth.debian.org>
 Uploaders: Josef Spillner <josef at ggzgamingzone.org>, Peter Eisentraut <petere at debian.org>
 Standards-Version: 3.7.2
-Build-Depends: autotools-dev, debhelper (>> 4.8), libggz-dev (>= 0.0.12), libggzcore-dev (>= 0.0.12), ggzcore-bin (>= 0.0.12), kdelibs4-dev, libqt3-mt-dev, gettext, libavahi-compat-howl-dev
+Build-Depends: cdbs, debhelper (>= 5), libggz-dev (>= 0.0.12), libggzcore-dev (>= 0.0.12), ggzcore-bin (>= 0.0.12), kdelibs4-dev, libqt3-mt-dev, gettext, libavahi-compat-howl-dev
 
 Package: ggz-kde-client
 Architecture: any

Modified: ggz-kde-client/trunk/debian/ggz-kde-client.docs
===================================================================
--- ggz-kde-client/trunk/debian/ggz-kde-client.docs	2006-07-23 10:17:07 UTC (rev 33)
+++ ggz-kde-client/trunk/debian/ggz-kde-client.docs	2006-07-23 18:03:57 UTC (rev 34)
@@ -1,5 +1,2 @@
-AUTHORS
-NEWS
-README
 README.GGZ
 ggz-kde/DESIGN

Deleted: ggz-kde-client/trunk/debian/ggz-kde-client.install
===================================================================
--- ggz-kde-client/trunk/debian/ggz-kde-client.install	2006-07-23 10:17:07 UTC (rev 33)
+++ ggz-kde-client/trunk/debian/ggz-kde-client.install	2006-07-23 18:03:57 UTC (rev 34)
@@ -1 +0,0 @@
-debian/tmp/usr

Modified: ggz-kde-client/trunk/debian/rules
===================================================================
--- ggz-kde-client/trunk/debian/rules	2006-07-23 10:17:07 UTC (rev 33)
+++ ggz-kde-client/trunk/debian/rules	2006-07-23 18:03:57 UTC (rev 34)
@@ -1,8 +1,8 @@
 #!/usr/bin/make -f
-# debian/rules file for ggz-kde-client
 
-RULES_CONFIGURE := --disable-rpath
-RULES_MAKEINSTALL := kde_htmldir=/usr/share/doc/kde/HTML
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/autotools.mk
 
-include debian/rules.common.mk
-
+DEB_CONFIGURE_EXTRA_FLAGS = --disable-rpath
+DEB_MAKE_INSTALL_TARGET += kde_htmldir=/usr/share/doc/kde/HTML
+DEB_COMPRESS_EXCLUDE = .docbook

Deleted: ggz-kde-client/trunk/debian/rules.common.mk
===================================================================
--- ggz-kde-client/trunk/debian/rules.common.mk	2006-07-23 10:17:07 UTC (rev 33)
+++ ggz-kde-client/trunk/debian/rules.common.mk	2006-07-23 18:03:57 UTC (rev 34)
@@ -1,99 +0,0 @@
-# Common debian rules
-# imports: RULES_CONFIGURE (and optionally RULES_MAKE)
-# sets for shell: CFLAGS, CXXFLAGS
-
-prefix	:= $(PWD)/debian/tmp
-share	:= /usr/share
-
-### enable cross-compilation
-
-DEB_HOST_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-
-config_flags	:= --prefix=/usr \
-	--sysconfdir=/etc \
-	--localstatedir=/var/lib \
-	--mandir=$(share)/man \
-	--build $(DEB_HOST_GNU_TYPE)
-ifneq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE))
-config_flags	+= --host $(DEB_HOST_GNU_TYPE)
-endif
-
-### setting options for C/C++ compilers
-
-cflags	:= -g -Wall
-ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-cflags	+= -O2
-else
-cflags	+= -O0
-endif
-
-export CFLAGS=$(cflags)
-export CXXFLAGS=$(cflags)
-
-### configure the package
-### the RULES_CONFIGURE come from debian/rules
-
-patches = $(wildcard debian/patches/*.diff)
-
-config:	config-stamp
-config-stamp:
-	dh_testdir
-	if ! test -z "$(patches)"; then \
-		cat $(patches) | patch -p1; \
-	fi
-	$(SHELL) ./configure $(config_flags) \
-		$(RULES_CONFIGURE)
-	touch $@
-
-### build the package and clean the build
-
-build:	config build-stamp
-build-stamp:
-	$(MAKE)
-	touch $@
-
-clean:	checkroot
-	rm -f *-stamp
-	-$(MAKE) distclean
-	-if ! test -z "$(patches)"; then \
-		cat $(patches) | patch -R -p1; \
-	fi
-	dh_clean
-
-### misc rules
-
-RULES_MAKE::
-
-binary-indep:	checkroot build
-
-binary-arch::	checkroot build
-	dh_clean
-	dh_installdirs
-
-	$(MAKE) install DESTDIR=$(prefix) $(RULES_MAKEINSTALL)
-	$(MAKE) -f debian/rules RULES_MAKE
-
-	dh_install
-
-	dh_installchangelogs ChangeLog
-	dh_installdocs
-
-	dh_strip
-	dh_compress -X.docbook
-	dh_link
-	dh_fixperms
-	dh_makeshlibs -V
-	dh_installdeb
-	dh_shlibdeps -l$(prefix)/usr/lib
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
-
-binary:	binary-indep binary-arch
-
-checkroot:
-	dh_testdir
-	dh_testroot
-
-.PHONY: binary binary-indep binary-arch clean checkroot build config

Modified: ggz-kde-games/trunk/debian/changelog
===================================================================
--- ggz-kde-games/trunk/debian/changelog	2006-07-23 10:17:07 UTC (rev 33)
+++ ggz-kde-games/trunk/debian/changelog	2006-07-23 18:03:57 UTC (rev 34)
@@ -5,6 +5,8 @@
 
   [ Peter Eisentraut ]
   * Changed maintainer to mailing list
+  * Changed build system to CDBS
+  * Updated to Debhelper level 5
 
  -- Peter Eisentraut <petere at debian.org>  Sun, 23 Jul 2006 10:38:38 +0200
 

Modified: ggz-kde-games/trunk/debian/compat
===================================================================
--- ggz-kde-games/trunk/debian/compat	2006-07-23 10:17:07 UTC (rev 33)
+++ ggz-kde-games/trunk/debian/compat	2006-07-23 18:03:57 UTC (rev 34)
@@ -1 +1 @@
-4
+5

Modified: ggz-kde-games/trunk/debian/control
===================================================================
--- ggz-kde-games/trunk/debian/control	2006-07-23 10:17:07 UTC (rev 33)
+++ ggz-kde-games/trunk/debian/control	2006-07-23 18:03:57 UTC (rev 34)
@@ -4,7 +4,7 @@
 Maintainer: Debian GGZ Maintainers <pkg-ggz-maintainers at lists.alioth.debian.org>
 Uploaders: Josef Spillner <josef at ggzgamingzone.org>, Peter Eisentraut <petere at debian.org>
 Standards-Version: 3.6.2.1
-Build-Depends: autotools-dev, debhelper (>> 4.8), libggz-dev (>= 0.0.12), libggzmod-dev (>= 0.0.12), ggzcore-bin (>= 0.0.12), kdelibs4-dev, libqt3-mt-dev, gettext
+Build-Depends: cdbs, debhelper (>= 5), libggz-dev (>= 0.0.12), libggzmod-dev (>= 0.0.12), ggzcore-bin (>= 0.0.12), kdelibs4-dev, libqt3-mt-dev, gettext
 
 Package: ggz-kde-games
 Architecture: any

Modified: ggz-kde-games/trunk/debian/ggz-kde-games-data.docs
===================================================================
--- ggz-kde-games/trunk/debian/ggz-kde-games-data.docs	2006-07-23 10:17:07 UTC (rev 33)
+++ ggz-kde-games/trunk/debian/ggz-kde-games-data.docs	2006-07-23 18:03:57 UTC (rev 34)
@@ -1,5 +1,2 @@
-AUTHORS
-NEWS
-README
 README.GGZ
 KReversi/THEME.HOWTO

Modified: ggz-kde-games/trunk/debian/ggz-kde-games.postinst
===================================================================
--- ggz-kde-games/trunk/debian/ggz-kde-games.postinst	2006-07-23 10:17:07 UTC (rev 33)
+++ ggz-kde-games/trunk/debian/ggz-kde-games.postinst	2006-07-23 18:03:57 UTC (rev 34)
@@ -3,5 +3,3 @@
 ggz-config --install --force --noregistry=/usr/share/ggz/modules/ggz-kde-games
 
 #DEBHELPER#
-
-exit 0

Modified: ggz-kde-games/trunk/debian/ggz-kde-games.prerm
===================================================================
--- ggz-kde-games/trunk/debian/ggz-kde-games.prerm	2006-07-23 10:17:07 UTC (rev 33)
+++ ggz-kde-games/trunk/debian/ggz-kde-games.prerm	2006-07-23 18:03:57 UTC (rev 34)
@@ -3,5 +3,3 @@
 ggz-config --remove --noregistry=/usr/share/ggz/modules/ggz-kde-games
 
 #DEBHELPER#
-
-exit 0

Modified: ggz-kde-games/trunk/debian/rules
===================================================================
--- ggz-kde-games/trunk/debian/rules	2006-07-23 10:17:07 UTC (rev 33)
+++ ggz-kde-games/trunk/debian/rules	2006-07-23 18:03:57 UTC (rev 34)
@@ -1,8 +1,7 @@
 #!/usr/bin/make -f
-# debian/rules file for ggz-kde-games
 
-RULES_CONFIGURE := --disable-rpath --enable-noregistry=/usr/share/ggz/modules/ggz-kde-games
-RULES_MAKEINSTALL := kde_htmldir=/usr/share/doc/kde/HTML
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/autotools.mk
 
-include debian/rules.common.mk
-
+DEB_CONFIGURE_EXTRA_FLAGS = --disable-rpath --enable-noregistry=/usr/share/ggz/modules/ggz-kde-games
+DEB_MAKE_INSTALL_TARGET += kde_htmldir=/usr/share/doc/kde/HTML

Deleted: ggz-kde-games/trunk/debian/rules.common.mk
===================================================================
--- ggz-kde-games/trunk/debian/rules.common.mk	2006-07-23 10:17:07 UTC (rev 33)
+++ ggz-kde-games/trunk/debian/rules.common.mk	2006-07-23 18:03:57 UTC (rev 34)
@@ -1,99 +0,0 @@
-# Common debian rules
-# imports: RULES_CONFIGURE (and optionally RULES_MAKE)
-# sets for shell: CFLAGS, CXXFLAGS
-
-prefix	:= $(PWD)/debian/tmp
-share	:= /usr/share
-
-### enable cross-compilation
-
-DEB_HOST_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-
-config_flags	:= --prefix=/usr \
-	--sysconfdir=/etc \
-	--localstatedir=/var/lib \
-	--mandir=$(share)/man \
-	--build $(DEB_HOST_GNU_TYPE)
-ifneq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE))
-config_flags	+= --host $(DEB_HOST_GNU_TYPE)
-endif
-
-### setting options for C/C++ compilers
-
-cflags	:= -g -Wall
-ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-cflags	+= -O2
-else
-cflags	+= -O0
-endif
-
-export CFLAGS=$(cflags)
-export CXXFLAGS=$(cflags)
-
-### configure the package
-### the RULES_CONFIGURE come from debian/rules
-
-patches = $(wildcard debian/patches/*.diff)
-
-config:	config-stamp
-config-stamp:
-	dh_testdir
-	if ! test -z "$(patches)"; then \
-		cat $(patches) | patch -p1; \
-	fi
-	$(SHELL) ./configure $(config_flags) \
-		$(RULES_CONFIGURE)
-	touch $@
-
-### build the package and clean the build
-
-build:	config build-stamp
-build-stamp:
-	$(MAKE)
-	touch $@
-
-clean:	checkroot
-	rm -f *-stamp
-	-$(MAKE) distclean
-	-if ! test -z "$(patches)"; then \
-		cat $(patches) | patch -R -p1; \
-	fi
-	dh_clean
-
-### misc rules
-
-RULES_MAKE::
-
-binary-indep:	checkroot build
-
-binary-arch::	checkroot build
-	dh_clean
-	dh_installdirs
-
-	$(MAKE) install DESTDIR=$(prefix) $(RULES_MAKEINSTALL)
-	$(MAKE) -f debian/rules RULES_MAKE
-
-	dh_install
-
-	dh_installchangelogs ChangeLog
-	dh_installdocs
-
-	dh_strip
-	dh_compress -X.docbook
-	dh_link
-	dh_fixperms
-	dh_makeshlibs -V
-	dh_installdeb
-	dh_shlibdeps -l$(prefix)/usr/lib
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
-
-binary:	binary-indep binary-arch
-
-checkroot:
-	dh_testdir
-	dh_testroot
-
-.PHONY: binary binary-indep binary-arch clean checkroot build config

Modified: ggz-python/trunk/debian/changelog
===================================================================
--- ggz-python/trunk/debian/changelog	2006-07-23 10:17:07 UTC (rev 33)
+++ ggz-python/trunk/debian/changelog	2006-07-23 18:03:57 UTC (rev 34)
@@ -4,11 +4,14 @@
   * New upstream version.
   * More detailed licence breakdown in debian/copyright files.
   * Dropping patch 001-po-error.diff.
-  * Renamed ggz-python-game-data to ggz-python-games-data for consistency.
 
   [ Peter Eisentraut ]
+  * Renamed ggz-python-game-data to ggz-python-games-data for consistency
   * Changed maintainer to mailing list
   * Updated standards version
+  * Changed build system to CDBS
+  * Updated to Debhelper level 5
+  * Added missing build dependency python-pygame
 
  -- Peter Eisentraut <petere at debian.org>  Sun, 23 Jul 2006 11:52:38 +0200
 

Modified: ggz-python/trunk/debian/compat
===================================================================
--- ggz-python/trunk/debian/compat	2006-07-23 10:17:07 UTC (rev 33)
+++ ggz-python/trunk/debian/compat	2006-07-23 18:03:57 UTC (rev 34)
@@ -1 +1 @@
-4
+5

Modified: ggz-python/trunk/debian/control
===================================================================
--- ggz-python/trunk/debian/control	2006-07-23 10:17:07 UTC (rev 33)
+++ ggz-python/trunk/debian/control	2006-07-23 18:03:57 UTC (rev 34)
@@ -4,7 +4,7 @@
 Maintainer: Debian GGZ Maintainers <pkg-ggz-maintainers at lists.alioth.debian.org>
 Uploaders: Josef Spillner <josef at ggzgamingzone.org>, Peter Eisentraut <petere at debian.org>
 Standards-Version: 3.7.2
-Build-Depends: autotools-dev, debhelper (>> 4.8), libggzmod-dev (>= 0.0.12), libggzdmod-dev (>= 0.0.12), libggzcore-dev (>= 0.0.12), ggzcore-bin (>= 0.0.12), python-dev, librsvg2-dev
+Build-Depends: cdbs, debhelper (>= 5), libggzmod-dev (>= 0.0.12), libggzdmod-dev (>= 0.0.12), libggzcore-dev (>= 0.0.12), ggzcore-bin (>= 0.0.12), python-dev, librsvg2-dev, python-pygame
 
 Package: ggz-python-games
 Architecture: any

Modified: ggz-python/trunk/debian/ggz-python-games-data.docs
===================================================================
--- ggz-python/trunk/debian/ggz-python-games-data.docs	2006-07-23 10:17:07 UTC (rev 33)
+++ ggz-python/trunk/debian/ggz-python-games-data.docs	2006-07-23 18:03:57 UTC (rev 34)
@@ -1,4 +1 @@
-AUTHORS
-NEWS
-README
 README.GGZ

Modified: ggz-python/trunk/debian/ggz-python-games.postinst
===================================================================
--- ggz-python/trunk/debian/ggz-python-games.postinst	2006-07-23 10:17:07 UTC (rev 33)
+++ ggz-python/trunk/debian/ggz-python-games.postinst	2006-07-23 18:03:57 UTC (rev 34)
@@ -3,5 +3,3 @@
 ggz-config --install --force --noregistry=/usr/share/ggz/modules/ggz-python-games
 
 #DEBHELPER#
-
-exit 0

Modified: ggz-python/trunk/debian/ggz-python-games.prerm
===================================================================
--- ggz-python/trunk/debian/ggz-python-games.prerm	2006-07-23 10:17:07 UTC (rev 33)
+++ ggz-python/trunk/debian/ggz-python-games.prerm	2006-07-23 18:03:57 UTC (rev 34)
@@ -3,5 +3,3 @@
 ggz-config --remove --noregistry=/usr/share/ggz/modules/ggz-python-games
 
 #DEBHELPER#
-
-exit 0

Modified: ggz-python/trunk/debian/rules
===================================================================
--- ggz-python/trunk/debian/rules	2006-07-23 10:17:07 UTC (rev 33)
+++ ggz-python/trunk/debian/rules	2006-07-23 18:03:57 UTC (rev 34)
@@ -1,7 +1,7 @@
 #!/usr/bin/make -f
-# debian/rules file for ggz-python-games
 
-RULES_CONFIGURE := --enable-noregistry=/usr/share/ggz/modules/ggz-python-games
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/autotools.mk
 
-include debian/rules.common.mk
-
+DEB_CONFIGURE_EXTRA_FLAGS = --enable-noregistry=/usr/share/ggz/modules/ggz-python-games
+DEB_MAKE_CLEAN_TARGET = clean

Deleted: ggz-python/trunk/debian/rules.common.mk
===================================================================
--- ggz-python/trunk/debian/rules.common.mk	2006-07-23 10:17:07 UTC (rev 33)
+++ ggz-python/trunk/debian/rules.common.mk	2006-07-23 18:03:57 UTC (rev 34)
@@ -1,99 +0,0 @@
-# Common debian rules
-# imports: RULES_CONFIGURE (and optionally RULES_MAKE)
-# sets for shell: CFLAGS, CXXFLAGS
-
-prefix	:= $(PWD)/debian/tmp
-share	:= /usr/share
-
-### enable cross-compilation
-
-DEB_HOST_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-
-config_flags	:= --prefix=/usr \
-	--sysconfdir=/etc \
-	--localstatedir=/var/lib \
-	--mandir=$(share)/man \
-	--build $(DEB_HOST_GNU_TYPE)
-ifneq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE))
-config_flags	+= --host $(DEB_HOST_GNU_TYPE)
-endif
-
-### setting options for C/C++ compilers
-
-cflags	:= -g -Wall
-ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-cflags	+= -O2
-else
-cflags	+= -O0
-endif
-
-export CFLAGS=$(cflags)
-export CXXFLAGS=$(cflags)
-
-### configure the package
-### the RULES_CONFIGURE come from debian/rules
-
-patches = $(wildcard debian/patches/*.diff)
-
-config:	config-stamp
-config-stamp:
-	dh_testdir
-	if ! test -z "$(patches)"; then \
-		cat $(patches) | patch -p1; \
-	fi
-	$(SHELL) ./configure $(config_flags) \
-		$(RULES_CONFIGURE)
-	touch $@
-
-### build the package and clean the build
-
-build:	config build-stamp
-build-stamp:
-	$(MAKE)
-	touch $@
-
-clean:	checkroot
-	rm -f *-stamp
-	-$(MAKE) distclean
-	-if ! test -z "$(patches)"; then \
-		cat $(patches) | patch -R -p1; \
-	fi
-	dh_clean
-
-### misc rules
-
-RULES_MAKE::
-
-binary-indep:	checkroot build
-
-binary-arch::	checkroot build
-	dh_clean
-	dh_installdirs
-
-	$(MAKE) install DESTDIR=$(prefix) $(RULES_MAKEINSTALL)
-	$(MAKE) -f debian/rules RULES_MAKE
-
-	dh_install
-
-	dh_installchangelogs ChangeLog
-	dh_installdocs
-
-	dh_strip
-	dh_compress -X.docbook
-	dh_link
-	dh_fixperms
-	dh_makeshlibs -V
-	dh_installdeb
-	dh_shlibdeps -l$(prefix)/usr/lib
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
-
-binary:	binary-indep binary-arch
-
-checkroot:
-	dh_testdir
-	dh_testroot
-
-.PHONY: binary binary-indep binary-arch clean checkroot build config

Added: ggz-python/upstream/ggz-python_0.0.13.orig.tar.gz
===================================================================
(Binary files differ)


Property changes on: ggz-python/upstream/ggz-python_0.0.13.orig.tar.gz
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Modified: ggz-sdl-games/trunk/debian/changelog
===================================================================
--- ggz-sdl-games/trunk/debian/changelog	2006-07-23 10:17:07 UTC (rev 33)
+++ ggz-sdl-games/trunk/debian/changelog	2006-07-23 18:03:57 UTC (rev 34)
@@ -2,6 +2,8 @@
 
   * Changed maintainer to mailing list
   * Updated standards version
+  * Changed build system to CDBS
+  * Updated to Debhelper level 5
 
  -- Peter Eisentraut <petere at debian.org>  Sun, 23 Jul 2006 11:52:37 +0200
 

Modified: ggz-sdl-games/trunk/debian/compat
===================================================================
--- ggz-sdl-games/trunk/debian/compat	2006-07-23 10:17:07 UTC (rev 33)
+++ ggz-sdl-games/trunk/debian/compat	2006-07-23 18:03:57 UTC (rev 34)
@@ -1 +1 @@
-4
+5

Modified: ggz-sdl-games/trunk/debian/control
===================================================================
--- ggz-sdl-games/trunk/debian/control	2006-07-23 10:17:07 UTC (rev 33)
+++ ggz-sdl-games/trunk/debian/control	2006-07-23 18:03:57 UTC (rev 34)
@@ -4,7 +4,7 @@
 Maintainer: Debian GGZ Maintainers <pkg-ggz-maintainers at lists.alioth.debian.org>
 Uploaders: Josef Spillner <josef at ggzgamingzone.org>, Peter Eisentraut <petere at debian.org>
 Standards-Version: 3.7.2
-Build-Depends: autotools-dev, debhelper (>> 4.8), libggz-dev (>= 0.0.12), libggzmod-dev (>= 0.0.12), ggzcore-bin (>= 0.0.12), gettext, libsdl1.2-dev, libsdl-image1.2-dev, libsdl-ttf2.0-dev, libsdl-mixer1.2-dev
+Build-Depends: cdbs, debhelper (>= 5), libggz-dev (>= 0.0.12), libggzmod-dev (>= 0.0.12), ggzcore-bin (>= 0.0.12), gettext, libsdl1.2-dev, libsdl-image1.2-dev, libsdl-ttf2.0-dev, libsdl-mixer1.2-dev
 
 Package: ggz-sdl-games
 Architecture: any

Modified: ggz-sdl-games/trunk/debian/ggz-sdl-games-data.docs
===================================================================
--- ggz-sdl-games/trunk/debian/ggz-sdl-games-data.docs	2006-07-23 10:17:07 UTC (rev 33)
+++ ggz-sdl-games/trunk/debian/ggz-sdl-games-data.docs	2006-07-23 18:03:57 UTC (rev 34)
@@ -1,4 +1 @@
-AUTHORS
-NEWS
-README
 README.GGZ

Modified: ggz-sdl-games/trunk/debian/ggz-sdl-games.postinst
===================================================================
--- ggz-sdl-games/trunk/debian/ggz-sdl-games.postinst	2006-07-23 10:17:07 UTC (rev 33)
+++ ggz-sdl-games/trunk/debian/ggz-sdl-games.postinst	2006-07-23 18:03:57 UTC (rev 34)
@@ -3,5 +3,3 @@
 ggz-config --install --force --noregistry=/usr/share/ggz/modules/ggz-sdl-games
 
 #DEBHELPER#
-
-exit 0

Modified: ggz-sdl-games/trunk/debian/ggz-sdl-games.prerm
===================================================================
--- ggz-sdl-games/trunk/debian/ggz-sdl-games.prerm	2006-07-23 10:17:07 UTC (rev 33)
+++ ggz-sdl-games/trunk/debian/ggz-sdl-games.prerm	2006-07-23 18:03:57 UTC (rev 34)
@@ -3,5 +3,3 @@
 ggz-config --remove --noregistry=/usr/share/ggz/modules/ggz-sdl-games
 
 #DEBHELPER#
-
-exit 0

Modified: ggz-sdl-games/trunk/debian/rules
===================================================================
--- ggz-sdl-games/trunk/debian/rules	2006-07-23 10:17:07 UTC (rev 33)
+++ ggz-sdl-games/trunk/debian/rules	2006-07-23 18:03:57 UTC (rev 34)
@@ -1,7 +1,6 @@
 #!/usr/bin/make -f
-# debian/rules file for ggz-sdl-games
 
-RULES_CONFIGURE := --enable-noregistry=/usr/share/ggz/modules/ggz-sdl-games
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/autotools.mk
 
-include debian/rules.common.mk
-
+DEB_CONFIGURE_EXTRA_FLAGS = --enable-noregistry=/usr/share/ggz/modules/ggz-sdl-games

Deleted: ggz-sdl-games/trunk/debian/rules.common.mk
===================================================================
--- ggz-sdl-games/trunk/debian/rules.common.mk	2006-07-23 10:17:07 UTC (rev 33)
+++ ggz-sdl-games/trunk/debian/rules.common.mk	2006-07-23 18:03:57 UTC (rev 34)
@@ -1,99 +0,0 @@
-# Common debian rules
-# imports: RULES_CONFIGURE (and optionally RULES_MAKE)
-# sets for shell: CFLAGS, CXXFLAGS
-
-prefix	:= $(PWD)/debian/tmp
-share	:= /usr/share
-
-### enable cross-compilation
-
-DEB_HOST_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-
-config_flags	:= --prefix=/usr \
-	--sysconfdir=/etc \
-	--localstatedir=/var/lib \
-	--mandir=$(share)/man \
-	--build $(DEB_HOST_GNU_TYPE)
-ifneq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE))
-config_flags	+= --host $(DEB_HOST_GNU_TYPE)
-endif
-
-### setting options for C/C++ compilers
-
-cflags	:= -g -Wall
-ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-cflags	+= -O2
-else
-cflags	+= -O0
-endif
-
-export CFLAGS=$(cflags)
-export CXXFLAGS=$(cflags)
-
-### configure the package
-### the RULES_CONFIGURE come from debian/rules
-
-patches = $(wildcard debian/patches/*.diff)
-
-config:	config-stamp
-config-stamp:
-	dh_testdir
-	if ! test -z "$(patches)"; then \
-		cat $(patches) | patch -p1; \
-	fi
-	$(SHELL) ./configure $(config_flags) \
-		$(RULES_CONFIGURE)
-	touch $@
-
-### build the package and clean the build
-
-build:	config build-stamp
-build-stamp:
-	$(MAKE)
-	touch $@
-
-clean:	checkroot
-	rm -f *-stamp
-	-$(MAKE) distclean
-	-if ! test -z "$(patches)"; then \
-		cat $(patches) | patch -R -p1; \
-	fi
-	dh_clean
-
-### misc rules
-
-RULES_MAKE::
-
-binary-indep:	checkroot build
-
-binary-arch::	checkroot build
-	dh_clean
-	dh_installdirs
-
-	$(MAKE) install DESTDIR=$(prefix) $(RULES_MAKEINSTALL)
-	$(MAKE) -f debian/rules RULES_MAKE
-
-	dh_install
-
-	dh_installchangelogs ChangeLog
-	dh_installdocs
-
-	dh_strip
-	dh_compress -X.docbook
-	dh_link
-	dh_fixperms
-	dh_makeshlibs -V
-	dh_installdeb
-	dh_shlibdeps -l$(prefix)/usr/lib
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
-
-binary:	binary-indep binary-arch
-
-checkroot:
-	dh_testdir
-	dh_testroot
-
-.PHONY: binary binary-indep binary-arch clean checkroot build config

Modified: ggz-server/trunk/debian/changelog
===================================================================
--- ggz-server/trunk/debian/changelog	2006-07-23 10:17:07 UTC (rev 33)
+++ ggz-server/trunk/debian/changelog	2006-07-23 18:03:57 UTC (rev 34)
@@ -2,6 +2,8 @@
 
   * Changed maintainer to mailing list
   * Updated standards version
+  * Changed build system to CDBS
+  * Updated to Debhelper level 5
 
  -- Peter Eisentraut <petere at debian.org>  Sun, 23 Jul 2006 11:52:37 +0200
 

Modified: ggz-server/trunk/debian/compat
===================================================================
--- ggz-server/trunk/debian/compat	2006-07-23 10:17:07 UTC (rev 33)
+++ ggz-server/trunk/debian/compat	2006-07-23 18:03:57 UTC (rev 34)
@@ -1 +1 @@
-4
+5

Modified: ggz-server/trunk/debian/control
===================================================================
--- ggz-server/trunk/debian/control	2006-07-23 10:17:07 UTC (rev 33)
+++ ggz-server/trunk/debian/control	2006-07-23 18:03:57 UTC (rev 34)
@@ -4,7 +4,7 @@
 Maintainer: Debian GGZ Maintainers <pkg-ggz-maintainers at lists.alioth.debian.org>
 Uploaders: Josef Spillner <josef at ggzgamingzone.org>, Peter Eisentraut <petere at debian.org>
 Standards-Version: 3.7.2
-Build-Depends: autotools-dev, debhelper (>> 4.8), libggz-dev (>= 0.0.12), libexpat1-dev (>> 1.95.6), libdb4.3-dev | libdb4.2-dev
+Build-Depends: cdbs, debhelper (>= 5), libggz-dev (>= 0.0.12), libexpat1-dev (>> 1.95.6), libdb4.3-dev | libdb4.2-dev
 
 Package: ggzd
 Architecture: any

Modified: ggz-server/trunk/debian/ggz-game-servers.docs
===================================================================
--- ggz-server/trunk/debian/ggz-game-servers.docs	2006-07-23 10:17:07 UTC (rev 33)
+++ ggz-server/trunk/debian/ggz-game-servers.docs	2006-07-23 18:03:57 UTC (rev 34)
@@ -1,5 +1 @@
-AUTHORS
-NEWS
-README
 README.GGZ
-TODO

Modified: ggz-server/trunk/debian/ggzd.docs
===================================================================
--- ggz-server/trunk/debian/ggzd.docs	2006-07-23 10:17:07 UTC (rev 33)
+++ ggz-server/trunk/debian/ggzd.docs	2006-07-23 18:03:57 UTC (rev 34)
@@ -1,5 +1 @@
-AUTHORS
-NEWS
-README
 README.GGZ
-TODO

Modified: ggz-server/trunk/debian/ggzd.postinst
===================================================================
--- ggz-server/trunk/debian/ggzd.postinst	2006-07-23 10:17:07 UTC (rev 33)
+++ ggz-server/trunk/debian/ggzd.postinst	2006-07-23 18:03:57 UTC (rev 34)
@@ -12,6 +12,3 @@
 esac
 
 #DEBHELPER#
-
-exit 0
-

Modified: ggz-server/trunk/debian/ggzd.postrm
===================================================================
--- ggz-server/trunk/debian/ggzd.postrm	2006-07-23 10:17:07 UTC (rev 33)
+++ ggz-server/trunk/debian/ggzd.postrm	2006-07-23 18:03:57 UTC (rev 34)
@@ -10,6 +10,3 @@
 esac
 
 #DEBHELPER#
-
-exit 0
-

Modified: ggz-server/trunk/debian/rules
===================================================================
--- ggz-server/trunk/debian/rules	2006-07-23 10:17:07 UTC (rev 33)
+++ ggz-server/trunk/debian/rules	2006-07-23 18:03:57 UTC (rev 34)
@@ -1,14 +1,12 @@
 #!/usr/bin/make -f
-# debian/rules file for ggz-server
 
-RULES_CONFIGURE := --disable-debug
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/autotools.mk
 
-RULES_MAKE::
-	echo "[debian] installing init file..."
-	dh_installinit
-	echo "[debian] moving entry room (lounge) file..."
+DEB_CONFIGURE_EXTRA_FLAGS = --disable-debug
+DEB_DH_MAKESHLIBS_ARGS_ALL = -V
+DEB_SHLIBDEPS_INCLUDE = $(DEB_DESTDIR)/usr/lib
+
+common-install-impl::
 	mkdir -p debian/ggzd/etc/ggzd/rooms
 	mv debian/tmp/etc/ggzd/rooms/entry.room debian/ggzd/etc/ggzd/rooms
-
-include debian/rules.common.mk
-

Deleted: ggz-server/trunk/debian/rules.common.mk
===================================================================
--- ggz-server/trunk/debian/rules.common.mk	2006-07-23 10:17:07 UTC (rev 33)
+++ ggz-server/trunk/debian/rules.common.mk	2006-07-23 18:03:57 UTC (rev 34)
@@ -1,99 +0,0 @@
-# Common debian rules
-# imports: RULES_CONFIGURE (and optionally RULES_MAKE)
-# sets for shell: CFLAGS, CXXFLAGS
-
-prefix	:= $(PWD)/debian/tmp
-share	:= /usr/share
-
-### enable cross-compilation
-
-DEB_HOST_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-
-config_flags	:= --prefix=/usr \
-	--sysconfdir=/etc \
-	--localstatedir=/var/lib \
-	--mandir=$(share)/man \
-	--build $(DEB_HOST_GNU_TYPE)
-ifneq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE))
-config_flags	+= --host $(DEB_HOST_GNU_TYPE)
-endif
-
-### setting options for C/C++ compilers
-
-cflags	:= -g -Wall
-ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-cflags	+= -O2
-else
-cflags	+= -O0
-endif
-
-export CFLAGS=$(cflags)
-export CXXFLAGS=$(cflags)
-
-### configure the package
-### the RULES_CONFIGURE come from debian/rules
-
-patches = $(wildcard debian/patches/*.diff)
-
-config:	config-stamp
-config-stamp:
-	dh_testdir
-	if ! test -z "$(patches)"; then \
-		cat $(patches) | patch -p1; \
-	fi
-	$(SHELL) ./configure $(config_flags) \
-		$(RULES_CONFIGURE)
-	touch $@
-
-### build the package and clean the build
-
-build:	config build-stamp
-build-stamp:
-	$(MAKE)
-	touch $@
-
-clean:	checkroot
-	rm -f *-stamp
-	-$(MAKE) distclean
-	-if ! test -z "$(patches)"; then \
-		cat $(patches) | patch -R -p1; \
-	fi
-	dh_clean
-
-### misc rules
-
-RULES_MAKE::
-
-binary-indep:	checkroot build
-
-binary-arch::	checkroot build
-	dh_clean
-	dh_installdirs
-
-	$(MAKE) install DESTDIR=$(prefix) $(RULES_MAKEINSTALL)
-	$(MAKE) -f debian/rules RULES_MAKE
-
-	dh_install
-
-	dh_installchangelogs ChangeLog
-	dh_installdocs
-
-	dh_strip
-	dh_compress -X.docbook
-	dh_link
-	dh_fixperms
-	dh_makeshlibs -V
-	dh_installdeb
-	dh_shlibdeps -l$(prefix)/usr/lib
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
-
-binary:	binary-indep binary-arch
-
-checkroot:
-	dh_testdir
-	dh_testroot
-
-.PHONY: binary binary-indep binary-arch clean checkroot build config

Modified: ggz-txt-client/trunk/debian/changelog
===================================================================
--- ggz-txt-client/trunk/debian/changelog	2006-07-23 10:17:07 UTC (rev 33)
+++ ggz-txt-client/trunk/debian/changelog	2006-07-23 18:03:57 UTC (rev 34)
@@ -2,6 +2,8 @@
 
   * Changed maintainer to mailing list
   * Updated standards version
+  * Changed build system to CDBS
+  * Updated to Debhelper level 5
 
  -- Peter Eisentraut <petere at debian.org>  Sun, 23 Jul 2006 11:52:38 +0200
 

Modified: ggz-txt-client/trunk/debian/compat
===================================================================
--- ggz-txt-client/trunk/debian/compat	2006-07-23 10:17:07 UTC (rev 33)
+++ ggz-txt-client/trunk/debian/compat	2006-07-23 18:03:57 UTC (rev 34)
@@ -1 +1 @@
-4
+5

Modified: ggz-txt-client/trunk/debian/control
===================================================================
--- ggz-txt-client/trunk/debian/control	2006-07-23 10:17:07 UTC (rev 33)
+++ ggz-txt-client/trunk/debian/control	2006-07-23 18:03:57 UTC (rev 34)
@@ -4,7 +4,7 @@
 Maintainer: Debian GGZ Maintainers <pkg-ggz-maintainers at lists.alioth.debian.org>
 Uploaders: Josef Spillner <josef at ggzgamingzone.org>, Peter Eisentraut <petere at debian.org>
 Standards-Version: 3.7.2
-Build-Depends: autotools-dev, debhelper (>> 4.8), libggzcore-dev (>= 0.0.12), libncurses5-dev, libreadline5-dev, ggzcore-bin (>= 0.0.12), libggzmod-dev (>= 0.0.12)
+Build-Depends: cdbs, debhelper (>= 5), libggzcore-dev (>= 0.0.12), libncurses5-dev, libreadline5-dev, ggzcore-bin (>= 0.0.12), libggzmod-dev (>= 0.0.12)
 
 Package: ggz-txt-client
 Architecture: any

Modified: ggz-txt-client/trunk/debian/ggz-txt-client.docs
===================================================================
--- ggz-txt-client/trunk/debian/ggz-txt-client.docs	2006-07-23 10:17:07 UTC (rev 33)
+++ ggz-txt-client/trunk/debian/ggz-txt-client.docs	2006-07-23 18:03:57 UTC (rev 34)
@@ -1,4 +1 @@
-AUTHORS
-NEWS
-README
 README.GGZ

Deleted: ggz-txt-client/trunk/debian/ggz-txt-client.install
===================================================================
--- ggz-txt-client/trunk/debian/ggz-txt-client.install	2006-07-23 10:17:07 UTC (rev 33)
+++ ggz-txt-client/trunk/debian/ggz-txt-client.install	2006-07-23 18:03:57 UTC (rev 34)
@@ -1 +0,0 @@
-debian/tmp/usr

Modified: ggz-txt-client/trunk/debian/ggz-txt-client.postinst
===================================================================
--- ggz-txt-client/trunk/debian/ggz-txt-client.postinst	2006-07-23 10:17:07 UTC (rev 33)
+++ ggz-txt-client/trunk/debian/ggz-txt-client.postinst	2006-07-23 18:03:57 UTC (rev 34)
@@ -3,5 +3,3 @@
 ggz-config --install --force --noregistry=/usr/share/ggz/modules/ggz-txt-client
 
 #DEBHELPER#
-
-exit 0

Modified: ggz-txt-client/trunk/debian/ggz-txt-client.prerm
===================================================================
--- ggz-txt-client/trunk/debian/ggz-txt-client.prerm	2006-07-23 10:17:07 UTC (rev 33)
+++ ggz-txt-client/trunk/debian/ggz-txt-client.prerm	2006-07-23 18:03:57 UTC (rev 34)
@@ -3,5 +3,3 @@
 ggz-config --remove --noregistry=/usr/share/ggz/modules/ggz-txt-client
 
 #DEBHELPER#
-
-exit 0

Modified: ggz-txt-client/trunk/debian/rules
===================================================================
--- ggz-txt-client/trunk/debian/rules	2006-07-23 10:17:07 UTC (rev 33)
+++ ggz-txt-client/trunk/debian/rules	2006-07-23 18:03:57 UTC (rev 34)
@@ -1,7 +1,6 @@
 #!/usr/bin/make -f
-# debian/rules file for ggz-txt-client
 
-RULES_CONFIGURE := --disable-debug --enable-noregistry=/usr/share/ggz/modules/ggz-txt-client
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/autotools.mk
 
-include debian/rules.common.mk
-
+DEB_CONFIGURE_EXTRA_FLAGS = --disable-debug --enable-noregistry=/usr/share/ggz/modules/ggz-txt-client

Deleted: ggz-txt-client/trunk/debian/rules.common.mk
===================================================================
--- ggz-txt-client/trunk/debian/rules.common.mk	2006-07-23 10:17:07 UTC (rev 33)
+++ ggz-txt-client/trunk/debian/rules.common.mk	2006-07-23 18:03:57 UTC (rev 34)
@@ -1,99 +0,0 @@
-# Common debian rules
-# imports: RULES_CONFIGURE (and optionally RULES_MAKE)
-# sets for shell: CFLAGS, CXXFLAGS
-
-prefix	:= $(PWD)/debian/tmp
-share	:= /usr/share
-
-### enable cross-compilation
-
-DEB_HOST_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-
-config_flags	:= --prefix=/usr \
-	--sysconfdir=/etc \
-	--localstatedir=/var/lib \
-	--mandir=$(share)/man \
-	--build $(DEB_HOST_GNU_TYPE)
-ifneq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE))
-config_flags	+= --host $(DEB_HOST_GNU_TYPE)
-endif
-
-### setting options for C/C++ compilers
-
-cflags	:= -g -Wall
-ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-cflags	+= -O2
-else
-cflags	+= -O0
-endif
-
-export CFLAGS=$(cflags)
-export CXXFLAGS=$(cflags)
-
-### configure the package
-### the RULES_CONFIGURE come from debian/rules
-
-patches = $(wildcard debian/patches/*.diff)
-
-config:	config-stamp
-config-stamp:
-	dh_testdir
-	if ! test -z "$(patches)"; then \
-		cat $(patches) | patch -p1; \
-	fi
-	$(SHELL) ./configure $(config_flags) \
-		$(RULES_CONFIGURE)
-	touch $@
-
-### build the package and clean the build
-
-build:	config build-stamp
-build-stamp:
-	$(MAKE)
-	touch $@
-
-clean:	checkroot
-	rm -f *-stamp
-	-$(MAKE) distclean
-	-if ! test -z "$(patches)"; then \
-		cat $(patches) | patch -R -p1; \
-	fi
-	dh_clean
-
-### misc rules
-
-RULES_MAKE::
-
-binary-indep:	checkroot build
-
-binary-arch::	checkroot build
-	dh_clean
-	dh_installdirs
-
-	$(MAKE) install DESTDIR=$(prefix) $(RULES_MAKEINSTALL)
-	$(MAKE) -f debian/rules RULES_MAKE
-
-	dh_install
-
-	dh_installchangelogs ChangeLog
-	dh_installdocs
-
-	dh_strip
-	dh_compress -X.docbook
-	dh_link
-	dh_fixperms
-	dh_makeshlibs -V
-	dh_installdeb
-	dh_shlibdeps -l$(prefix)/usr/lib
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
-
-binary:	binary-indep binary-arch
-
-checkroot:
-	dh_testdir
-	dh_testroot
-
-.PHONY: binary binary-indep binary-arch clean checkroot build config

Modified: ggz-utils/trunk/debian/changelog
===================================================================
--- ggz-utils/trunk/debian/changelog	2006-07-23 10:17:07 UTC (rev 33)
+++ ggz-utils/trunk/debian/changelog	2006-07-23 18:03:57 UTC (rev 34)
@@ -2,6 +2,8 @@
 
   * Changed maintainer to mailing list
   * Updated standards version
+  * Changed build system to CDBS
+  * Updated to Debhelper level 5
 
  -- Peter Eisentraut <petere at debian.org>  Sun, 23 Jul 2006 11:52:37 +0200
 

Modified: ggz-utils/trunk/debian/compat
===================================================================
--- ggz-utils/trunk/debian/compat	2006-07-23 10:17:07 UTC (rev 33)
+++ ggz-utils/trunk/debian/compat	2006-07-23 18:03:57 UTC (rev 34)
@@ -1 +1 @@
-4
+5

Modified: ggz-utils/trunk/debian/control
===================================================================
--- ggz-utils/trunk/debian/control	2006-07-23 10:17:07 UTC (rev 33)
+++ ggz-utils/trunk/debian/control	2006-07-23 18:03:57 UTC (rev 34)
@@ -4,7 +4,7 @@
 Maintainer: Debian GGZ Maintainers <pkg-ggz-maintainers at lists.alioth.debian.org>
 Uploaders: Josef Spillner <josef at ggzgamingzone.org>, Peter Eisentraut <petere at debian.org>
 Standards-Version: 3.7.2
-Build-Depends: autotools-dev, debhelper (>> 4.8), libggz-dev (>= 0.0.12), libggzcore-dev (>= 0.0.12)
+Build-Depends: cdbs, debhelper (>= 5), libggz-dev (>= 0.0.12), libggzcore-dev (>= 0.0.12)
 
 Package: ggz-utils
 Architecture: any

Modified: ggz-utils/trunk/debian/ggz-utils.docs
===================================================================
--- ggz-utils/trunk/debian/ggz-utils.docs	2006-07-23 10:17:07 UTC (rev 33)
+++ ggz-utils/trunk/debian/ggz-utils.docs	2006-07-23 18:03:57 UTC (rev 34)
@@ -1,6 +1,3 @@
-AUTHORS
-NEWS
-README
 README.GGZ
 metaserv/metaserv/README.metaserv
 metaserv/minidom/README.minidom

Deleted: ggz-utils/trunk/debian/ggz-utils.install
===================================================================
--- ggz-utils/trunk/debian/ggz-utils.install	2006-07-23 10:17:07 UTC (rev 33)
+++ ggz-utils/trunk/debian/ggz-utils.install	2006-07-23 18:03:57 UTC (rev 34)
@@ -1 +0,0 @@
-debian/tmp/usr

Modified: ggz-utils/trunk/debian/rules
===================================================================
--- ggz-utils/trunk/debian/rules	2006-07-23 10:17:07 UTC (rev 33)
+++ ggz-utils/trunk/debian/rules	2006-07-23 18:03:57 UTC (rev 34)
@@ -1,9 +1,6 @@
 #!/usr/bin/make -f
-# debian/rules file for ggz-utils
 
-RULES_CONFIGURE := --disable-debug
-# --disable-ggzcomm
-# (for 0.0.11 only)
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/autotools.mk
 
-include debian/rules.common.mk
-
+DEB_CONFIGURE_EXTRA_FLAGS = --disable-debug

Deleted: ggz-utils/trunk/debian/rules.common.mk
===================================================================
--- ggz-utils/trunk/debian/rules.common.mk	2006-07-23 10:17:07 UTC (rev 33)
+++ ggz-utils/trunk/debian/rules.common.mk	2006-07-23 18:03:57 UTC (rev 34)
@@ -1,99 +0,0 @@
-# Common debian rules
-# imports: RULES_CONFIGURE (and optionally RULES_MAKE)
-# sets for shell: CFLAGS, CXXFLAGS
-
-prefix	:= $(PWD)/debian/tmp
-share	:= /usr/share
-
-### enable cross-compilation
-
-DEB_HOST_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-
-config_flags	:= --prefix=/usr \
-	--sysconfdir=/etc \
-	--localstatedir=/var/lib \
-	--mandir=$(share)/man \
-	--build $(DEB_HOST_GNU_TYPE)
-ifneq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE))
-config_flags	+= --host $(DEB_HOST_GNU_TYPE)
-endif
-
-### setting options for C/C++ compilers
-
-cflags	:= -g -Wall
-ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-cflags	+= -O2
-else
-cflags	+= -O0
-endif
-
-export CFLAGS=$(cflags)
-export CXXFLAGS=$(cflags)
-
-### configure the package
-### the RULES_CONFIGURE come from debian/rules
-
-patches = $(wildcard debian/patches/*.diff)
-
-config:	config-stamp
-config-stamp:
-	dh_testdir
-	if ! test -z "$(patches)"; then \
-		cat $(patches) | patch -p1; \
-	fi
-	$(SHELL) ./configure $(config_flags) \
-		$(RULES_CONFIGURE)
-	touch $@
-
-### build the package and clean the build
-
-build:	config build-stamp
-build-stamp:
-	$(MAKE)
-	touch $@
-
-clean:	checkroot
-	rm -f *-stamp
-	-$(MAKE) distclean
-	-if ! test -z "$(patches)"; then \
-		cat $(patches) | patch -R -p1; \
-	fi
-	dh_clean
-
-### misc rules
-
-RULES_MAKE::
-
-binary-indep:	checkroot build
-
-binary-arch::	checkroot build
-	dh_clean
-	dh_installdirs
-
-	$(MAKE) install DESTDIR=$(prefix) $(RULES_MAKEINSTALL)
-	$(MAKE) -f debian/rules RULES_MAKE
-
-	dh_install
-
-	dh_installchangelogs ChangeLog
-	dh_installdocs
-
-	dh_strip
-	dh_compress -X.docbook
-	dh_link
-	dh_fixperms
-	dh_makeshlibs -V
-	dh_installdeb
-	dh_shlibdeps -l$(prefix)/usr/lib
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
-
-binary:	binary-indep binary-arch
-
-checkroot:
-	dh_testdir
-	dh_testroot
-
-.PHONY: binary binary-indep binary-arch clean checkroot build config

Modified: libggz/trunk/debian/changelog
===================================================================
--- libggz/trunk/debian/changelog	2006-07-23 10:17:07 UTC (rev 33)
+++ libggz/trunk/debian/changelog	2006-07-23 18:03:57 UTC (rev 34)
@@ -6,6 +6,8 @@
   [ Peter Eisentraut ]
   * Changed maintainer to mailing list
   * Updated standards version
+  * Changed build system to CDBS
+  * Updated to Debhelper level 5
 
  -- Peter Eisentraut <petere at debian.org>  Sun, 23 Jul 2006 11:52:38 +0200
 

Modified: libggz/trunk/debian/compat
===================================================================
--- libggz/trunk/debian/compat	2006-07-23 10:17:07 UTC (rev 33)
+++ libggz/trunk/debian/compat	2006-07-23 18:03:57 UTC (rev 34)
@@ -1 +1 @@
-4
+5

Modified: libggz/trunk/debian/control
===================================================================
--- libggz/trunk/debian/control	2006-07-23 10:17:07 UTC (rev 33)
+++ libggz/trunk/debian/control	2006-07-23 18:03:57 UTC (rev 34)
@@ -4,7 +4,7 @@
 Maintainer: Debian GGZ Maintainers <pkg-ggz-maintainers at lists.alioth.debian.org>
 Uploaders: Josef Spillner <josef at ggzgamingzone.org>, Peter Eisentraut <petere at debian.org>
 Standards-Version: 3.7.2
-Build-Depends: autotools-dev, debhelper (>> 4.8), libgnutls-dev
+Build-Depends: cdbs, debhelper (>= 5), libgnutls-dev
 
 Package: libggz2
 Architecture: any

Modified: libggz/trunk/debian/docs
===================================================================
--- libggz/trunk/debian/docs	2006-07-23 10:17:07 UTC (rev 33)
+++ libggz/trunk/debian/docs	2006-07-23 18:03:57 UTC (rev 34)
@@ -1,4 +1 @@
-AUTHORS
-NEWS
-README
 README.GGZ

Modified: libggz/trunk/debian/rules
===================================================================
--- libggz/trunk/debian/rules	2006-07-23 10:17:07 UTC (rev 33)
+++ libggz/trunk/debian/rules	2006-07-23 18:03:57 UTC (rev 34)
@@ -1,7 +1,7 @@
 #!/usr/bin/make -f
-# debian/rules file for libggz
 
-RULES_CONFIGURE := --with-tls --with-gcrypt --disable-debug
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/autotools.mk
 
-include debian/rules.common.mk
-
+DEB_CONFIGURE_EXTRA_FLAGS = --with-tls --with-gcrypt --disable-debug
+DEB_DH_MAKESHLIBS_ARGS_ALL = -V

Deleted: libggz/trunk/debian/rules.common.mk
===================================================================
--- libggz/trunk/debian/rules.common.mk	2006-07-23 10:17:07 UTC (rev 33)
+++ libggz/trunk/debian/rules.common.mk	2006-07-23 18:03:57 UTC (rev 34)
@@ -1,99 +0,0 @@
-# Common debian rules
-# imports: RULES_CONFIGURE (and optionally RULES_MAKE)
-# sets for shell: CFLAGS, CXXFLAGS
-
-prefix	:= $(PWD)/debian/tmp
-share	:= /usr/share
-
-### enable cross-compilation
-
-DEB_HOST_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-
-config_flags	:= --prefix=/usr \
-	--sysconfdir=/etc \
-	--localstatedir=/var/lib \
-	--mandir=$(share)/man \
-	--build $(DEB_HOST_GNU_TYPE)
-ifneq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE))
-config_flags	+= --host $(DEB_HOST_GNU_TYPE)
-endif
-
-### setting options for C/C++ compilers
-
-cflags	:= -g -Wall
-ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-cflags	+= -O2
-else
-cflags	+= -O0
-endif
-
-export CFLAGS=$(cflags)
-export CXXFLAGS=$(cflags)
-
-### configure the package
-### the RULES_CONFIGURE come from debian/rules
-
-patches = $(wildcard debian/patches/*.diff)
-
-config:	config-stamp
-config-stamp:
-	dh_testdir
-	if ! test -z "$(patches)"; then \
-		cat $(patches) | patch -p1; \
-	fi
-	$(SHELL) ./configure $(config_flags) \
-		$(RULES_CONFIGURE)
-	touch $@
-
-### build the package and clean the build
-
-build:	config build-stamp
-build-stamp:
-	$(MAKE)
-	touch $@
-
-clean:	checkroot
-	rm -f *-stamp
-	-$(MAKE) distclean
-	-if ! test -z "$(patches)"; then \
-		cat $(patches) | patch -R -p1; \
-	fi
-	dh_clean
-
-### misc rules
-
-RULES_MAKE::
-
-binary-indep:	checkroot build
-
-binary-arch::	checkroot build
-	dh_clean
-	dh_installdirs
-
-	$(MAKE) install DESTDIR=$(prefix) $(RULES_MAKEINSTALL)
-	$(MAKE) -f debian/rules RULES_MAKE
-
-	dh_install
-
-	dh_installchangelogs ChangeLog
-	dh_installdocs
-
-	dh_strip
-	dh_compress -X.docbook
-	dh_link
-	dh_fixperms
-	dh_makeshlibs -V
-	dh_installdeb
-	dh_shlibdeps -l$(prefix)/usr/lib
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
-
-binary:	binary-indep binary-arch
-
-checkroot:
-	dh_testdir
-	dh_testroot
-
-.PHONY: binary binary-indep binary-arch clean checkroot build config

Modified: meta-ggz/trunk/debian/changelog
===================================================================
--- meta-ggz/trunk/debian/changelog	2006-07-23 10:17:07 UTC (rev 33)
+++ meta-ggz/trunk/debian/changelog	2006-07-23 18:03:57 UTC (rev 34)
@@ -7,6 +7,8 @@
   [ Peter Eisentraut ]
   * Changed maintainer to mailing list
   * Updated standards version
+  * Changed build system to CDBS
+  * Updated to Debhelper level 5
 
  -- Peter Eisentraut <petere at debian.org>  Sun, 23 Jul 2006 11:52:39 +0200
 

Added: meta-ggz/trunk/debian/compat
===================================================================
--- meta-ggz/trunk/debian/compat	2006-07-23 10:17:07 UTC (rev 33)
+++ meta-ggz/trunk/debian/compat	2006-07-23 18:03:57 UTC (rev 34)
@@ -0,0 +1 @@
+5

Modified: meta-ggz/trunk/debian/control
===================================================================
--- meta-ggz/trunk/debian/control	2006-07-23 10:17:07 UTC (rev 33)
+++ meta-ggz/trunk/debian/control	2006-07-23 18:03:57 UTC (rev 34)
@@ -4,6 +4,7 @@
 Maintainer: Debian GGZ Maintainers <pkg-ggz-maintainers at lists.alioth.debian.org>
 Uploaders: Josef Spillner <josef at ggzgamingzone.org>, Peter Eisentraut <petere at debian.org>
 Standards-Version: 3.7.2
+Build-Depends: cdbs, debhelper (>= 5)
 
 Package: ggz
 Architecture: all

Modified: meta-ggz/trunk/debian/rules
===================================================================
--- meta-ggz/trunk/debian/rules	2006-07-23 10:17:07 UTC (rev 33)
+++ meta-ggz/trunk/debian/rules	2006-07-23 18:03:57 UTC (rev 34)
@@ -1,27 +1,3 @@
 #!/usr/bin/make -f
-# debian/rules file for common debian package
 
-docbase = debian/ggz/usr/share/doc/ggz
-
-clean:
-	rm -rf debian/ggz
-	rm -f debian/files
-
-binary:
-
-binary-arch:
-
-binary-indep:
-
-build:
-	mkdir -p $(docbase)
-	cp debian/copyright $(docbase)
-	cp debian/changelog $(docbase)
-	gzip -9 $(docbase)/changelog
-
-	mkdir -p debian/ggz/DEBIAN
-	cd debian/ggz && find usr/ -type f -exec md5sum {} \; > DEBIAN/md5sums
-	dpkg-gencontrol -Pdebian/ggz -isp
-
-	fakeroot dpkg-deb -b debian/ggz/ ..
-
+include /usr/share/cdbs/1/rules/debhelper.mk




More information about the pkg-ggz-commits mailing list