Author: corsac
Date: 2008-07-05 15:46:36 +0000 (Sat, 05 Jul 2008)
New Revision: 2172
Added:
desktop/trunk/orage/debian/patches/01_install-manpages-usr-share.patch
Removed:
desktop/trunk/orage/debian/orage.1
desktop/trunk/orage/debian/patches/01_tune-desktop-file.patch
desktop/trunk/orage/debian/patches/02_fix-implicit-pointer-conversion.patch
desktop/trunk/orage/debian/patches/03_de.po-typo.patch
Modified:
desktop/trunk/orage/debian/changelog
desktop/trunk/orage/debian/rules
Log:
* New upstream svn snapshot.
- buttons in confirmation dialog are in correct order. closes: #468867
- orage no longers open /usr/local/etc/zoneinfo. closes: #478963
- no selection of “week start day” anymore. closes: #482112
* debian/rules:
- call dh_desktop so the mime database gets updated.
- don't install our own manpage.
* debian/patches:
- drop 01_tune-desktop-file, useless now.
- drop 02_fix-implicit-pointer-conversion, useless now.
- drop 03_de.po-typo, useless now.
- 01_install-manpages-usr-share added, install manpages in /usr/share.
* debian/orage.1 removed, since upstream now provides it.
Modified: desktop/trunk/orage/debian/changelog
===================================================================
--- desktop/trunk/orage/debian/changelog 2008-07-05 13:09:50 UTC (rev 2171)
+++ desktop/trunk/orage/debian/changelog 2008-07-05 15:46:36 UTC (rev 2172)
@@ -1,10 +1,22 @@
-orage (4.5.12.2-7) UNRELEASED; urgency=low
+orage (4.5.13.9~svn-r27141-1) UNRELEASED; urgency=low
- * debian/rules: call dh_desktop so the mime database gets updated.
+ * New upstream svn snapshot.
+ - buttons in confirmation dialog are in correct order. closes: #468867
+ - orage no longers open /usr/local/etc/zoneinfo. closes: #478963
+ - no selection of “week start day” anymore. closes: #482112
+ * debian/rules:
+ - call dh_desktop so the mime database gets updated.
+ - don't install our own manpage.
* debian/control:
- update standards version to 3.8.0.
+ * debian/patches:
+ - drop 01_tune-desktop-file, useless now.
+ - drop 02_fix-implicit-pointer-conversion, useless now.
+ - drop 03_de.po-typo, useless now.
+ - 01_install-manpages-usr-share added, install manpages in /usr/share.
+ * debian/orage.1 removed, since upstream now provides it.
- -- Yves-Alexis Perez <corsac at debian.org> Wed, 02 Jul 2008 21:59:38 +0200
+ -- Yves-Alexis Perez <corsac at debian.org> Sat, 05 Jul 2008 17:16:25 +0200
orage (4.5.12.2-6) unstable; urgency=low
Deleted: desktop/trunk/orage/debian/orage.1
===================================================================
--- desktop/trunk/orage/debian/orage.1 2008-07-05 13:09:50 UTC (rev 2171)
+++ desktop/trunk/orage/debian/orage.1 2008-07-05 15:46:36 UTC (rev 2172)
@@ -1,16 +0,0 @@
-.\" Copyright (C) 2005 Yves-Alexis Perez <corsac at corsac.net>
-.TH ORAGE "1" "December 2005" "4.3.1.22svn" "User Commands"
-.SH NAME
-orage \- Xfce Calendar Application
-.SH SYNOPSIS
-.B orage
-.SH DESCRIPTION
-.PP
-Starts orage, the Xfce Calendar Application
-.SH "REPORTING BUGS"
-Report bugs to <pkg-xfce-devel at lists.alioth.debian.org>.
-.SH COPYRIGHT
-Copyright \(co 2005 Yves-Alexis Perez
-.br
-This is free software; see the source for copying conditions. There is NO
-warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
Added: desktop/trunk/orage/debian/patches/01_install-manpages-usr-share.patch
===================================================================
--- desktop/trunk/orage/debian/patches/01_install-manpages-usr-share.patch (rev 0)
+++ desktop/trunk/orage/debian/patches/01_install-manpages-usr-share.patch 2008-07-05 15:46:36 UTC (rev 2172)
@@ -0,0 +1,26 @@
+diff --git a/doc/Makefile.in b/doc/Makefile.in
+index 9695810..6899865 100644
+--- a/doc/Makefile.in
++++ b/doc/Makefile.in
+@@ -229,7 +229,7 @@ libdir = @libdir@
+ libexecdir = @libexecdir@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
+-mandir = ${prefix}/man
++mandir = ${prefix}/share/man
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+ pdfdir = @pdfdir@
+diff --git a/globaltime/Makefile.in b/globaltime/Makefile.in
+index c270e35..a6f68ea 100644
+--- a/globaltime/Makefile.in
++++ b/globaltime/Makefile.in
+@@ -241,7 +241,7 @@ libdir = @libdir@
+ libexecdir = @libexecdir@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
+-mandir = ${prefix}/man
++mandir = ${prefix}/share/man
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+ pdfdir = @pdfdir@
Deleted: desktop/trunk/orage/debian/patches/01_tune-desktop-file.patch
===================================================================
--- desktop/trunk/orage/debian/patches/01_tune-desktop-file.patch 2008-07-05 13:09:50 UTC (rev 2171)
+++ desktop/trunk/orage/debian/patches/01_tune-desktop-file.patch 2008-07-05 15:46:36 UTC (rev 2172)
@@ -1,10 +0,0 @@
---- orage-4.5.12.2-svn/xfcalendar.desktop.in.orig 2008-01-21 05:22:19.000000000 +0100
-+++ orage-4.5.12.2-svn/xfcalendar.desktop.in 2008-02-13 08:12:53.000000000 +0100
-@@ -8,5 +8,6 @@
- StartupNotify=true
-+MimeType=text/calendar;
- Terminal=false
- Type=Application
--Categories=X-XFCE;Calendar;GTK;
-+Categories=X-XFCE;Office;Calendar;GTK;
- _GenericName=Calendar
Deleted: desktop/trunk/orage/debian/patches/02_fix-implicit-pointer-conversion.patch
===================================================================
--- desktop/trunk/orage/debian/patches/02_fix-implicit-pointer-conversion.patch 2008-07-05 13:09:50 UTC (rev 2171)
+++ desktop/trunk/orage/debian/patches/02_fix-implicit-pointer-conversion.patch 2008-07-05 15:46:36 UTC (rev 2172)
@@ -1,20 +0,0 @@
---- orage-4.5.12.2.orig/src/functions.c 2008-01-20 21:22:12.000000000 -0700
-+++ orage-4.5.12.2/src/functions.c 2008-02-13 12:55:56.000000000 -0700
-@@ -21,16 +21,17 @@
-
- */
-
-+#define _XOPEN_SOURCE /* glibc2 needs this */
- #include <stdio.h>
- #include <stdlib.h>
- #include <unistd.h>
--#define _XOPEN_SOURCE /* glibc2 needs this */
- #include <time.h>
- #include <string.h>
- #include <sys/types.h>
- #include <sys/wait.h>
-
- #include <glib.h>
-+#include <glib/gprintf.h>
- #include <gtk/gtk.h>
- #include <gdk/gdk.h>
Deleted: desktop/trunk/orage/debian/patches/03_de.po-typo.patch
===================================================================
--- desktop/trunk/orage/debian/patches/03_de.po-typo.patch 2008-07-05 13:09:50 UTC (rev 2171)
+++ desktop/trunk/orage/debian/patches/03_de.po-typo.patch 2008-07-05 15:46:36 UTC (rev 2172)
@@ -1,11 +0,0 @@
---- orage-4.5.12.2/po/de.po.orig 2008-01-21 05:22:19.000000000 +0100
-+++ orage-4.5.12.2/po/de.po 2008-02-29 13:03:54.000000000 +0100
-@@ -431,7 +431,7 @@
- #. the button label in the xfce-mcs-manager dialog
- #: ../plugin/xfcalendar_plugin.c:47
- msgid "Orage - Calendar"
--msgstr "Orange-Kalender"
-+msgstr "Orage-Kalender"
-
- #: ../src/about-xfcalendar.c:42
- msgid "Manage your time with Xfce4"
Modified: desktop/trunk/orage/debian/rules
===================================================================
--- desktop/trunk/orage/debian/rules 2008-07-05 13:09:50 UTC (rev 2171)
+++ desktop/trunk/orage/debian/rules 2008-07-05 15:46:36 UTC (rev 2172)
@@ -18,6 +18,5 @@
binary-post-install/orage::
dh_desktop
- dh_installman debian/orage.1
install -D -p -o root -g root -m 644 debian/lintian $(CURDIR)/debian/orage/usr/share/lintian/overrides/orage