--- Begin Message ---
Package: fbdesk
Version: 1.1.5-1
Severity: normal
Tags: patch
Hi,
Attached is the diff for my fbdesk 1.1.5-1.1 NMU.
--
Homepage: http://www.sesse.net/
diff -u fbdesk-1.1.5/debian/changelog fbdesk-1.1.5/debian/changelog
--- fbdesk-1.1.5/debian/changelog
+++ fbdesk-1.1.5/debian/changelog
@@ -1,3 +1,15 @@
+fbdesk (1.1.5-1.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Replace build-dependency on xlibs-dev with an explicit build-dependency
+ on each required package. (Closes: #346657)
+ * Move the definition of the Resource class down below the definition of
+ the ResourceManager class; fixes FTBFS on gcc-4.0, patch from Andreas
+ Jochens. (Closes: #300451)
+ * Rebuild against libxft2. (Closes: #341507, #341520)
+
+ -- Steinar H. Gunderson <sesse@debian.org> Mon, 23 Jan 2006 01:23:01 +0100
+
fbdesk (1.1.5-1) unstable; urgency=low
* New upstream release
diff -u fbdesk-1.1.5/debian/control fbdesk-1.1.5/debian/control
--- fbdesk-1.1.5/debian/control
+++ fbdesk-1.1.5/debian/control
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Matt Hope <dopey@debian.org>
Standards-Version: 3.5.8
-Build-Depends: xlibs-dev (>>4.1.0), debhelper ( >= 3.0.0 ), libpng12-dev|libpng-dev, zlib1g-dev
+Build-Depends: libx11-dev, libxext-dev, libxft-dev, libxpm-dev, libxt-dev, x-dev, debhelper ( >= 3.0.0 ), libpng12-dev|libpng-dev, zlib1g-dev
Package: fbdesk
Architecture: any
only in patch2:
unchanged:
--- fbdesk-1.1.5.orig/src/Resource.hh
+++ fbdesk-1.1.5/src/Resource.hh
@@ -56,41 +56,9 @@
std::string m_altname; ///< alternative name
};
+template<typename T> class Resource;
class ResourceManager;
-/**
- Real resource class
-*/
-template <typename T>
-class Resource:public Resource_base
-{
-public:
- Resource(ResourceManager &rm, T val,
- const std::string &name, const std::string &altname):
- Resource_base(name, altname),
- m_value(val), m_defaultval(val),
- m_rm(rm)
- {
- m_rm.addResource(*this); // add this to resource handler
- }
- virtual ~Resource() {
- m_rm.removeResource(*this); // remove this from resource handler
- }
-
- inline void setDefaultValue() { m_value = m_defaultval; }
- void setFromString(const char *strval);
- inline Resource<T>& operator = (const T& newvalue) { m_value = newvalue; return *this;}
-
- std::string getString();
- inline T& operator*() { return m_value; }
- inline const T& operator*() const { return m_value; }
- inline T *operator->() { return &m_value; }
- inline const T *operator->() const { return &m_value; }
-private:
- T m_value, m_defaultval;
- ResourceManager &m_rm;
-};
-
class ResourceManager
{
public:
@@ -129,4 +97,37 @@
ResourceList m_resourcelist;
};
+/**
+ Real resource class
+*/
+template <typename T>
+class Resource:public Resource_base
+{
+public:
+ Resource(ResourceManager &rm, T val,
+ const std::string &name, const std::string &altname):
+ Resource_base(name, altname),
+ m_value(val), m_defaultval(val),
+ m_rm(rm)
+ {
+ m_rm.addResource(*this); // add this to resource handler
+ }
+ virtual ~Resource() {
+ m_rm.removeResource(*this); // remove this from resource handler
+ }
+
+ inline void setDefaultValue() { m_value = m_defaultval; }
+ void setFromString(const char *strval);
+ inline Resource<T>& operator = (const T& newvalue) { m_value = newvalue; return *this;}
+
+ std::string getString();
+ inline T& operator*() { return m_value; }
+ inline const T& operator*() const { return m_value; }
+ inline T *operator->() { return &m_value; }
+ inline const T *operator->() const { return &m_value; }
+private:
+ T m_value, m_defaultval;
+ ResourceManager &m_rm;
+};
+
#endif //_RESOURCE_HH_
--- End Message ---
--- Begin Message ---
Source: fbdesk
Source-Version: 1.1.5-3
We believe that the bug you reported is fixed in the latest version of
fbdesk, which is due to be installed in the Debian FTP archive:
fbdesk_1.1.5-3.diff.gz
to pool/main/f/fbdesk/fbdesk_1.1.5-3.diff.gz
fbdesk_1.1.5-3.dsc
to pool/main/f/fbdesk/fbdesk_1.1.5-3.dsc
fbdesk_1.1.5-3_i386.deb
to pool/main/f/fbdesk/fbdesk_1.1.5-3_i386.deb
A summary of the changes between this version and the previous one is
attached.
Thank you for reporting the bug, which will now be closed. If you
have further comments please address them to 349433@bugs.debian.org,
and the maintainer will reopen the bug report if appropriate.
Debian distribution maintenance software
pp.
Jari Aalto <jari.aalto@cante.net> (supplier of updated fbdesk package)
(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing ftpmaster@debian.org)
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Format: 1.7
Date: Sat, 2 Dec 2006 18:31:50 +0200
Source: fbdesk
Binary: fbdesk
Architecture: source i386
Version: 1.1.5-3
Distribution: unstable
Urgency: low
Maintainer: Jari Aalto <jari.aalto@cante.net>
Changed-By: Jari Aalto <jari.aalto@cante.net>
Description:
fbdesk - desktop icons for fluxbox window manager
Closes: 349433 400359
Changes:
fbdesk (1.1.5-3) unstable; urgency=low
.
* New maintainer (O; Closes: #400359)
* debian/control:
(Maintainer:) Updated.
(Standards:) updated to 3.7.2
(Build-Depands:) Added autotools-dev.
(Description:) Added homepage.
* debian/copyright: Rewritten by using current dh-make template.
* debian/rules: Rewritten by using current dh-make template.
* debian/compat: New.
* debian/rules: copy new autoconf config.{guess,sub} files at build time
as described in /usr/share/doc/autotools-dev/README.Debian.gz
Improved treatment of Bug#342410.
* Rewrote manual page from scratch. Switched to *.pod format
and manpage.sgml is no more used. Moved
from *.1 to section *.1x. (Closes: #349433)
Files:
740da68f57bf1abf059bb0fd37e6de6b 675 x11 optional fbdesk_1.1.5-3.dsc
e6937e8b227a2b5ef2339a1ead2dbc2d 30607 x11 optional fbdesk_1.1.5-3.diff.gz
597f949340c286981dea122a35fd945e 93126 x11 optional fbdesk_1.1.5-3_i386.deb
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (GNU/Linux)
iD8DBQFFccwSLARVQsm1XawRAnL/AJ9+2rgNux48b/uURlFBeAnZYCkLEACfZH6f
nHbvoYYbCu/KyLV+JXMHRdY=
=Gsp8
-----END PGP SIGNATURE-----
--- End Message ---