[pkg-ggz-commits] r384 - in trunk: . ggz-base-libs ggz-base-libs/debian ggz-base-libs/debian/patches
josef-guest at alioth.debian.org
josef-guest at alioth.debian.org
Sat Oct 25 20:02:15 UTC 2008
Author: josef-guest
Date: 2008-10-25 20:02:15 +0000 (Sat, 25 Oct 2008)
New Revision: 384
Added:
trunk/ggz-base-libs/
trunk/ggz-base-libs/debian/libggz-dev.install
trunk/ggz-base-libs/debian/libggz2.install
Removed:
trunk/ggz-base-libs/debian/patches/ggzcore-catalog-name.patch
trunk/ggz-base-libs/po/
trunk/ggz-client-libs/
trunk/libggz/
Modified:
trunk/ggz-base-libs/debian/changelog
trunk/ggz-base-libs/debian/control
trunk/ggz-base-libs/debian/copyright
trunk/ggz-base-libs/debian/ggzcore-bin.install
trunk/ggz-base-libs/debian/rules
trunk/ggz-base-libs/debian/watch
Log:
- merge ggz-client-libs and libggz into ggz-base-libs, reflecting the same merge upstream
Copied: trunk/ggz-base-libs (from rev 382, trunk/ggz-client-libs)
Property changes on: trunk/ggz-base-libs
___________________________________________________________________
Name: svn:mergeinfo
+
Modified: trunk/ggz-base-libs/debian/changelog
===================================================================
--- trunk/ggz-client-libs/debian/changelog 2008-08-28 19:16:41 UTC (rev 382)
+++ trunk/ggz-base-libs/debian/changelog 2008-10-25 20:02:15 UTC (rev 384)
@@ -1,3 +1,10 @@
+ggz-base-libs (0.99.5pre-1) experimental; urgency=low
+
+ * New experimental upstream version
+ - Merges ggz-client-libs and libggz
+
+ -- Josef Spillner <josef at ggzgamingzone.org> Sat, 25 Oct 2008 21:39:48 +0200
+
ggz-client-libs (0.0.14.1-1) unstable; urgency=low
* New upstream release
Modified: trunk/ggz-base-libs/debian/control
===================================================================
--- trunk/ggz-client-libs/debian/control 2008-08-28 19:16:41 UTC (rev 382)
+++ trunk/ggz-base-libs/debian/control 2008-10-25 20:02:15 UTC (rev 384)
@@ -1,12 +1,12 @@
-Source: ggz-client-libs
+Source: ggz-base-libs
Section: libs
Priority: optional
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.3
Build-Depends: cdbs, debhelper (>= 5), libggz-dev (>= 0.0.14), libexpat1-dev (>= 1.95.6)
-Vcs-Svn: svn://svn.debian.org/pkg-ggz/trunk/ggz-client-libs/
-Vcs-Browser: http://svn.debian.org/wsvn/pkg-ggz/trunk/ggz-client-libs/
+Vcs-Svn: svn://svn.debian.org/pkg-ggz/trunk/ggz-base-libs/
+Vcs-Browser: http://svn.debian.org/wsvn/pkg-ggz/trunk/ggz-base-libs/
Homepage: http://www.ggzgamingzone.org/
Package: libggzcore9
@@ -86,3 +86,32 @@
.
This package is part of the GGZ Gaming Zone, a multiuser networked
gaming environment.
+
+Package: libggz2
+Architecture: any
+Depends: ${shlibs:Depends}
+Description: GGZ Gaming Zone: common utilities library
+ The libggz library handles network, configuration file and data
+ structure management functions as well as several convenience wrappers
+ around glibc functions.
+ .
+ This package provides the run-time library of base functions common to
+ several GGZ clients and servers.
+ .
+ This package is part of the GGZ Gaming Zone, a multiuser networked
+ gaming environment.
+
+Package: libggz-dev
+Architecture: any
+Section: libdevel
+Depends: libggz2 (= ${binary:Version}), libgnutls-dev
+Description: GGZ Gaming Zone: common utilities library - development files
+ The libggz library handles network, configuration file and data
+ structure management functions as well as several convenience wrappers
+ around glibc functions.
+ .
+ This package provides the header files and static libraries needed for
+ development with libggz in the C programming language.
+ .
+ This package is part of the GGZ Gaming Zone, a multiuser networked
+ gaming environment.
Modified: trunk/ggz-base-libs/debian/copyright
===================================================================
--- trunk/ggz-client-libs/debian/copyright 2008-08-28 19:16:41 UTC (rev 382)
+++ trunk/ggz-base-libs/debian/copyright 2008-10-25 20:02:15 UTC (rev 384)
@@ -1,4 +1,4 @@
-This is the Debian GNU/Linux prepackaged version of ggz-client-libs,
+This is the Debian GNU/Linux prepackaged version of ggz-base-libs,
the GGZ client and game front-end support libraries & utilities.
This software was first packaged for Debian by Stephen Zander
@@ -11,13 +11,13 @@
Copyright:
The GGZ Gaming Zone
- Copyright (C) 1999-2006 The GGZ Gaming Zone Development Team
+ Copyright (C) 1999-2008 The GGZ Gaming Zone Development Team
Contact the upstream authors at <ggz-dev at mail.ggzgamingzone.org>
-ggz-client-libs is licenced under the GNU Lesser General Public Licence. See
+ggz-base-libs is licenced under the GNU Lesser General Public Licence. See
/usr/share/common-licenses/LGPL for details.
-The runtime binaries ggz-config, ggz-wrapper and ggzwrap are licenced under
+The runtime binaries ggz-config and and ggzwrap are licenced under
the GNU General Public Licence. See /usr/share/common-licenses/GPL for
details.
Modified: trunk/ggz-base-libs/debian/ggzcore-bin.install
===================================================================
--- trunk/ggz-client-libs/debian/ggzcore-bin.install 2008-08-28 19:16:41 UTC (rev 382)
+++ trunk/ggz-base-libs/debian/ggzcore-bin.install 2008-10-25 20:02:15 UTC (rev 384)
@@ -1,9 +1,6 @@
debian/tmp/usr/bin/ggz-config
-debian/tmp/usr/bin/ggz-wrapper
debian/tmp/usr/share/man/man6/ggz-config.6
-debian/tmp/usr/share/man/man6/ggz-wrapper.6
debian/tmp/usr/share/man/man5/ggz.modules.5
debian/tmp/usr/share/desktop-directories
debian/tmp/usr/share/locale/*/*/ggz-config.mo
debian/tmp/etc/xdg
-debian/tmp/usr/lib/ggz
Added: trunk/ggz-base-libs/debian/libggz-dev.install
===================================================================
--- trunk/ggz-base-libs/debian/libggz-dev.install (rev 0)
+++ trunk/ggz-base-libs/debian/libggz-dev.install 2008-10-25 20:02:15 UTC (rev 384)
@@ -0,0 +1,5 @@
+debian/tmp/usr/include/ggz.h
+debian/tmp/usr/include/ggz_common.h
+debian/tmp/usr/lib/libggz.a
+debian/tmp/usr/lib/libggz.la
+debian/tmp/usr/lib/libggz.so
Added: trunk/ggz-base-libs/debian/libggz2.install
===================================================================
--- trunk/ggz-base-libs/debian/libggz2.install (rev 0)
+++ trunk/ggz-base-libs/debian/libggz2.install 2008-10-25 20:02:15 UTC (rev 384)
@@ -0,0 +1 @@
+debian/tmp/usr/lib/libggz.so.*
Deleted: trunk/ggz-base-libs/debian/patches/ggzcore-catalog-name.patch
===================================================================
--- trunk/ggz-client-libs/debian/patches/ggzcore-catalog-name.patch 2008-08-28 19:16:41 UTC (rev 382)
+++ trunk/ggz-base-libs/debian/patches/ggzcore-catalog-name.patch 2008-10-25 20:02:15 UTC (rev 384)
@@ -1,35 +0,0 @@
-diff -ur ggz-client-libs-0.0.14.orig/ggzcore/init.c ggz-client-libs-0.0.14/ggzcore/init.c
---- ggz-client-libs-0.0.14.orig/ggzcore/init.c 2007-01-16 19:50:52.000000000 +0100
-+++ ggz-client-libs-0.0.14/ggzcore/init.c 2007-06-16 14:22:07.000000000 +0200
-@@ -59,7 +59,7 @@
- #endif
-
- /* This catalog must be preloaded by applications */
-- bindtextdomain("ggzcore", PREFIX "/share/locale");
-+ bindtextdomain("ggzcore9", PREFIX "/share/locale");
-
- /* Initialize various systems */
- if (options.flags & GGZ_OPT_MODULES)
-diff -ur ggz-client-libs-0.0.14.orig/po/ggzcore/Makefile.am ggz-client-libs-0.0.14/po/ggzcore/Makefile.am
---- ggz-client-libs-0.0.14.orig/po/ggzcore/Makefile.am 2007-01-16 19:50:52.000000000 +0100
-+++ ggz-client-libs-0.0.14/po/ggzcore/Makefile.am 2007-06-16 14:24:21.000000000 +0200
-@@ -1,6 +1,6 @@
- EXTRA_DIST = ggzcore.pot de.po
-
--CATALOG = ggzcore
-+CATALOG = ggzcore9
- POSOURCES = $(top_srcdir)/ggzcore/*.c
-
- include $(top_srcdir)/m4/i18n.mk
-diff -ur ggz-client-libs-0.0.14.orig/po/ggzcore/Makefile.in ggz-client-libs-0.0.14/po/ggzcore/Makefile.in
---- ggz-client-libs-0.0.14.orig/po/ggzcore/Makefile.in 2007-01-16 20:02:09.000000000 +0100
-+++ ggz-client-libs-0.0.14/po/ggzcore/Makefile.in 2007-06-16 14:24:34.000000000 +0200
-@@ -184,7 +184,7 @@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
- EXTRA_DIST = ggzcore.pot $(pofiles)
--CATALOG = ggzcore
-+CATALOG = ggzcore9
- POSOURCES = $(top_srcdir)/ggzcore/*.c
- builddir = $(top_builddir)/$(subdir)
- POFILES = $(srcdir)/*.po
Modified: trunk/ggz-base-libs/debian/rules
===================================================================
--- trunk/ggz-client-libs/debian/rules 2008-08-28 19:16:41 UTC (rev 382)
+++ trunk/ggz-base-libs/debian/rules 2008-10-25 20:02:15 UTC (rev 384)
@@ -4,6 +4,6 @@
include /usr/share/cdbs/1/class/autotools.mk
include /usr/share/cdbs/1/rules/simple-patchsys.mk
-DEB_CONFIGURE_EXTRA_FLAGS = --disable-debug
+DEB_CONFIGURE_EXTRA_FLAGS = --with-tls --with-gcrypt --disable-debug
DEB_DH_MAKESHLIBS_ARGS_ALL = -V
DEB_SHLIBDEPS_INCLUDE = $(DEB_DESTDIR)/usr/lib
Modified: trunk/ggz-base-libs/debian/watch
===================================================================
--- trunk/ggz-client-libs/debian/watch 2008-08-28 19:16:41 UTC (rev 382)
+++ trunk/ggz-base-libs/debian/watch 2008-10-25 20:02:15 UTC (rev 384)
@@ -1,2 +1,2 @@
version=3
-http://ftp.ggzgamingzone.org/pub/ggz/([0-9.]+)/ggz-client-libs-([0-9.]+).tar.gz
+http://ftp.ggzgamingzone.org/pub/ggz/([0-9.]+)/ggz-base-libs-([0-9.]+).tar.gz
More information about the pkg-ggz-commits
mailing list