[Pkg-xfce-commits] r5199 - in desktop/trunk/orage/debian: . patches

Yves-Alexis Perez corsac at alioth.debian.org
Thu Mar 31 01:05:04 UTC 2011


Author: corsac
Date: 2011-03-31 13:05:01 +0000 (Thu, 31 Mar 2011)
New Revision: 5199

Added:
   desktop/trunk/orage/debian/source/
Removed:
   desktop/trunk/orage/debian/patches/01_fix-build-with-external-ical.patch
Modified:
   desktop/trunk/orage/debian/changelog
   desktop/trunk/orage/debian/control
   desktop/trunk/orage/debian/copyright
   desktop/trunk/orage/debian/rules
Log:
merge 4.8 branch from experimental


Modified: desktop/trunk/orage/debian/changelog
===================================================================
--- desktop/trunk/orage/debian/changelog	2011-03-31 12:48:45 UTC (rev 5198)
+++ desktop/trunk/orage/debian/changelog	2011-03-31 13:05:01 UTC (rev 5199)
@@ -1,21 +1,37 @@
-orage (4.7.5-1) UNRELEASED; urgency=low
+orage (4.8.1-1) experimental; urgency=low
 
   * New upstream release.
+
+ -- Yves-Alexis Perez <corsac at debian.org>  Sun, 27 Feb 2011 00:51:22 +0100
+
+orage (4.8.0-1) experimental; urgency=low
+
+  [ Yves-Alexis Perez ]
+  * New upstream release.
   * debian/control:
-    - update standards version to 3.8.4.
+    - update standards version to 3.9.1.
     - add build-dep on libical-dev and libpopt-dev.
-  * debian/patches
-    - 01-dont-duplicate dropped.
+    - add build-dep on xfce4-dev-tools and libtool.
+    - add build-dep on hardening-includes.
   * debian/watch updated to track upstream repository reorganization.
   * debian/rules:
     - update configure flags.
     - drop useless call to dh_desktop.
+    - pick {C,LD}FLAGS from dpkg-buildflags.
+    - add -O1, -z,defs and --as-needed to LDFLAGS.
+    - add hardening flags to {C,LD}FLAGS.
+    - drop cdbs for dh with overrides.
   * debian/patches
-    - 01_fix-build-with-external-ical added, update includes to correctly pick
-      system libical.
+    - 01-dont-duplicate dropped.
+  * debian/copyright updated to include complete text of BSD license.
+  * Switch to 3.0 (quilt) source format.
+  * debian/copyright updated.
 
- -- Yves-Alexis Perez <corsac at debian.org>  Sat, 06 Mar 2010 10:58:45 +0100
+  [ Lionel Le Folgoc ]
+  * debian/control: add myself to Uploaders.
 
+ -- Yves-Alexis Perez <corsac at debian.org>  Mon, 07 Feb 2011 00:56:53 +0100
+
 orage (4.6.1-1) unstable; urgency=low
 
   * New upstream release.

Modified: desktop/trunk/orage/debian/control
===================================================================
--- desktop/trunk/orage/debian/control	2011-03-31 12:48:45 UTC (rev 5198)
+++ desktop/trunk/orage/debian/control	2011-03-31 13:05:01 UTC (rev 5199)
@@ -2,12 +2,15 @@
 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>, Yves-Alexis Perez <corsac at debian.org>, Michael Casadevall <sonicmctails at gmail.com>
-Build-Depends: debhelper (>= 7), cdbs, libxml-parser-perl,
+Uploaders: Emanuele Rocca <ema at debian.org>, Simon Huggins <huggie at earth.li>,
+ Yves-Alexis Perez <corsac at debian.org>, Michael Casadevall <sonicmctails at gmail.com>,
+ Lionel Le Folgoc <mrpouit at gmail.com>
+Build-Depends: debhelper (>= 7.0.50~), libxml-parser-perl,
  libgtk2.0-dev (>= 2.10.1), xfce4-panel-dev (>= 4.6.0), chrpath,
  libxfcegui4-dev (>= 4.6.0), libnotify-dev, libdbus-1-dev, intltool, 
- libdbus-1-dev, libical-dev, libpopt-dev
-Standards-Version: 3.8.4
+ libdbus-1-dev, libical-dev, libpopt-dev, xfce4-dev-tools, libtool,
+ hardening-includes
+Standards-Version: 3.9.1
 Homepage: http://www.xfce.org/
 Vcs-Svn: svn://svn.debian.org/pkg-xfce/desktop/trunk/orage/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-xfce/desktop/trunk/orage/

