Package: conky
Version: 1.4.9-3
Severity: normal
Tags: patch
User: [EMAIL PROTECTED]
Usertags: origin-ubuntu hardy ubuntu-patch
Would you mind bumping the debhelper and compat version
(non-Ubuntu-specific)?
You guys rock :)
*** /tmp/tmpQu3vdY
In Ubuntu, we've applied the attached patch to achieve the following:
* Merge from Debian unstable. (LP: #193240) Remaining Ubuntu changes:
- Bump compat and debhelper version
- Change Maintainer field and add XSBC-Original-Maintainer field
- Enable built-in support for rss variables:
+ Add --enable-rss flag in debian/rules
+ Add libxml2-dev, libcurl4-gnutls-dev as Build-Depends in debian/control
* Re-enable some of the features of pre-conky 1.4.7-1:
--enable-double-buffer
--enable-own-window
--enable-portmon
We thought you might be interested in doing the same.
-- System Information:
Debian Release: lenny/sid
APT prefers hardy-updates
APT policy: (500, 'hardy-updates'), (500, 'hardy-security'), (500,
'hardy-proposed'), (500, 'hardy-backports'), (500, 'hardy')
Architecture: i386 (i686)
Kernel: Linux 2.6.24-8-generic (SMP w/2 CPU cores)
Locale: LANG=en_GB.UTF-8, LC_CTYPE=en_GB.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
diff -u conky-1.4.9/debian/rules conky-1.4.9/debian/rules
--- conky-1.4.9/debian/rules
+++ conky-1.4.9/debian/rules
@@ -43,7 +43,11 @@
--host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \
--prefix=/usr --sysconfdir=/etc \
--mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info \
- --enable-debug $(EXTRA_CONF_ARGS)
+ --enable-debug $(EXTRA_CONF_ARGS) \
+ --enable-double-buffer \
+ --enable-own-window \
+ --enable-portmon \
+ --enable-rss
touch debian/configure-stamp
diff -u conky-1.4.9/debian/compat conky-1.4.9/debian/compat
--- conky-1.4.9/debian/compat
+++ conky-1.4.9/debian/compat
@@ -1 +1 @@
-4
+5
diff -u conky-1.4.9/debian/changelog conky-1.4.9/debian/changelog
diff -u conky-1.4.9/debian/control conky-1.4.9/debian/control
--- conky-1.4.9/debian/control
+++ conky-1.4.9/debian/control
@@ -1,12 +1,14 @@
Source: conky
Section: utils
Priority: optional
-Maintainer: Kapil Hari Paranjape <[EMAIL PROTECTED]>
-Build-Depends: debhelper (>= 4.0.0), quilt, libx11-dev, libxft-dev,
+Maintainer: Ubuntu MOTU Developers <[EMAIL PROTECTED]>
+XSBC-Original-Maintainer: Kapil Hari Paranjape <[EMAIL PROTECTED]>
+Build-Depends: debhelper (>= 5.0.0), quilt, libx11-dev, libxft-dev,
libxdamage-dev, libxext-dev, pkg-config (>= 0.19), libglib2.0-dev,
libiw-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
libkvm-dev [kfreebsd-i386 kfreebsd-amd64],
- libdevstat-dev [kfreebsd-i386 kfreebsd-amd64]
+ libdevstat-dev [kfreebsd-i386 kfreebsd-amd64],
+ libxml2-dev, libcurl4-gnutls-dev
Vcs-Svn: svn://svn.debian.org/svn/collab-maint/deb-maint/conky
Homepage: http://conky.sf.net
Standards-Version: 3.7.3
