[Pkg-xfce-commits] r7497 - in goodies/trunk/ristretto: . debian

[Yves-Alexis Perez]

Author: corsac
Date: 2013-05-22 05:31:53 +0000 (Wed, 22 May 2013)
New Revision: 7497

Modified:
   goodies/trunk/ristretto/
   goodies/trunk/ristretto/debian/changelog
   goodies/trunk/ristretto/debian/control
   goodies/trunk/ristretto/debian/rules
   goodies/trunk/ristretto/debian/watch
Log:
merge changes from experimental



Property changes on: goodies/trunk/ristretto
___________________________________________________________________
Modified: svn:mergeinfo
   - /goodies/branches/experimental/ristretto:4168-5236
   + /goodies/branches/experimental/ristretto:4168-5236,6784-7496

Modified: goodies/trunk/ristretto/debian/changelog
===================================================================
--- goodies/trunk/ristretto/debian/changelog	2013-05-22 05:16:11 UTC (rev 7496)
+++ goodies/trunk/ristretto/debian/changelog	2013-05-22 05:31:53 UTC (rev 7497)
@@ -1,3 +1,21 @@
+ristretto (0.6.3-1) experimental; urgency=low
+
+  * New upstream release.
+
+ -- Lionel Le Folgoc <mrpouit at gmail.com>  Sun, 07 Oct 2012 11:04:41 +0200
+
+ristretto (0.6.0-1) experimental; urgency=low
+
+  [ Yves-Alexis Perez ]
+  * debian/watch updated to track the 0.6 branch.
+
+  [ Lionel Le Folgoc ]
+  * New upstream release, targeted at Xfce 4.10.
+  * debian/control: bumped required versions for Xfce 4.10.
+  * debian/rules: pass --parallel to dh.
+
+ -- Yves-Alexis Perez <corsac at debian.org>  Sat, 05 May 2012 14:54:49 +0200
+
 ristretto (0.3.7-1) unstable; urgency=low
 
   * New upstream release.

Modified: goodies/trunk/ristretto/debian/control
===================================================================
--- goodies/trunk/ristretto/debian/control	2013-05-22 05:16:11 UTC (rev 7496)
+++ goodies/trunk/ristretto/debian/control	2013-05-22 05:31:53 UTC (rev 7497)
@@ -5,8 +5,9 @@
 Uploaders: Yves-Alexis Perez <corsac at debian.org>,
  Lionel Le Folgoc <mrpouit at gmail.com>
 Build-Depends: debhelper (>= 9), libexif-dev, libgtk2.0-dev,
- libdbus-glib-1-dev, libxfce4ui-1-dev (>= 4.8.0), libglib2.0-dev (>= 2.16.0),
- libxfconf-0-dev, libcairo2-dev (>= 1.8.0), intltool, libexo-1-dev (>= 0.4.0)
+ libdbus-glib-1-dev, libxfce4ui-1-dev (>= 4.10.0), libglib2.0-dev (>= 2.16.0),
+ libxfconf-0-dev (>= 4.10.0), libcairo2-dev (>= 1.8.0), intltool,
+ libexo-1-dev (>= 0.8.0)
 Standards-Version: 3.9.3
 Homepage: http://goodies.xfce.org/
 Vcs-Svn: svn://svn.debian.org/pkg-xfce/goodies/trunk/ristretto/

Modified: goodies/trunk/ristretto/debian/rules
===================================================================
--- goodies/trunk/ristretto/debian/rules	2013-05-22 05:16:11 UTC (rev 7496)
+++ goodies/trunk/ristretto/debian/rules	2013-05-22 05:31:53 UTC (rev 7497)
@@ -4,4 +4,4 @@
 export DEB_BUILD_MAINT_OPTIONS=hardening=+pie,+bindnow
 
 %:
-	dh $@
+	dh $@ --parallel

Modified: goodies/trunk/ristretto/debian/watch
===================================================================
--- goodies/trunk/ristretto/debian/watch	2013-05-22 05:16:11 UTC (rev 7496)
+++ goodies/trunk/ristretto/debian/watch	2013-05-22 05:31:53 UTC (rev 7497)
@@ -1,3 +1,3 @@
 version=3
-http://archive.xfce.org/src/apps/ristretto/0.3/ \
+http://archive.xfce.org/src/apps/ristretto/0.6/ \
 	ristretto-([\d\.]+)\.tar\.(?:gz|bz2)