Modified: desktop/trunk/orage/debian/copyright
===================================================================
--- desktop/trunk/orage/debian/copyright	2011-03-31 12:48:45 UTC (rev 5198)
+++ desktop/trunk/orage/debian/copyright	2011-03-31 13:05:01 UTC (rev 5199)
@@ -12,7 +12,7 @@
 Copyright Holders: 
 © 2003-2006 Mickaël Graf <korbinus at xfce.org>
 © 2003 Benedikt Meurer <benny at xfce.org>
-© 2005-2009 Juha Kautto <juha at xfce.org>
+© 2005-2011 Juha Kautto <juha at xfce.org>
 
 panel-plugin is © 2006-2007 Juha Kautto <juha at xfce.org>
 
@@ -41,9 +41,34 @@
 On Debian systems, the complete text of the GNU General
 Public License can be found in `/usr/share/common-licenses/GPL'.
 The complete text of the GNU Library General Public License can be found
-in `/usr/share/common-licenses/LGPL', and for the BSD license in
-`/usr/share/common-licenses/BSD'. 
+in `/usr/share/common-licenses/LGPL'
 
+The text of the BSD license follows:
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+1. Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+3. Neither the name of the University nor the names of its contributors
+   may be used to endorse or promote products derived from this software
+   without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGE.
+
 The text of Mozilla Public License follows:
 
                           MOZILLA PUBLIC LICENSE

Deleted: desktop/trunk/orage/debian/patches/01_fix-build-with-external-ical.patch
===================================================================
--- desktop/trunk/orage/debian/patches/01_fix-build-with-external-ical.patch	2011-03-31 12:48:45 UTC (rev 5198)
+++ desktop/trunk/orage/debian/patches/01_fix-build-with-external-ical.patch	2011-03-31 13:05:01 UTC (rev 5199)
@@ -1,45 +0,0 @@
-diff --git a/src/ical-archive.c b/src/ical-archive.c
-index 100be99..084c01f 100644
---- a/src/ical-archive.c
-+++ b/src/ical-archive.c
-@@ -51,8 +51,8 @@
- #include <gtk/gtk.h>
- #include <glib/gprintf.h>
- #include <glib/gstdio.h>
--#include <ical.h>
--#include <icalss.h>
-+#include <libical/ical.h>
-+#include <libical/icalss.h>
- 
- #include "orage-i18n.h"
- #include "functions.h"
-diff --git a/src/ical-code.c b/src/ical-code.c
-index 6f058ac..788ccbf 100644
---- a/src/ical-code.c
-+++ b/src/ical-code.c
-@@ -51,8 +51,8 @@
- #include <gtk/gtk.h>
- #include <glib/gprintf.h>
- #include <glib/gstdio.h>
--#include <ical.h>
--#include <icalss.h>
-+#include <libical/ical.h>
-+#include <libical/icalss.h>
- 
- #include "orage-i18n.h"
- #include "functions.h"
-diff --git a/src/ical-expimp.c b/src/ical-expimp.c
-index 9bda162..5c1380a 100644
---- a/src/ical-expimp.c
-+++ b/src/ical-expimp.c
-@@ -51,8 +51,8 @@
- #include <gtk/gtk.h>
- #include <glib/gprintf.h>
- #include <glib/gstdio.h>
--#include <ical.h>
--#include <icalss.h>
-+#include <libical/ical.h>
-+#include <libical/icalss.h>
- 
- #include "orage-i18n.h"
- #include "functions.h"

Modified: desktop/trunk/orage/debian/rules
===================================================================
--- desktop/trunk/orage/debian/rules	2011-03-31 12:48:45 UTC (rev 5198)
+++ desktop/trunk/orage/debian/rules	2011-03-31 13:05:01 UTC (rev 5199)
@@ -1,12 +1,21 @@
 #!/usr/bin/make -f
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
-include /usr/share/cdbs/1/class/autotools.mk
+include /usr/share/hardening-includes/hardening.make
 
-DEB_CONFIGURE_EXTRA_FLAGS := --enable-dbus --enable-libical
-LDFLAGS += -Wl,-z,defs -Wl,--as-needed
 
+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)
 
-install/orage::
-	chrpath -d -k `pwd`/debian/orage/usr/bin/* \
-		`pwd`/debian/orage/usr/lib/orage/xfce4/*/*
+export CFLAGS LDFLAGS
+
+override_dh_auto_configure:
+	dh_auto_configure -- --enable-dbus --enable-libical
+
+override_dh_install:
+	chrpath -d -k $(CURDIR)/debian/orage/usr/bin/* \
+		$(CURDIR)/debian/orage/usr/lib/orage/xfce4/*/*
+	dh_install --fail-missing
+
+%:
+	dh $@




More information about the Pkg-xfce-commits mailing list