diff -u ristretto-0.0.22/debian/rules ristretto-0.0.22/debian/rules
--- ristretto-0.0.22/debian/rules
+++ ristretto-0.0.22/debian/rules
@@ -8,3 +7,0 @@
-
-binary-post-install/ristretto::
-	dh_desktop
diff -u ristretto-0.0.22/debian/changelog ristretto-0.0.22/debian/changelog
--- ristretto-0.0.22/debian/changelog
+++ ristretto-0.0.22/debian/changelog
@@ -1,11 +1,23 @@
-ristretto (0.0.22-1ubuntu1) lucid; urgency=low
+ristretto (0.0.22-2) unstable; urgency=low
 
+  [ Evgeni Golov ]
+  * Fix Vcs-* fields, they were missing 'trunk' in the path.
+
+  [ Yves-Alexis Perez ]
+  * debian/watch updated to track Xfce archive reorganisation.
+  * debian/control:
+    - Bump standards version to 3.8.4
+
+  [ Stefan Ott ]
+  * debian/rules:
+    - Don't call dh_desktop (deprecated)
+
+  [ Lionel Le Folgoc ]
   * debian/patches/01_fix-segfault-with-gif-images.patch: copy pixbuf before
     using them, should fix unref & segfault issues with GIF files.
-    lp: #488565,#500314,#439183
   * debian/rules: include simple-patchsys.mk.
 
- -- Lionel Le Folgoc <mrpouit@ubuntu.com>  Sat, 06 Feb 2010 22:42:04 +0100
+ -- Yves-Alexis Perez <corsac@debian.org>  Tue, 09 Feb 2010 21:41:35 +0100
 
 ristretto (0.0.22-1) unstable; urgency=low
 
diff -u ristretto-0.0.22/debian/watch ristretto-0.0.22/debian/watch
--- ristretto-0.0.22/debian/watch
+++ ristretto-0.0.22/debian/watch
@@ -1,6 +1,3 @@
-# watch control file for uscan
-
-# Compulsory line, this is a version 3 file
 version=3
-
-http://goodies.xfce.org/releases/ristretto/ristretto-(.*)\.tar\.gz
+http://archive.xfce.org/src/apps/ristretto/([\d\.]+)/ \
+	ristretto-([\d\.]+)\.tar\.(?:gz|bz2)
diff -u ristretto-0.0.22/debian/control ristretto-0.0.22/debian/control
--- ristretto-0.0.22/debian/control
+++ ristretto-0.0.22/debian/control
@@ -1,15 +1,14 @@
 Source: ristretto
 Section: xfce
 Priority: optional
-Maintainer: Xubuntu Developers <xubuntu-devel@lists.ubuntu.com>
-XSBC-Original-Maintainer: Debian Xfce Maintainers <pkg-xfce-devel@lists.alioth.debian.org>
+Maintainer: Debian Xfce Maintainers <pkg-xfce-devel@lists.alioth.debian.org>
 Uploaders: Emanuele Rocca <ema@debian.org>, Simon Huggins <huggie@earth.li>, Stefan Ott <stefan@ott.net>, Yves-Alexis Perez <corsac@debian.org>
 Build-Depends: cdbs, debhelper (>= 7), libexif-dev, libgtk2.0-dev,
  libthunar-vfs-1-dev, libdbus-glib-1-dev, libxfcegui4-dev, intltool
-Standards-Version: 3.8.1
+Standards-Version: 3.8.4
 Homepage: http://goodies.xfce.org/
-Vcs-Svn: svn://svn.debian.org/pkg-xfce/goodies/ristretto/
-Vcs-Browser: http://svn.debian.org/wsvn/pkg-xfce/goodies/ristretto/
+Vcs-Svn: svn://svn.debian.org/pkg-xfce/goodies/trunk/ristretto/
+Vcs-Browser: http://svn.debian.org/wsvn/pkg-xfce/goodies/trunk/ristretto/
 
 Package: ristretto
 Architecture: any