[Pkg-xfce-commits] r5237 - in goodies/trunk/ristretto: . debian debian/patches
Yves-Alexis Perez
corsac at alioth.debian.org
Sat Apr 2 01:48:58 UTC 2011
Author: corsac
Date: 2011-04-02 13:48:52 +0000 (Sat, 02 Apr 2011)
New Revision: 5237
Added:
goodies/trunk/ristretto/debian/docs
goodies/trunk/ristretto/debian/manpages
goodies/trunk/ristretto/debian/source/
Removed:
goodies/trunk/ristretto/debian/patches/01_fix-segfault-with-gif-images.patch
Modified:
goodies/trunk/ristretto/
goodies/trunk/ristretto/debian/changelog
goodies/trunk/ristretto/debian/control
goodies/trunk/ristretto/debian/copyright
goodies/trunk/ristretto/debian/rules
Log:
merge experimental branch
Property changes on: goodies/trunk/ristretto
___________________________________________________________________
Added: svn:mergeinfo
+ /goodies/branches/experimental/ristretto:4168-5236
Modified: goodies/trunk/ristretto/debian/changelog
===================================================================
--- goodies/trunk/ristretto/debian/changelog 2011-04-01 06:50:44 UTC (rev 5236)
+++ goodies/trunk/ristretto/debian/changelog 2011-04-02 13:48:52 UTC (rev 5237)
@@ -1,3 +1,50 @@
+ristretto (0.0.93-1) UNRELEASED; urgency=low
+
+ * New upstream release.
+ * debian/patches:
+ - 01_fix-implicit-dso-linking dropped, included upstream.
+ * debian/control:
+ - update build-deps for Xfce 4.8.
+ * debian/copyright updated.
+
+ -- Yves-Alexis Perez <corsac at debian.org> Thu, 03 Mar 2011 08:50:03 +0100
+
+ristretto (0.0.91-2) experimental; urgency=low
+
+ * debian/patches:
+ - 01_fix-implicit-dso-linking.patch: fix build with --no-add-needed
+ (backported from upstream git).
+ - series: add this patch.
+
+ -- Lionel Le Folgoc <mrpouit at gmail.com> Sun, 27 Feb 2011 01:15:24 +0100
+
+ristretto (0.0.91-1) experimental; urgency=low
+
+ [ Lionel Le Folgoc ]
+ * 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.
+
+ [ Yves-Alexis Perez ]
+ * debian/control:
+ - update standards version to 3.9.1.
+ - add build-dep on hardening-includes.
+ * debian/rules:
+ - pick {C,LD}FLAGS from dpkg-buildflags.
+ - add -O1, -z,defs and --as-needed to LDFLAGGS.
+ - add hardening flags to {C,LD}FLAGS.
+ * debian/docs: install AUTHORS, NEWS and README upstream files.
+
+ -- Lionel Le Folgoc <mrpouit at gmail.com> Mon, 21 Feb 2011 08:51:11 +0100
+
ristretto (0.0.22-2) unstable; urgency=low
[ Evgeni Golov ]
Modified: goodies/trunk/ristretto/debian/control
===================================================================
--- goodies/trunk/ristretto/debian/control 2011-04-01 06:50:44 UTC (rev 5236)
+++ goodies/trunk/ristretto/debian/control 2011-04-02 13:48:52 UTC (rev 5237)
@@ -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, libxfce4ui-1-dev (>= 4.8.0), libglib2.0-dev (>= 2.16.0),
+ libxfconf-0-dev, libcairo2-dev (>= 1.8.0), intltool, hardening-includes
+Standards-Version: 3.9.1
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.
Modified: goodies/trunk/ristretto/debian/copyright
===================================================================
--- goodies/trunk/ristretto/debian/copyright 2011-04-01 06:50:44 UTC (rev 5236)
+++ goodies/trunk/ristretto/debian/copyright 2011-04-02 13:48:52 UTC (rev 5237)
@@ -5,7 +5,7 @@
http://goodies.xfce.org/projects/applications/ristretto
Upstream Author and copyright holder:
-© 2006-2008 Stephan Arts <stephan at xfce.org>
+© 2006-2011 Stephan Arts <stephan at xfce.org>
License: GPLv2 or later.
Copied: goodies/trunk/ristretto/debian/docs (from rev 5236, goodies/branches/experimental/ristretto/debian/docs)
===================================================================
--- goodies/trunk/ristretto/debian/docs (rev 0)
+++ goodies/trunk/ristretto/debian/docs 2011-04-02 13:48:52 UTC (rev 5237)
@@ -0,0 +1,3 @@
+AUTHORS
+README
+NEWS
Copied: goodies/trunk/ristretto/debian/manpages (from rev 5236, goodies/branches/experimental/ristretto/debian/manpages)
===================================================================
--- goodies/trunk/ristretto/debian/manpages (rev 0)
+++ goodies/trunk/ristretto/debian/manpages 2011-04-02 13:48:52 UTC (rev 5237)
@@ -0,0 +1 @@
+debian/ristretto.1
Deleted: goodies/trunk/ristretto/debian/patches/01_fix-segfault-with-gif-images.patch
===================================================================
--- goodies/trunk/ristretto/debian/patches/01_fix-segfault-with-gif-images.patch 2011-04-01 06:50:44 UTC (rev 5236)
+++ goodies/trunk/ristretto/debian/patches/01_fix-segfault-with-gif-images.patch 2011-04-02 13:48:52 UTC (rev 5237)
@@ -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/trunk/ristretto/debian/rules
===================================================================
--- goodies/trunk/ristretto/debian/rules 2011-04-01 06:50:44 UTC (rev 5236)
+++ goodies/trunk/ristretto/debian/rules 2011-04-02 13:48:52 UTC (rev 5237)
@@ -1,7 +1,13 @@
#!/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
+include /usr/share/hardening-includes/hardening.make
+
+LDFLAGS=$(shell dpkg-buildflags --get LDFLAGS)
+CFLAGS=$(shell dpkg-buildflags --get CFLAGS)
+LDFLAGS+=$(HARDENING_LDFLAGS) -Wl,-z,defs -Wl,--as-needed -Wl,-O1
+CFLAGS+=$(HARDENING_CFLAGS)
+
+export CFLAGS LDFLAGS
+
+%:
+ dh $@
More information about the Pkg-xfce-commits
mailing list