small packaging stuff for 1.3.3

git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky@374 7f574dfc-610e-0410-a909-a81674777703

diff --git a/buildubu.sh b/buildubu.sh
index 433adcb..357a421 100755 (executable)
--- a/buildubu.sh
+++ b/buildubu.sh
@@ -1,14 +1,14 @@
 #!/bin/sh
 
-rm -rf ../conky-1.3.1* ../conky_*
+rm -rf ../conky-1.3.3* ../conky_*
 make distclean
 sh autogen.sh
 ./configure
 make dist
-cp -f conky-1.3.1.tar.gz ../conky_1.3.1.orig.tar.gz
+cp -f conky-1.3.3.tar.gz ../conky_1.3.3.orig.tar.gz
 cd ..
-tar xvzf conky_1.3.1.orig.tar.gz
-cd conky-1.3.1
+tar xvzf conky_1.3.3.orig.tar.gz
+cd conky-1.3.3
 #dh_make -s
 cp -r ../conky/debian .
 rm -rf debian/CVS

diff --git a/debian/changelog b/debian/changelog
index dcec80d..f8bcce3 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+conky (1.3.3-1) unstable; urgency=low
+
+  * New upstream release
+  * Removed ml_* variables from documentation (closes: #335543)
+  * Removed i2c line from sample config (closes: #329396)
+
+ -- Jason Tan <jtan325@gmail.com>  Tue, 25 Oct 2005 07:34:54 -0700
+
 conky (1.3.1-1) unstable; urgency=low
 
   * New upstream release

diff --git a/doc/conkyrc.sample b/doc/conkyrc.sample
index e858f45..e06cd96 100644 (file)
--- a/doc/conkyrc.sample
+++ b/doc/conkyrc.sample
@@ -150,8 +150,6 @@ ${color lightgrey}Networking:
 ${color #0000ff}${downspeedgraph eth0 32,150 ff0000 0000ff} ${color #22ccff}${upspeedgraph eth0 32,150 0000ff ff0000}
 ${color lightgrey}File systems:
  / $color${fs_used /}/${fs_size /} ${fs_bar /}
-${color lightgrey}Temperatures:
- CPU:$color ${i2c temp 2}C${color grey} - MB:$color ${i2c temp 1}C
 ${color #88aadd}MPD: ${alignc}$mpd_artist - $mpd_title
 ${color #88aadd}$mpd_bar
 ${color #88aadd}${alignc}$mpd_status

diff --git a/doc/variables.xml b/doc/variables.xml
index 84fc16f..c702f76 100644 (file)
--- a/doc/variables.xml
+++ b/doc/variables.xml
@@ -648,96 +648,6 @@
 
 <varlistentry>
        <term>
-               <command><option>ml_upload_counter</option></command>
-       </term>
-       <listitem>
-               total session upload in mb
-       <para></para></listitem>
-</varlistentry>
-
-<varlistentry>
-       <term>
-               <command><option>ml_download_counter</option></command>
-       </term>
-       <listitem>
-               total session download in mb
-       <para></para></listitem>
-</varlistentry>
-
-<varlistentry>
-       <term>
-               <command><option>ml_nshared_files</option></command>
-       </term>
-       <listitem>
-               number of shared files
-       <para></para></listitem>
-</varlistentry>
-
-<varlistentry>
-       <term>
-               <command><option>ml_shared_counter</option></command>
-       </term>
-       <listitem>
-               total session shared in mb, buggy in some mldonkey versions
-       <para></para></listitem>
-</varlistentry>
-
-<varlistentry>
-       <term>
-               <command><option>ml_tcp_upload_rate</option></command>
-       </term>
-       <listitem>
-               tcp upload rate in kb/s
-       <para></para></listitem>
-</varlistentry>
-
-<varlistentry>
-       <term>
-               <command><option>ml_tcp_download_rate</option></command>
-       </term>
-       <listitem>
-               tcp download rate in kb/s
-       <para></para></listitem>
-</varlistentry>
-
-<varlistentry>
-       <term>
-               <command><option>ml_udp_upload_rate</option></command>
-       </term>
-       <listitem>
-               udp upload rate in kb/s
-       <para></para></listitem>
-</varlistentry>
-
-<varlistentry>
-       <term>
-               <command><option>ml_udp_download_rate</option></command>
-       </term>
-       <listitem>
-               udp download rate in kb/s
-       <para></para></listitem>
-</varlistentry>
-
-<varlistentry>
-       <term>
-               <command><option>ml_ndownloaded_files</option></command>
-       </term>
-       <listitem>
-               number of completed files
-       <para></para></listitem>
-</varlistentry>
-
-<varlistentry>
-       <term>
-               <command><option>ml_ndownloading_files</option></command>
-       </term>
-       <listitem>
-               number of downloading files
-       <para></para></listitem>
-</varlistentry>
-
-<varlistentry>
-       <term>
                <command><option>mpd_artist</option></command>
        </term>
        <listitem>