--- libsigc++-2.0-2.0.17.orig/sigc++/macros/signal.h.m4 +++ libsigc++-2.0-2.0.17/sigc++/macros/signal.h.m4 @@ -484,6 +484,12 @@ //do not allow a typedef to have the same name as a class in the typedef's definition. //For Sun Forte CC 5.7 (SUN Workshop 10), comment this out to fix the build. #define SIGC_TYPEDEF_REDEFINE_ALLOWED 1 + + #ifdef __GNUC__ + #if (__GNUC__ > 4) || (__GNUC__ == 4 && __GNUC_MINOR__ >= 3) + #undef SIGC_TYPEDEF_REDEFINE_ALLOWED + #endif + #endif #endif namespace sigc { --- libsigc++-2.0-2.0.17.orig/sigc++/signal.h +++ libsigc++-2.0-2.0.17/sigc++/signal.h @@ -19,6 +19,12 @@ //do not allow a typedef to have the same name as a class in the typedef's definition. //For Sun Forte CC 5.7 (SUN Workshop 10), comment this out to fix the build. #define SIGC_TYPEDEF_REDEFINE_ALLOWED 1 + + #ifdef __GNUC__ + #if (__GNUC__ > 4) || (__GNUC__ == 4 && __GNUC_MINOR__ >= 3) + #undef SIGC_TYPEDEF_REDEFINE_ALLOWED + #endif + #endif #endif namespace sigc { --- libsigc++-2.0-2.0.17.orig/tests/test_copy_invalid_slot.cc +++ libsigc++-2.0-2.0.17/tests/test_copy_invalid_slot.cc @@ -1,4 +1,6 @@ #include +#include +#include #include void Foo(sigc::trackable &t) {} --- libsigc++-2.0-2.0.17.orig/debian/control +++ libsigc++-2.0-2.0.17/debian/control @@ -0,0 +1,54 @@ +Source: libsigc++-2.0 +Section: devel +Priority: optional +Maintainer: Ubuntu Core developers +XSBC-Original-Maintainer: Daniel Burrows +Standards-Version: 3.6.2.0 +Build-Depends: debhelper (>=4.0.0), m4, g++ (>= 3:3.2.0) + +Package: libsigc++-2.0-0c2a +Section: libs +Depends: ${shlibs:Depends} +Conflicts: libsigc++-1.9-0, libsigc++-2.0-0, libsigc++-2.0-0c2 +Replaces: libsigc++-1.9-0, libsigc++-2.0-0, libsigc++-2.0-0c2 +Architecture: any +Description: type-safe Signal Framework for C++ - runtime + This library implements a full callback system for use in widget + libraries, abstract interfaces, and general programming. It provides + the ability to connect an abstract callback to a class method, + function, or function object, and contains adaptor classes for the + connection of dissimilar callbacks. + . + These are the runtime files for libsigc++, needed only if you wish to + run software which depends on it. + +Package: libsigc++-2.0-dev +Section: libdevel +Conflicts: libsigc++-1.9-dev +Replaces: libsigc++-1.9-dev +Depends: libsigc++-2.0-${Soname} (= ${Source-Version}), pkg-config, libstdc++-dev +Suggests: libsigc++-2.0-doc +Architecture: any +Description: type-safe Signal Framework for C++ - development files + This library implements a full callback system for use in widget + libraries, abstract interfaces, and general programming. It provides + the ability to connect an abstract callback to a class method, + function, or function object, and contains adaptor classes for the + connection of dissimilar callbacks. + . + These are the development files for libsigc++, needed only if you + wish to write software which uses it. + +Package: libsigc++-2.0-doc +Section: doc +Recommends: libsigc++-2.0-dev +Architecture: all +Description: type-safe Signal Framework for C++ - reference documentation + This library implements a full callback system for use in widget + libraries, abstract interfaces, and general programming. It provides + the ability to connect an abstract callback to a class method, + function, or function object, and contains adaptor classes for the + connection of dissimilar callbacks. + . + This package contains the reference documentation for libsigc++, + needed only if you wish to write software which uses it. --- libsigc++-2.0-2.0.17.orig/debian/rules +++ libsigc++-2.0-2.0.17/debian/rules @@ -0,0 +1,102 @@ +#!/usr/bin/make -f +# -*- makefile -*- + +# Use debhelper V. 3 +export DH_COMPAT=4 + +# The current SONAME (FIXME: can we autodetect this?) +SONAME=0c2a + +# Files whose name varies with the soname. For each entry x of this +# variable, the file debian/libsigc++-2.0-$(SONAME).$(x) will be +# created from debian/libsigc++-2.0.soname.$(x) file. +SONAME_SPECIFIC_EXTS=install + +b := $(shell pwd)/debian/tmp + +binary: binary-arch binary-indep + +binary-arch: binary-arch-stamp +binary-arch-stamp: install + dh_testdir -a + dh_testroot -a + dh_compress -a + dh_fixperms -a + dh_makeshlibs -a -V'libsigc++-2.0-$(SONAME) (>= 2.0.2)' + dh_installdeb -a + dh_shlibdeps -a + dh_strip -a + dh_gencontrol -a -- -VSoname=$(SONAME) + dh_md5sums -a + dh_builddeb -a + + touch binary-arch-stamp + +binary-indep: binary-indep-stamp +binary-indep-stamp: install + dh_compress -i -Xdoxygen_tags + dh_fixperms -i + dh_installdeb -i + dh_strip -i + dh_gencontrol -i -- -VSoname=$(SONAME) + dh_md5sums -i + dh_builddeb -i + + touch binary-indep-stamp + +build: build-stamp +build-stamp: config + dh_testdir -a + #cd builddir && perl -i -pe 's/^(hardcode_libdir_flag_spec\s*=\s*).+$$/$$1" -D__LIBTOOL_IS_A_FOOL__ "/' libtool + cd builddir && $(MAKE) + touch build-stamp + +clean: clean-arrange + dh_testdir + dh_testroot + if [ -d builddir ]; then rm -rf builddir; fi + #-for x in debian/*.patch; do patch --dry-run -fRp1 < $$x > /dev/null&&\ + # patch -fRp1 < $$x ; done + dh_clean build-stamp config-stamp install-stamp debian/shlibs.local + +config: config-stamp +config-stamp: + dh_testdir + #for x in debian/*.patch; do patch --dry-run -fp1 < $$x > /dev/null && \ + # patch -fp1 < $$x; done + test -d builddir || mkdir builddir + cd builddir && ../configure --prefix=/usr + touch config-stamp + +install: install-stamp +install-stamp: build arrange + dh_testdir + dh_installdirs + + # Include and .pc files are in install-data, not install-exec, so we + # need to do a full install. + cd builddir && $(MAKE) prefix=$(b)/usr install + # Rename the documentation... + mv $(b)/usr/share/doc/libsigc-2.0 $(b)/usr/share/doc/libsigc++-2.0-doc + dh_install --sourcedir=debian/tmp + + dh_installdocs + dh_installexamples -plibsigc++-2.0-doc examples/*.cc + dh_installchangelogs ChangeLog + + touch install-stamp + +clean-arrange: + dh_testdir + dh_testroot + if [ -f debian/soname-specific-files ]; then rm -f `cat debian/soname-specific-files`; rm debian/soname-specific-files; fi + +# This rule adjusts the soname-specific files. +arrange: arrange-stamp +arrange-stamp: install clean-arrange + for x in $(SONAME_SPECIFIC_EXTS); do echo "debian/libsigc++-2.0-$(SONAME).$$x" > debian/soname-specific-files; done + #echo "debian/libsigc++-2.0-$(SONAME).postinst" > debian/soname-specific-files + for x in $(SONAME_SPECIFIC_EXTS); do cp -v debian/libsigc++-2.0.soname.$$x debian/libsigc++-2.0-$(SONAME).$$x; done + touch arrange-stamp + +.PHONY: arrange build clean-arrange binary-indep binary-arch binary install force-clean --- libsigc++-2.0-2.0.17.orig/debian/50autoconf.patch +++ libsigc++-2.0-2.0.17/debian/50autoconf.patch @@ -0,0 +1,11 @@ +*** libsigc++-1.0.3/sigc++.m4 Tue Mar 6 08:37:31 2001 +--- libsigc++-1.0.3/sigc++.m4~ Sat Jun 9 08:35:43 2001 +*************** +*** 107,112 **** +--- 107,113 ---- + AC_MSG_CHECKING(if libsigc++ sane) + ac_save_CXXFLAGS="$CXXFLAGS" + ac_save_LIBS="$LIBS" ++ ac_exeext="" + CXXFLAGS="$CXXFLAGS $SIGC_CFLAGS" + LIBS="$LIBS $SIGC_LIBS" --- libsigc++-2.0-2.0.17.orig/debian/changelog +++ libsigc++-2.0-2.0.17/debian/changelog @@ -0,0 +1,395 @@ +libsigc++-2.0 (2.0.17-2ubuntu3) hardy; urgency=low + + * Rebuild with recent g++ compiler version. + + -- Matthias Klose Thu, 03 Apr 2008 11:24:49 +0000 + +libsigc++-2.0 (2.0.17-2ubuntu2) gutsy; urgency=low + + * Trigger rebuild for hppa. + + -- LaMont Jones Tue, 02 Oct 2007 06:32:46 -0600 + +libsigc++-2.0 (2.0.17-2ubuntu1) gutsy; urgency=low + + * Unset SIGC_TYPEDEF_REDEFINE_ALLOWED when building with g++-4.3. + * Fix build failure in tests with g++-4.3. + * Set Ubuntu maintainer address. + + -- Matthias Klose Tue, 11 Sep 2007 18:00:32 +0000 + +libsigc++-2.0 (2.0.17-2build1) feisty; urgency=low + + * Rebuild for changes in the amd64 toolchain. + + -- Matthias Klose Mon, 5 Mar 2007 01:21:29 +0000 + +libsigc++-2.0 (2.0.17-2) unstable; urgency=low + + * Fix Description. (Closes: #387761) + + -- Daniel Burrows Thu, 21 Sep 2006 21:24:47 -0700 + +libsigc++-2.0 (2.0.17-1) unstable; urgency=low + + * New upstream release + + -- Daniel Burrows Wed, 30 Aug 2006 20:38:36 -0700 + +libsigc++-2.0 (2.0.16-3) unstable; urgency=low + + * Comment out both lines of the patch munging junk, to support + the new make version. (Closes: #350697) + + -- Daniel Burrows Sun, 5 Feb 2006 10:37:44 -0800 + +libsigc++-2.0 (2.0.16-2) unstable; urgency=low + + * Rebuild for another C++ transition. (Closes: #339219) + + -- Daniel Burrows Sat, 26 Nov 2005 14:28:22 -0600 + +libsigc++-2.0 (2.0.16-1) unstable; urgency=low + + * New upstream release + + -- Daniel Burrows Fri, 30 Sep 2005 12:21:17 -0700 + +libsigc++-2.0 (2.0.10-3) unstable; urgency=low + + * Fix dh_makeshlibs call (it WOULD be the one that I didn't check that + needed to be changed; Closes: #317682). + + -- Daniel Burrows Sun, 10 Jul 2005 14:34:54 -0400 + +libsigc++-2.0 (2.0.10-2) unstable; urgency=low + + * C++ transition. + + -- Daniel Burrows Tue, 5 Jul 2005 19:14:28 -0400 + +libsigc++-2.0 (2.0.10-1) unstable; urgency=low + + * New upstream release + + -- Daniel Burrows Tue, 22 Feb 2005 11:26:44 -0500 + +libsigc++-2.0 (2.0.9-2) unstable; urgency=high + + * Upload with urgency=high to get the broken 2.0.7-1 out of testing. + + -- Daniel Burrows Mon, 7 Feb 2005 10:20:35 -0500 + +libsigc++-2.0 (2.0.9-1) unstable; urgency=low + + * New upstream release. + - Fixes the warnings generated by the sigc++ header files. + (Closes: #292696) + * Include a watch file. + + -- Daniel Burrows Sun, 6 Feb 2005 17:38:15 -0500 + +libsigc++-2.0 (2.0.7-1) unstable; urgency=low + + * New upstream release + + * start the short descriptions with lower-case letters + + -- Daniel Burrows Wed, 26 Jan 2005 10:18:40 -0500 + +libsigc++-2.0 (2.0.6-1) unstable; urgency=low + + * New upstream release. + - Fixes compilation problems with g++-3.4. (Closes: #278985) + + -- Daniel Burrows Sat, 30 Oct 2004 16:37:25 -0400 + +libsigc++-2.0 (2.0.4-1) unstable; urgency=low + + * New upstream release. Most of the changes in this release pertain to + non-Debian systems, so this isn't particularly critical (there is + one bug involving optimization that could theoretically appear + on Debian). + + -- Daniel Burrows Tue, 31 Aug 2004 18:53:56 -0400 + +libsigc++-2.0 (2.0.3-4) unstable; urgency=low + + * Don't compress doxygen tags...again. + + -- Daniel Burrows Wed, 18 Aug 2004 10:07:45 -0400 + +libsigc++-2.0 (2.0.3-3) unstable; urgency=low + + * Revert all the autotools junk back to the default, and ONLY regenerate + the configure script this time. (Closes: #266483) + + -- Daniel Burrows Wed, 18 Aug 2004 09:35:34 -0400 + +libsigc++-2.0 (2.0.3-2) unstable; urgency=low + + * The "Die autobuilders die die die!" release. + + * Regenerate the configure script (Closes: #251989, #254174). + + * Don't compress the doxygen tags file (Closes: #244229). + + -- Daniel Burrows Tue, 17 Aug 2004 10:39:46 -0400 + +libsigc++-2.0 (2.0.3-1) unstable; urgency=low + + * New upstream release. NOTE: the previous release (2.0.2) had a nasty + bug which can cause programs compiled against it to crash. Any programs + compiled with 2.0.2 should be recompiled with this version of libsigc++. + + -- Daniel Burrows Sun, 30 May 2004 21:51:38 -0400 + +libsigc++-2.0 (2.0.2-1) unstable; urgency=low + + * New upstream release + + * Make shlibs require at least this version, because the API/ABI changed. + (the behavior of accumulators is different in some cases) + + -- Daniel Burrows Sun, 23 May 2004 12:49:39 -0400 + +libsigc++-2.0 (2.0.1-3) unstable; urgency=low + + * Fix an override disparity. + + -- Daniel Burrows Mon, 10 May 2004 14:26:19 -0400 + +libsigc++-2.0 (2.0.1-2) unstable; urgency=low + + * Make sure that everything actually gets installed where it ought to; + in particular, it's now possible to build programs against sigc++. + (Closes: #248279) + + * Conflict/Replace the libsigc++-1.9 packages. (Closes: #248280) + + * Remove a bunch of broken and useless links in /usr/share/doc. + + -- Daniel Burrows Mon, 10 May 2004 13:30:35 -0400 + +libsigc++-2.0 (2.0.1-1) unstable; urgency=low + + * New upstream release. + + -- Daniel Burrows Wed, 28 Apr 2004 18:34:36 -0400 + +libsigc++-2.0 (2.0.0-1) unstable; urgency=low + + * New upstream release. This is the first stable release of sigc++ 2.0. + + * This package version addresses bug #244229 in libsigc++-1.9, which + will be removed from unstable as it is superseded by 2.0. + + -- Daniel Burrows Mon, 26 Apr 2004 09:02:17 -0400 + +libsigc++-1.9 (1.9.15-1) unstable; urgency=low + + * New upstream release + + -- Daniel Burrows Fri, 27 Feb 2004 21:22:28 -0500 + +libsigc++-1.9 (1.9.14-1) unstable; urgency=low + + * New upstream release + + -- Daniel Burrows Tue, 24 Feb 2004 13:23:30 -0500 + +libsigc++-1.2 (1.2.5-1) unstable; urgency=low + + * New upstream release + - Should really fix libtool problems everywhere (Closes: #185395) + * Description cleanup (remove editorializing, extraneous information, + etc) + + -- Daniel Burrows Fri, 16 May 2003 09:56:16 -0400 + +libsigc++-1.2 (1.2.3-2) unstable; urgency=low + + * Right. Conflict with libsigc++-1.2-5, and delete an accidentally + duplicated changelog entry. (Closes: nothing yet, but I'm sure + someone will file without checking Incoming) + + -- Daniel Burrows Thu, 9 Jan 2003 17:15:56 -0500 + +libsigc++-1.2 (1.2.3-1) unstable; urgency=low + + * New upstream release + * Built with g++-3.2. + + -- Daniel Burrows Thu, 9 Jan 2003 08:58:13 -0500 + +libsigc++-1.2 (1.2.2-1) unstable; urgency=low + + * New upstream release (Closes: #174722) + * The documentation got messed with while I wasn't looking, handle it + properly (thanks, Marcelo) + + -- Daniel Burrows Wed, 1 Jan 2003 17:25:32 -0500 + +libsigc++-1.2 (1.2.1-2) unstable; urgency=low + + * Update config.sub and config.guess (Closes: #167460) + + -- Daniel Burrows Mon, 4 Nov 2002 08:49:36 -0500 + +libsigc++-1.2 (1.2.1-1) unstable; urgency=low + + * New upstream release + + -- Daniel Burrows Wed, 23 Oct 2002 08:46:38 -0400 + +libsigc++-1.2 (1.2.0-1) unstable; urgency=low + + * New upstream release. This is, at long last, the first release in the + 1.2 series. + + -- Daniel Burrows Thu, 10 Oct 2002 18:51:34 -0400 + +libsigc++-1.1 (1.1.13-1) unstable; urgency=low + + * New upstream release (release candidate for 1.2, soname bump) + + -- Daniel Burrows Mon, 29 Jul 2002 11:07:59 -0400 + +libsigc++-1.1 (1.1.11-1) unstable; urgency=low + + * New upstream release (Closes: #150388) + * The development package now depends on libstdc++-dev. (it seems silly + to install it unless you have g++ and hence libstdc++-dev, but I don't + think it hurts) + + -- Daniel Burrows Sat, 15 Jun 2002 12:47:39 -0400 + +libsigc++-1.1 (1.1.10-1) unstable; urgency=low + + * New upstream release + + * This release requires pkg-config for sigc++ development (as far as I + can tell) Added pkg-config to the Depends line of libsigc++-1.1-dev. + + -- Daniel Burrows Fri, 26 Apr 2002 20:15:20 -0400 + +libsigc++-1.1 (1.1.9-3) unstable; urgency=low + + * Added Build-Depends: m4. (Closes: #142769) + + -- Daniel Burrows Sun, 14 Apr 2002 09:02:27 -0400 + +libsigc++-1.1 (1.1.9-2) unstable; urgency=low + + * Added prominent warning about unstableness to the Description. + + -- Daniel Burrows Thu, 11 Apr 2002 20:00:49 -0400 + +libsigc++-1.1 (1.1.9-1) unstable; urgency=low + + * New upstream (unstable) release. (Closes: #141488) + + -- Daniel Burrows Thu, 11 Apr 2002 18:58:30 -0400 + +libsigc++ (1.0.4-3) unstable; urgency=low + + * Correct spelling of "ability". I think "typesafe" is more common than + "type-safe", actually, but `corrected' it anyway. + (Closes: #125044, #125045) + + -- Daniel Burrows Fri, 8 Feb 2002 11:12:09 -0500 + +libsigc++ (1.0.4-2) unstable; urgency=low + + * Update config.{sub,guess}. (closes: #122878) + + -- Daniel Burrows Sun, 9 Dec 2001 09:47:29 -0500 + +libsigc++ (1.0.4-1) unstable; urgency=low + + * New upstream release + * Use prefix= instead of DESTDIR= to install; this works around some + upstream braindeadness that otherwise tries to rm -fr /usr/include/sigc++ . + * Only call ldconfig if $1=configure + * Standards version updated to 3.5.6.0 + + -- Daniel Burrows Tue, 27 Nov 2001 08:38:46 -0500 + +libsigc++ (1.0.3-3) unstable; urgency=low + + * Patch sigc.m4 to work around autoconf problems. (closes: #100206) + + -- Daniel Burrows Sat, 23 Jun 2001 08:42:47 -0400 + +libsigc++ (1.0.3-2) unstable; urgency=low + + * New Maintainer. (closes: #101532) + * Include programming examples + * Build-depending on a task package is a mess. Build-dependency + tightened up to just debhelper; task-c++-dev is unnecessary (since + all the c++ stuff we need is essential or build-essential) + * Programming documentation moved to -dev package. + * No longer use the deprecated dh_testversion. + + -- Daniel Burrows Fri, 22 Jun 2001 09:07:32 -0400 + +libsigc++ (1.0.3-1) unstable; urgency=low + + * New upstream release + + -- Michael Alan Dorman Tue, 6 Mar 2001 09:25:33 -0500 + +libsigc++ (1.0.2-2) unstable; urgency=low + + * Fix build depends (closes: bug#82157, bug#82240) + * Fix -dev dependency (closes: bug#81005) + * Conflict with libsigc++5 (closes: bug#84942) + * Orphaned + + -- Michael Alan Dorman Sat, 10 Feb 2001 17:04:13 -0500 + +libsigc++ (1.0.2-1) unstable; urgency=low + + * New upstream release + * Include doc/ (closes: bug#66674) + + -- Michael Alan Dorman Wed, 22 Nov 2000 11:23:44 -0500 + +libsigc++ (1.0.1-1) unstable; urgency=low + + * New upstream version. + * Correct copyright file (closes: bug#64481) + * Close bogus bug (closes: bug#63403) + + -- Michael Alan Dorman Mon, 22 May 2000 14:23:29 -0400 + +libsigc++ (0.8.6-1) unstable; urgency=low + + * New upstream version. + + -- Michael Alan Dorman Wed, 19 Jan 2000 10:18:44 -0500 + +libsigc++ (0.8.5-2) unstable; urgency=low + + * Add dependency for -dev package (closes: bug#50785) + * Give a better long description. + + -- Michael Alan Dorman Sun, 28 Nov 1999 11:08:52 -0500 + +libsigc++ (0.8.5-1) unstable; urgency=low + + * New upstream version. + + -- Michael Alan Dorman Wed, 10 Nov 1999 12:09:53 -0500 + +libsigc++ (0.8.3-1) unstable; urgency=low + + * New upstream version. + + -- Michael Alan Dorman Tue, 19 Oct 1999 15:54:33 -0400 + +libsigc++ (0.8.2-1) unstable; urgency=low + + * Initial debianization. + + -- Michael Alan Dorman Wed, 6 Oct 1999 18:16:51 -0400 --- libsigc++-2.0-2.0.17.orig/debian/libsigc++-2.0.soname.install +++ libsigc++-2.0-2.0.17/debian/libsigc++-2.0.soname.install @@ -0,0 +1 @@ +usr/lib/*.so.* --- libsigc++-2.0-2.0.17.orig/debian/copyright +++ libsigc++-2.0-2.0.17/debian/copyright @@ -0,0 +1,13 @@ +This is Debian GNU/Linux' pre-packaged copy of libsigc++, a library +implementing a typesafe callback framework in C++ by Karl Nelson + + +Originally from ftp://download.sourceforge.net/pub/sourceforge/libsigc + +Copyright: + +Distribution of library and components is under the LGPL as listed in the +file COPYING.LIB. Examples and tests are Public Domain. + +See /usr/share/common-licenses/LGPL for the full license. + --- libsigc++-2.0-2.0.17.orig/debian/libsigc++-2.0-doc.install +++ libsigc++-2.0-2.0.17/debian/libsigc++-2.0-doc.install @@ -0,0 +1 @@ +usr/share --- libsigc++-2.0-2.0.17.orig/debian/libsigc++-2.0-dev.dirs +++ libsigc++-2.0-2.0.17/debian/libsigc++-2.0-dev.dirs @@ -0,0 +1 @@ +usr/share/doc --- libsigc++-2.0-2.0.17.orig/debian/libsigc++-2.0-dev.install +++ libsigc++-2.0-2.0.17/debian/libsigc++-2.0-dev.install @@ -0,0 +1,6 @@ +usr/include +usr/lib/*.a +usr/lib/*.la +usr/lib/*.so +usr/lib/pkgconfig +usr/lib/sigc++-2.0 --- libsigc++-2.0-2.0.17.orig/debian/libsigc++-2.0-doc.docs +++ libsigc++-2.0-2.0.17/debian/libsigc++-2.0-doc.docs @@ -0,0 +1 @@ +docs/reference/libsigc_doxygen_tags \ No newline at end of file --- libsigc++-2.0-2.0.17.orig/debian/watch +++ libsigc++-2.0-2.0.17/debian/watch @@ -0,0 +1,3 @@ +version=2 + +http://ftp.gnome.org/pub/GNOME/sources/libsigc++/2.0/ (?:.*/)?libsigc\+\+-(.*)\.tar\.gz