[Pkg-xfce-commits] r4168 - in goodies/branches/experimental: . ristretto/debian ristretto/debian/patches ristretto/debian/source

[Lionel Le Folgoc]

Author: mrpouit-guest
Date: 2010-07-17 22:34:08 +0000 (Sat, 17 Jul 2010)
New Revision: 4168

Added:
   goodies/branches/experimental/ristretto/
   goodies/branches/experimental/ristretto/debian/manpages
   goodies/branches/experimental/ristretto/debian/source/
   goodies/branches/experimental/ristretto/debian/source/format
Removed:
   goodies/branches/experimental/ristretto/debian/patches/01_fix-segfault-with-gif-images.patch
Modified:
   goodies/branches/experimental/ristretto/debian/changelog
   goodies/branches/experimental/ristretto/debian/control
   goodies/branches/experimental/ristretto/debian/rules
Log:
* New upstream development release.
* Convert to 3.0 (quilt).
* Switch to dh.
* debian/control:
  - add myself to Uploaders
  - refresh build-deps: drop libthunar-vfs-1-dev; add libxfconf-0-dev,
    libglib2.0-dev (>= 2.16.0) and libcairo2-dev (>= 1.8.0)
  - bump Standards-Version to 3.9.0
  - recommends tumbler (used to generate thumbnails).
* debian/manpages: add debian/ristretto.1.
* debian/patches/01_fix-segfault-with-gif-images.patch: dropped, not needed.

Modified: goodies/branches/experimental/ristretto/debian/changelog
===================================================================
--- goodies/trunk/ristretto/debian/changelog	2010-07-16 15:37:09 UTC (rev 4167)
+++ goodies/branches/experimental/ristretto/debian/changelog	2010-07-17 22:34:08 UTC (rev 4168)
@@ -1,3 +1,19 @@
+ristretto (0.0.91-1) UNRELEASED; urgency=low
+
+  * New upstream development release.
+  * Convert to 3.0 (quilt).
+  * Switch to dh.
+  * debian/control:
+    - add myself to Uploaders
+    - refresh build-deps: drop libthunar-vfs-1-dev; add libxfconf-0-dev,
+      libglib2.0-dev (>= 2.16.0) and libcairo2-dev (>= 1.8.0)
+    - bump Standards-Version to 3.9.0
+    - recommends tumbler (used to generate thumbnails).
+  * debian/manpages: add debian/ristretto.1.
+  * debian/patches/01_fix-segfault-with-gif-images.patch: dropped, not needed.
+
+ -- Lionel Le Folgoc <mrpouit at gmail.com>  Sun, 18 Jul 2010 00:19:25 +0200
+
 ristretto (0.0.22-2) unstable; urgency=low
 
   [ Evgeni Golov ]

Modified: goodies/branches/experimental/ristretto/debian/control
===================================================================
--- goodies/trunk/ristretto/debian/control	2010-07-16 15:37:09 UTC (rev 4167)
+++ goodies/branches/experimental/ristretto/debian/control	2010-07-17 22:34:08 UTC (rev 4168)
@@ -2,10 +2,13 @@
 Section: xfce
 Priority: optional
 Maintainer: Debian Xfce Maintainers <pkg-xfce-devel at lists.alioth.debian.org>
-Uploaders: Emanuele Rocca <ema at debian.org>, Simon Huggins <huggie at earth.li>, Stefan Ott <stefan at ott.net>, Yves-Alexis Perez <corsac at 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.4
+Uploaders: Emanuele Rocca <ema at debian.org>, Simon Huggins <huggie at earth.li>,
+ Stefan Ott <stefan at ott.net>, Yves-Alexis Perez <corsac at debian.org>,
+ Lionel Le Folgoc <mrpouit at gmail.com>
+Build-Depends: debhelper (>= 7), libexif-dev, libgtk2.0-dev,
+ libdbus-glib-1-dev, libxfcegui4-dev, libglib2.0-dev (>= 2.16.0),
+ libxfconf-0-dev, libcairo2-dev (>= 1.8.0), intltool
+Standards-Version: 3.9.0
 Homepage: http://goodies.xfce.org/
 Vcs-Svn: svn://svn.debian.org/pkg-xfce/goodies/trunk/ristretto/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-xfce/goodies/trunk/ristretto/
@@ -13,6 +16,7 @@
 Package: ristretto
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
+Recommends: tumbler
 Description: lightweight picture-viewer for the Xfce desktop environment
  Ristretto is a fast and lightweight picture-viewer for the Xfce desktop
  environment.

Added: goodies/branches/experimental/ristretto/debian/manpages
===================================================================
--- goodies/branches/experimental/ristretto/debian/manpages	                        (rev 0)
+++ goodies/branches/experimental/ristretto/debian/manpages	2010-07-17 22:34:08 UTC (rev 4168)
@@ -0,0 +1 @@
+debian/ristretto.1

Deleted: goodies/branches/experimental/ristretto/debian/patches/01_fix-segfault-with-gif-images.patch
===================================================================
--- goodies/trunk/ristretto/debian/patches/01_fix-segfault-with-gif-images.patch	2010-07-16 15:37:09 UTC (rev 4167)
+++ goodies/branches/experimental/ristretto/debian/patches/01_fix-segfault-with-gif-images.patch	2010-07-17 22:34:08 UTC (rev 4168)
@@ -1,20 +0,0 @@
---- ristretto-0.0.22.orig/src/navigator.c
-+++ ristretto-0.0.22/src/navigator.c
-@@ -1308,7 +1308,7 @@
- 
-     if (entry->iter)
-     {
--        pixbuf = gdk_pixbuf_animation_iter_get_pixbuf(entry->iter);
-+        pixbuf = gdk_pixbuf_copy (gdk_pixbuf_animation_iter_get_pixbuf(entry->iter));
-     }
-     else
-     {
-@@ -1364,7 +1364,7 @@
-                 gdk_pixbuf_unref(entry->src_pixbuf);
-                 entry->src_pixbuf = NULL;
-             }
--            entry->src_pixbuf = gdk_pixbuf_animation_iter_get_pixbuf(entry->iter);
-+            entry->src_pixbuf = gdk_pixbuf_copy (gdk_pixbuf_animation_iter_get_pixbuf(entry->iter));
-             src_pixbuf = entry->src_pixbuf;
- 
-             if (src_pixbuf)

Modified: goodies/branches/experimental/ristretto/debian/rules
===================================================================
--- goodies/trunk/ristretto/debian/rules	2010-07-16 15:37:09 UTC (rev 4167)
+++ goodies/branches/experimental/ristretto/debian/rules	2010-07-17 22:34:08 UTC (rev 4168)
@@ -1,7 +1,11 @@
 #!/usr/bin/make -f
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/autotools.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
 
-DEB_INSTALL_MANPAGES_ristretto := debian/ristretto.1
-LDFLAGS +=-Wl,-z,-defs -Wl,--as-needed
+LDFLAGS+=-Wl,-z,defs -Wl,--as-needed
+ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+	CFLAGS += -O0
+else
+	CFLAGS += -O2
+endif
+
+%:
+	dh $@

Added: goodies/branches/experimental/ristretto/debian/source/format
===================================================================
--- goodies/branches/experimental/ristretto/debian/source/format	                        (rev 0)
+++ goodies/branches/experimental/ristretto/debian/source/format	2010-07-17 22:34:08 UTC (rev 4168)
@@ -0,0 +1 @@
+3.0 (quilt)