tags 527702 +pending thanks Hi,
The attached file is the diff for my gnomoradio 0.15.1-5.3 NMU. The
associated changelog entry is:
gnomoradio (0.15.1-5.3) unstable; urgency=low
* Non-maintainer upload.
* Fix FTBFS in license.cc. Thanks to Jim Garrison <j...@garrison.cc>
for the patch. (Closes: #527702)
* Move package libroboradio-dev from Section 'devel' => 'libdevel'.
* Move package librainbow-dev from Section 'devel' => 'libdevel'.
* Add ${shlibs:Depends} to binary packages to avoid missing
dependencies.
* Don't ignore errors in distclean.
* Bump Standards-Version to 3.8.2.
Regards,
--
,''`.
: :' : Chris Lamb
`. `'` la...@debian.org
`-
diff -Nru gnomoradio-0.15.1/debian/changelog gnomoradio-0.15.1/debian/changelog
--- gnomoradio-0.15.1/debian/changelog 2009-07-27 15:43:02.000000000 +0200
+++ gnomoradio-0.15.1/debian/changelog 2009-07-27 15:43:03.000000000 +0200
@@ -1,3 +1,16 @@
+gnomoradio (0.15.1-5.3) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Fix FTBFS in license.cc. Thanks to Jim Garrison <j...@garrison.cc> for the
+ patch. (Closes: #527702)
+ * Move package libroboradio-dev from Section 'devel' => 'libdevel'.
+ * Move package librainbow-dev from Section 'devel' => 'libdevel'.
+ * Add ${shlibs:Depends} to binary packages to avoid missing dependencies.
+ * Don't ignore errors in distclean.
+ * Bump Standards-Version to 3.8.2.
+
+ -- Chris Lamb <la...@debian.org> Mon, 27 Jul 2009 15:18:29 +0200
+
gnomoradio (0.15.1-5.2) unstable; urgency=medium
* Non-maintainer upload.
diff -Nru gnomoradio-0.15.1/debian/control gnomoradio-0.15.1/debian/control
--- gnomoradio-0.15.1/debian/control 2009-07-27 15:43:02.000000000 +0200
+++ gnomoradio-0.15.1/debian/control 2009-07-27 15:43:03.000000000 +0200
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Riccardo Setti <gisk...@autistici.org>
Build-Depends: debhelper (>= 4.0.0), libgconfmm-2.6-dev (>= 2.8.1-1.1),
libxml++2.6-dev (>= 2.6.1-2.1), libgtkmm-2.4-dev, libesd0-dev, libvorbis-dev,
libao-dev, libglibmm-2.4-dev, libsigc++-2.0-dev
-Standards-Version: 3.7.3
+Standards-Version: 3.8.2
Package: gnomoradio
Section: sound
@@ -16,9 +16,9 @@
and download and play music that is freely licensed.
Package: libroboradio-dev
-Section: devel
+Section: libdevel
Architecture: any
-Depends: libroboradio0c2
+Depends: ${shlibs:Depends}, libroboradio0c2
Description: Development file for libroboradio0c2
Gnomoradio is a free software peer to peer music distribution
application for free music.
@@ -28,7 +28,7 @@
Package: libroboradio0c2
Section: libs
Architecture: any
-Depends: gnomoradio (= ${binary:Version} )
+Depends: ${shlibs:Depends}, gnomoradio (= ${binary:Version} )
Conflicts: libroboradio0
Replaces: libroboradio0
Description: the gnomoradio roboradio library
@@ -38,9 +38,9 @@
This package include roboradio libs.
Package: librainbow-dev
-Section: devel
+Section: libdevel
Architecture: any
-Depends: librainbow0c2
+Depends: ${shlibs:Depends}, librainbow0c2
Description: development file for librainbow0c2
Gnomoradio is a free software peer to peer music distribution
application for free music.
@@ -50,7 +50,7 @@
Package: librainbow0c2
Section: libs
Architecture: any
-Depends: gnomoradio (= ${binary:Version})
+Depends: ${shlibs:Depends}, gnomoradio (= ${binary:Version})
Conflicts: librainbow0
Replaces: librainbow0
Description: the gnomoradio rainbow lib
diff -Nru gnomoradio-0.15.1/debian/rules gnomoradio-0.15.1/debian/rules
--- gnomoradio-0.15.1/debian/rules 2009-07-27 15:43:02.000000000 +0200
+++ gnomoradio-0.15.1/debian/rules 2009-07-27 15:43:03.000000000 +0200
@@ -51,7 +51,8 @@
rm -rf $(CURDIR)/debian/libroboradio-dev
# Add here commands to clean up after the build process.
- -$(MAKE) distclean
+ [ ! -f Makefile ] || $(MAKE) distclean
+
ifneq "$(wildcard /usr/share/misc/config.sub)" ""
cp -f /usr/share/misc/config.sub config.sub
endif
diff -Nru gnomoradio-0.15.1/rainbow/license.cc
gnomoradio-0.15.1/rainbow/license.cc
--- gnomoradio-0.15.1/rainbow/license.cc 2004-10-17 06:03:47.000000000
+0200
+++ gnomoradio-0.15.1/rainbow/license.cc 2009-07-27 15:43:03.000000000
+0200
@@ -54,7 +54,7 @@
}
if (done) {
- signal<void,ref_ptr<License> > sig;
+ sigc::signal<void,ref_ptr<License> > sig;
sig.connect(slot);
sig(license);
} else {
diff -Nru gnomoradio-0.15.1/rainbow/rdf-resource.cc
gnomoradio-0.15.1/rainbow/rdf-resource.cc
--- gnomoradio-0.15.1/rainbow/rdf-resource.cc 2004-10-17 06:06:10.000000000
+0200
+++ gnomoradio-0.15.1/rainbow/rdf-resource.cc 2009-07-27 15:43:03.000000000
+0200
@@ -35,7 +35,7 @@
resource = ref_ptr<RdfResource>(p->second);
if (resource->downloaded) { // already downloaded
map<Glib::ustring,xmlpp::Element*>::iterator el =
resource->id_map.find(id);
- signal<void,xmlpp::Element*,ref_ptr<RdfResource> > sig;
+ sigc::signal<void,xmlpp::Element*,ref_ptr<RdfResource>
> sig;
sig.connect(slot);
sig(el != resource->id_map.end() ? el->second : 0,
resource);
return;
@@ -47,7 +47,7 @@
Glib::ustring host, file;
unsigned short port;
if (!HttpClient::parse_url(uri, host, port, file)) {
- signal<void,xmlpp::Element*,ref_ptr<RdfResource> > sig;
+ sigc::signal<void,xmlpp::Element*,ref_ptr<RdfResource>
> sig;
sig.connect(slot);
sig(0, resource);
return;
@@ -55,14 +55,14 @@
}
// connect mem_fun to appropriate signal
- map<Glib::ustring,signal<void,xmlpp::Element*, ref_ptr<RdfResource>
>*>::iterator sig;
+ map<Glib::ustring,sigc::signal<void,xmlpp::Element*,
ref_ptr<RdfResource> >*>::iterator sig;
sig = resource->signal_map.find(id);
if (sig != resource->signal_map.end()) {
// found existing signal for id
sig->second->connect(slot);
} else {
// need to create new signal to handle id
- signal<void,xmlpp::Element*,ref_ptr<RdfResource> > *signal_ =
new signal<void,xmlpp::Element*,ref_ptr<RdfResource> >;
+ sigc::signal<void,xmlpp::Element*,ref_ptr<RdfResource> >
*signal_ = new sigc::signal<void,xmlpp::Element*,ref_ptr<RdfResource> >;
signal_->connect(slot);
resource->signal_map.insert(make_pair(id, signal_));
}
@@ -190,7 +190,7 @@
error:
// call all signals
- map<Glib::ustring,signal<void,xmlpp::Element*,ref_ptr<RdfResource>
>*>::iterator signal;
+
map<Glib::ustring,sigc::signal<void,xmlpp::Element*,ref_ptr<RdfResource>
>*>::iterator signal;
for (signal = signal_map.begin(); signal != signal_map.end(); ++signal)
{
map<Glib::ustring,xmlpp::Element*>::iterator el =
id_map.find(signal->first);
signal->second->emit(el != id_map.end() ? el->second : 0,
ref_ptr<RdfResource>(this));
@@ -204,7 +204,7 @@
void Rainbow::RdfResource::clear_signal_map ()
{
- map<Glib::ustring,signal<void,xmlpp::Element*,ref_ptr<RdfResource>
>*>::iterator signal;
+
map<Glib::ustring,sigc::signal<void,xmlpp::Element*,ref_ptr<RdfResource>
>*>::iterator signal;
for (signal = signal_map.begin(); signal != signal_map.end(); ++signal)
delete signal->second;
signal_map.clear();
signature.asc
Description: PGP signature
