[Pkg-silc-commits] [SCM] plugin for Kopete to support SILC protocol branch, master, updated. debian/0.5-2

[Jérémy Bobbio]

The following commit has been merged in the master branch:
commit 9e905aff615ce0ba8fb6e2e8ac18d68a3ffb0a91
Author: Jérémy Bobbio <lunar at debian.org>
Date:   Fri Jul 24 01:10:09 2009 +0200

    Revert all previous changes as 0.5-1 was actually uploaded to experimental

diff --git a/debian/README.source b/debian/README.source
deleted file mode 100644
index 48f35a8..0000000
--- a/debian/README.source
+++ /dev/null
@@ -1,6 +0,0 @@
-README.source for the kopete-silc-plugin package
-================================================
-
-kopete-silc-plugin is managed in a Git repository using git-buildpackage (with
-pristine-tar).  It follows most of the advice provided by Russ Allbery at:
-http://www.eyrie.org/~eagle/notes/debian/git.html
diff --git a/debian/changelog b/debian/changelog
index 4a553f4..ba9da8e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,22 +1,9 @@
-kopete-silc-plugin (0.5-1) unstable; urgency=low
+kopete-silc-plugin (0.4-2) UNRELEASED; urgency=low
 
   [ Daniel Kahn Gillmor ]
   * cleaning up debian/control.  Thanks, Lintian!
 
-  [ Jérémy Bobbio ]
-  * New upstream release.  (Closes: #515671)
-  * Build-Depend on libsilc-dev instead of libsilc-1.1-2-dev.
-  * Build-Depend on libkopete-dev instead of kdenetwork-dev.
-  * Depend on kopete… obviously.
-  * Update Vcs-* field and document Git usage in README.source.
-  * Bump Standards-Version to 3.8.2, no changes required.
-  * Fix FTBFS with GCC 4.4.  Thanks Peter Green for the patch!
-    (Closes: #504976)
-
-  [ Stefan Siegl ]
-  * Fix homepage and watch URL.
-
- -- Jérémy Bobbio <lunar at debian.org>  Thu, 25 Jun 2009 22:57:54 +0200
+ -- Daniel Kahn Gillmor <dkg at fifthhorseman.net>  Tue, 02 Sep 2008 13:25:26 -0400
 
 kopete-silc-plugin (0.4-1) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 5245fb2..ff4dd16 100644
--- a/debian/control
+++ b/debian/control
@@ -4,15 +4,15 @@ Priority: optional
 Maintainer: Debian SILC Team <pkg-silc-devel at lists.alioth.debian.org>
 Uploaders: Stefan Siegl <stesie at brokenpipe.de>,
  Jérémy Bobbio <lunar at debian.org>
-Build-Depends: debhelper (>= 5.0.0), autotools-dev, libkopete-dev, libsilc-dev, cmake
-Standards-Version: 3.8.2
-Homepage: http://silc.brokenpipe.de/
-Vcs-Git: git://git.debian.org/pkg-silc/kopete-silc-plugin.git
-Vcs-Browser: http://git.debian.org/?p=pkg-silc/kopete-silc-plugin.git
+Build-Depends: debhelper (>= 5.0.0), autotools-dev, kdenetwork-dev, libsilc-1.1-2-dev, cmake
+Standards-Version: 3.7.3
+Homepage: http://www.brokenpipe.de/SILC/index.html
+Vcs-Svn: svn://svn.debian.org/pkg-silc/kopete-silc-plugin/trunk
+Vcs-Browser: http://svn.debian.org/wsvn/pkg-silc/kopete-silc-plugin/trunk
 
 Package: kopete-silc-plugin
 Architecture: any
-Depends: kopete, ${shlibs:Depends}, ${misc:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: plugin for Kopete to support SILC protocol
  Plugin for Kopete instant messaging client to support the SILC protocol.
  .
diff --git a/debian/rules b/debian/rules
index aec8af7..28faf25 100755
--- a/debian/rules
+++ b/debian/rules
@@ -40,11 +40,6 @@ clean:
           -or -name cmake_install.cmake -or -name Makefile \
 	  -or -name kopete_silc.la -or -name install_manifest.txt`; \
 	 do rm -rf $$A; done
-	rm -f src/*.moc
-	rm -rf lib
-	rm -f src/CTestTestfile.cmake
-	rm -f src/icons/CTestTestfile.cmake
-	rm -f src/kopete_silc_automoc.cpp.files
 	dh_clean 
 
 install: build
diff --git a/debian/watch b/debian/watch
index 12656c3..7f4b13d 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,2 +1,2 @@
 version=3
-http://silc.brokenpipe.de/files/kopete_silc-([\d\.]+)\.tar\.gz debian git-import-orig
+http://brokenpipe.de/SILC/files/kopete_silc-([\d\.]+)\.tar\.gz debian svn-upgrade
diff --git a/src/silcaccount.cpp b/src/silcaccount.cpp
index 334cefe..c4dc2bf 100644
--- a/src/silcaccount.cpp
+++ b/src/silcaccount.cpp
@@ -19,7 +19,6 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
 #include <cstdlib>
-#include <cstdio>
 #include <iostream>
 #include <assert.h>
 
diff --git a/src/silcfiletransfer.h b/src/silcfiletransfer.h
index d2e7f99..5757b54 100644
--- a/src/silcfiletransfer.h
+++ b/src/silcfiletransfer.h
@@ -28,8 +28,6 @@
 // Likewise for mode_t.
 #include <sys/types.h>
 
-#include <cstdarg>
-
 // include libsilc stuff into a separate namespace
 namespace SilcTK {
 #include <silc.h>

-- 
plugin for Kopete to support SILC protocol