r15509 - in /packages/unstable/gnet/debian: ./ changelog control control.in copyright libgnet-dev.install libgnet-dev.preinst libgnet2.0-0.files libgnet2.0-0.install patches/ patches/99_ltmain_as-needed.patch rules rules.in shlibs.local
slomo at users.alioth.debian.org
slomo at users.alioth.debian.org
Mon Apr 7 09:25:53 UTC 2008
Author: slomo
Date: Mon Apr 7 09:25:53 2008
New Revision: 15509
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=15509
Log:
* New maintainer (Closes: #472708).
* New upstream version (Closes: #266402).
* Large cleanup:
+ Drop CVS files from diff.gz (Closes: #278037).
+ Don't put files in /usr/share/libgnet2.0-dev (Closes: #272643).
+ Make package binNMU'able (Closes: #359691).
+ Update copyright.
Added:
packages/unstable/gnet/debian/control.in
packages/unstable/gnet/debian/libgnet-dev.install
packages/unstable/gnet/debian/libgnet2.0-0.install
packages/unstable/gnet/debian/patches/
packages/unstable/gnet/debian/patches/99_ltmain_as-needed.patch
Removed:
packages/unstable/gnet/debian/libgnet-dev.preinst
packages/unstable/gnet/debian/libgnet2.0-0.files
packages/unstable/gnet/debian/rules.in
packages/unstable/gnet/debian/shlibs.local
Modified:
packages/unstable/gnet/debian/ (props changed)
packages/unstable/gnet/debian/changelog
packages/unstable/gnet/debian/control
packages/unstable/gnet/debian/copyright
packages/unstable/gnet/debian/rules
Propchange: packages/unstable/gnet/debian/
------------------------------------------------------------------------------
mergeWithUpstream = 1
Modified: packages/unstable/gnet/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gnet/debian/changelog?rev=15509&op=diff
==============================================================================
--- packages/unstable/gnet/debian/changelog (original)
+++ packages/unstable/gnet/debian/changelog Mon Apr 7 09:25:53 2008
@@ -1,3 +1,15 @@
+gnet (2.0.8-1) unstable; urgency=high
+
+ * New maintainer (Closes: #472708).
+ * New upstream version (Closes: #266402).
+ * Large cleanup:
+ + Drop CVS files from diff.gz (Closes: #278037).
+ + Don't put files in /usr/share/libgnet2.0-dev (Closes: #272643).
+ + Make package binNMU'able (Closes: #359691).
+ + Update copyright.
+
+ -- Sebastian Dröge <slomo at debian.org> Mon, 07 Apr 2008 10:34:02 +0200
+
gnet (2.0.7-1) unstable; urgency=low
* New upstream release
Modified: packages/unstable/gnet/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gnet/debian/control?rev=15509&op=diff
==============================================================================
--- packages/unstable/gnet/debian/control (original)
+++ packages/unstable/gnet/debian/control Mon Apr 7 09:25:53 2008
@@ -1,15 +1,21 @@
Source: gnet
Section: libs
Priority: optional
-Maintainer: Takuo KITAME <kitame at debian.org>
-Build-Depends: debhelper (>> 4.0.0), libglib2.0-dev, dbs
-Standards-Version: 3.5.8
+Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>
+Uploaders: Sebastian Dröge <slomo at debian.org>
+Build-Depends: debhelper (>= 5),
+ cdbs,
+ libglib2.0-dev (>= 2.6.0),
+ gtk-doc-utils (>= 1.2),
+ check (>= 0.9.4)
+Standards-Version: 3.7.3
Package: libgnet-dev
-Section: devel
+Section: libdevel
Architecture: any
-Depends: libgnet2.0-0 (= ${Source-Version}), libc6-dev, libglib2.0-dev
-Provides: libgnet2.0-dev
+Depends: libgnet2.0-0 (= ${binary:Version}),
+ libglib2.0-dev (>= 2.6.0),
+ ${misc:Depends}
Description: Developer files for GNet network library
Development files for GNet
.
@@ -29,7 +35,8 @@
Package: libgnet2.0-0
Section: libs
Architecture: any
-Depends: ${shlibs:Depends}
+Depends: ${shlibs:Depends},
+ ${misc:Depends}
Description: GNet network library
GNet is a simple network library. It is written in C, object-oriented,
and built upon glib. It is intended to be small, fast, easy-to-use,
@@ -44,3 +51,4 @@
* IP Multicast
* Internet address abstraction
* IPv6
+
Added: packages/unstable/gnet/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gnet/debian/control.in?rev=15509&op=file
==============================================================================
--- packages/unstable/gnet/debian/control.in (added)
+++ packages/unstable/gnet/debian/control.in Mon Apr 7 09:25:53 2008
@@ -1,0 +1,54 @@
+Source: gnet
+Section: libs
+Priority: optional
+Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>
+Uploaders: @GNOME_TEAM@
+Build-Depends: debhelper (>= 5),
+ cdbs,
+ libglib2.0-dev (>= 2.6.0),
+ gtk-doc-utils (>= 1.2),
+ check (>= 0.9.4)
+Standards-Version: 3.7.3
+
+Package: libgnet-dev
+Section: libdevel
+Architecture: any
+Depends: libgnet2.0-0 (= ${binary:Version}),
+ libglib2.0-dev (>= 2.6.0),
+ ${misc:Depends}
+Description: Developer files for GNet network library
+ Development files for GNet
+ .
+ GNet is a simple network library. It is written in C, object-oriented,
+ and built upon glib. It is intended to be small, fast, easy-to-use,
+ and easy to port. The interface is similar to the interface for
+ Java's network library.
+ .
+ Features:
+ * TCP 'client' sockets
+ * TCP 'server' sockets
+ * Non-blocking TCP sockets
+ * UDP
+ * IP Multicast
+ * Internet address abstraction
+
+Package: libgnet2.0-0
+Section: libs
+Architecture: any
+Depends: ${shlibs:Depends},
+ ${misc:Depends}
+Description: GNet network library
+ GNet is a simple network library. It is written in C, object-oriented,
+ and built upon glib. It is intended to be small, fast, easy-to-use,
+ and easy to port. The interface is similar to the interface for
+ Java's network library.
+ .
+ Features:
+ * TCP 'client' sockets
+ * TCP 'server' sockets
+ * Non-blocking TCP sockets
+ * UDP
+ * IP Multicast
+ * Internet address abstraction
+ * IPv6
+
Modified: packages/unstable/gnet/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gnet/debian/copyright?rev=15509&op=diff
==============================================================================
--- packages/unstable/gnet/debian/copyright (original)
+++ packages/unstable/gnet/debian/copyright Mon Apr 7 09:25:53 2008
@@ -4,12 +4,106 @@
It was downloaded from:
http://www.gnetlibrary.org/
-Upstream Author:
- David A. Helder
+Upstream Authors:
+ Tim-Philipp Müller <tim at centricular.net>
+ David Helder <dhelder at gizmolabs.org>
-This software is copyright (c) 2000 by David A. Helder.
-You are free to distribute this software under the terms of
-the GNU Lesser General Public License.
+ For everything not noted below:
+ Copyright (c) 2000-2005 David Helder <dhelder at gizmolabs.org>
+
+ For examples/echoclient-unix.[ch],
+ examples/echoserver-unix.[ch]:
+ Copyright (C) 2001 Mark Ferlatte
+
+ For examples/xmlrpc/*:
+ Copyright (c) 2006 Dov Grobgeld <dov.grobgeld at gmail.com>
+
+ For tests/check/gnetcheck.c:
+ Copyright (C) 2004,2006 Thomas Vander Stichele <thomas at apestaart dot org>
+ Copyright (C) 2007 Tim-Philipp Müller <tim centricular net>
+
+ For tests/check/gnet/gnetbase64.c:
+ Copyright (C) 2003 Alfred Reibenschuh
+ Copyright (C) 2007 Tim-Philipp Müller <tim centricular net>
+
+ For tests/check/gnet/gnetunpack.c:
+ Copyright (C) 2000, 2002 David Helder
+ Copyright (C) 2007 Tim-Philipp Müller <tim centricular net>
+
+ For tests/check/gnet/gneturi.c,
+ tests/check/gnet/gnetpack.c,
+ tests/check/gnet/gnethash.c,
+ tests/check/gnet/gnetipv6.c,
+ tests/check/gnet/gnetinetaddr.c:
+ Copyright (C) 2001,2002 David Helder
+ Copyright (C) 2007 Tim-Philipp Müller <tim centricular net>
+
+ For tests/check/gnet/gnettcpsocket.c,
+ tests/check/gnet/gnetmisc.c,
+ tests/check/gnet/gnetconn.c,
+ tests/check/gnet/gnetabi.c,
+ tests/check/gnet/gnetconnhttp.c:
+ Copyright (C) 2006-2007 Tim-Philipp Müller <tim centricular net>
+
+ For src/usagi_ifaddrs.[ch]:
+ Copyright (C)2000 YOSHIFUJI Hideaki
+
+ For src/gnet-private.[ch]:
+ Copyright (C) 2000 David Helder
+ Copyright (C) 2000-2003 Andrew Lanoix
+ Copyright (C) 2007 Tim-Philipp Müller <tim centricular net>
+
+ For src/iochannel.[ch],
+ src/udp.[ch],
+ src/gnet.[ch]:
+ Copyright (C) 2000-2003 David Helder
+ Copyright (C) 2000-2003 Andrew Lanoix
+
+ For src/conn-http.[ch]:
+ Copyright (C) 2000-2004 David Helder
+ Copyright (C) 2004 Tim-Philipp Müller <tim centricular net>
+
+ For src/uri.[ch]:
+ Copyright (C) 2000-2003 David Helder, David Bolcsfoldi, Eric Williams
+ Copyright (C) 2007 Tim-Philipp Müller <tim centricular net>
+
+ For src/sha.[ch]:
+ Copyright (C) 1995, A.M. Kuchling
+
+ For src/socks-private.[ch]:
+ Copyright (C) 2001-2002 Marius Eriksen, David Helder
+
+ For src/unix.[ch]:
+ Copyright (C) 2000 David Helder
+ Copyright (C) 2001 Mark Ferlatte
+
+ For src/base64.[ch]:
+ Copyright (C) 2003 Free Software Foundation
+
+ For src/tcp.[ch],
+ src/inetaddr.[ch],
+ src/conn.[ch]:
+ Copyright (C) 2000-2003 David Helder
+ Copyright (C) 2000-2004 Andrew Lanoix
+ Copyright (C) 2007 Tim-Philipp Müller <tim centricular net>
+
+
+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Library General Public
+ License as published by the Free Software Foundation; either
+ version 2 of the License, or (at your option) any later version.
+
+ This library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Library General Public License for more details.
+
+ You should have received a copy of the GNU Library General Public
+ License along with this library; if not, write to the
+ Free Software Foundation, Inc.,
+ 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+
On Debian systems, the complete text of the GNU Lesser General Public
-License can be found in /usr/share/common-licenses/LGPL file.
+License can be found in /usr/share/common-licenses/LGPL-2 file.
Added: packages/unstable/gnet/debian/libgnet-dev.install
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gnet/debian/libgnet-dev.install?rev=15509&op=file
==============================================================================
--- packages/unstable/gnet/debian/libgnet-dev.install (added)
+++ packages/unstable/gnet/debian/libgnet-dev.install Mon Apr 7 09:25:53 2008
@@ -1,0 +1,7 @@
+debian/tmp/usr/include
+debian/tmp/usr/lib/pkgconfig
+debian/tmp/usr/lib/gnet-2.0
+debian/tmp/usr/lib/libgnet-2.0.so
+debian/tmp/usr/lib/libgnet-2.0.a
+debian/tmp/usr/lib/libgnet-2.0.la
+debian/tmp/usr/share/aclocal
Added: packages/unstable/gnet/debian/libgnet2.0-0.install
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gnet/debian/libgnet2.0-0.install?rev=15509&op=file
==============================================================================
--- packages/unstable/gnet/debian/libgnet2.0-0.install (added)
+++ packages/unstable/gnet/debian/libgnet2.0-0.install Mon Apr 7 09:25:53 2008
@@ -1,0 +1,1 @@
+debian/tmp/usr/lib/libgnet-2.0.so.*
Added: packages/unstable/gnet/debian/patches/99_ltmain_as-needed.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gnet/debian/patches/99_ltmain_as-needed.patch?rev=15509&op=file
==============================================================================
--- packages/unstable/gnet/debian/patches/99_ltmain_as-needed.patch (added)
+++ packages/unstable/gnet/debian/patches/99_ltmain_as-needed.patch Mon Apr 7 09:25:53 2008
@@ -1,0 +1,30 @@
+--- ltmain.sh.old 2007-10-09 07:38:25.000000000 +0200
++++ ltmain.sh 2007-10-09 07:39:25.000000000 +0200
+@@ -1794,6 +1794,11 @@
+ arg=`$echo "X$arg" | $Xsed -e "s/^ //"`
+ ;;
+
++ -Wl,--as-needed)
++ deplibs="$deplibs $arg"
++ continue
++ ;;
++
+ -Wl,*)
+ args=`$echo "X$arg" | $Xsed -e "$sed_quote_subst" -e 's/^-Wl,//'`
+ arg=
+@@ -2137,6 +2142,15 @@
+ lib=
+ found=no
+ case $deplib in
++ -Wl,--as-needed)
++ if test "$linkmode,$pass" = "prog,link"; then
++ compile_deplibs="$deplib $compile_deplibs"
++ finalize_deplibs="$deplib $finalize_deplibs"
++ else
++ deplibs="$deplib $deplibs"
++ fi
++ continue
++ ;;
+ -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
+ if test "$linkmode,$pass" = "prog,link"; then
+ compile_deplibs="$deplib $compile_deplibs"
Modified: packages/unstable/gnet/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gnet/debian/rules?rev=15509&op=diff
==============================================================================
--- packages/unstable/gnet/debian/rules (original)
+++ packages/unstable/gnet/debian/rules Mon Apr 7 09:25:53 2008
@@ -1,87 +1,16 @@
#!/usr/bin/make -f
-# Sample debian/rules that uses debhelper.
-# GNU copyright 1997 to 1999 by Joey Hess.
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
+include /usr/share/cdbs/1/class/autotools.mk
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/rules/simple-patchsys.mk
+include /usr/share/cdbs/1/rules/utils.mk
+include /usr/share/cdbs/1/class/gnome.mk
+include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk
+-include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
-# This is the debhelper compatability version to use.
-export DH_COMPAT=3
+LDFLAGS += -Wl,-z,defs -Wl,-O1 -Wl,--as-needed
-SCRIPT_DIR = /usr/share/dbs
+SHLIBVER := 2.0.3
-VERSION = $(shell dpkg-parsechangelog | grep Version | sed -e 's/Version: //g' -e 's/-[A-Za-z0-9.]*$$//g')
-SONAME = 0
-TAG = 2.0-$(SONAME)
+DEB_DH_MAKESHLIBS_ARGS_libgnet2.0-0 = -V 'libgnet2.0-0 (>= $(SHLIBVER))'
-# the dbs rules
-TAR_DIR := gnet-${VERSION}
-include $(SCRIPT_DIR)/dbs-build.mk
-
-# dpkg-arch rules
-ifeq (,$(DEB_BUILD_GNU_TYPE))
- include $(SCRIPT_DIR)/dpkg-arch.mk
-endif
-
-configure: $(STAMP_DIR)/configure
-$(STAMP_DIR)/configure: $(patched)
- dh_testdir
-
- cd $(BUILD_TREE) && ./configure --prefix=/usr \
- --mandir=\$${prefix}/share/man \
- --infodir=\$${prefix}/share/info --enable-glib2
-
- touch $@
-
-build: configure $(STAMP_DIR)/build
-$(STAMP_DIR)/build:
- dh_testdir
-
- cd $(BUILD_TREE) && $(MAKE)
-
- touch $@
-
-clean:
- dh_testdir
- rm -rf $(STAMP_DIR) build-tree*
- perl $(SCRIPT_DIR)/dbs_split clean
- dh_clean
-
-install: build
- dh_testdir
- dh_testroot
- dh_clean -k -plibgnet-dev -plibgnet$(TAG)
- dh_installdirs
-
- cd $(BUILD_TREE) && $(MAKE) install prefix=$(CURDIR)/debian/libgnet-dev/usr
- dh_movefiles -plibgnet$(TAG) --sourcedir=debian/libgnet-dev
-
-# Build architecture-independent files here.
-binary-indep: build install
-# We have nothing to do by default.
-
-# Build architecture-dependent files here.
-binary-arch: build install
- dh_testdir
- dh_testroot
- dh_installdocs
- dh_installdocs -plibgnet$(TAG) $(BUILD_TREE)/NEWS $(BUILD_TREE)/README $(BUILD_TREE)/TODO $(BUILD_TREE)/HACKING $(BUILD_TREE)/AUTHORS
-
- dh_installexamples -plibgnet$(TAG) $(BUILD_TREE)/examples/*.[ch] $(BUILD_TREE)/examples/Makefile
- dh_installchangelogs -plibgnet$(TAG) $(BUILD_TREE)/ChangeLog
- rm -r $(CURDIR)/debian/libgnet-dev/usr/share/doc/libgnet-dev
- dh_link -plibgnet-dev /usr/share/doc/libgnet$(TAG) /usr/share/doc/libgnet-dev
- dh_strip
- dh_compress
- dh_fixperms
-# You may want to make some executables suid here.
- dh_makeshlibs -plibgnet$(TAG) -V'libgnet$(TAG) (>= $(VERSION))'
- cat debian/*/DEBIAN/shlibs > debian/shlibs.local
- dh_installdeb
- dh_shlibdeps
- dh_gencontrol
- dh_md5sums
- dh_builddeb
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install configure
More information about the pkg-gnome-commits
mailing list