cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to backintime-1.0.8.

Browse Source
This commit is contained in:
ajacoutot 2011-09-15 06:54:41 +00:00
parent 911192190c
commit 6dab34c4c1
10 changed files with 37 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sysutils/backintime/Makefile.inc
View File

@ -1,6 +1,6 @@
# $OpenBSD: Makefile.inc,v 1.4 2011/03/03 13:49:27 ajacoutot Exp $
# $OpenBSD: Makefile.inc,v 1.5 2011/09/15 06:54:41 ajacoutot Exp $
V= 1.0.6
V= 1.0.8
BASENAME= backintime-${V}
DISTNAME= ${BASENAME}_src

4
sysutils/backintime/common/Makefile
View File

@ -1,9 +1,8 @@
# $OpenBSD: Makefile,v 1.6 2011/06/08 17:50:25 jasper Exp $
# $OpenBSD: Makefile,v 1.7 2011/09/15 06:54:41 ajacoutot Exp $
COMMENT= simple backup tool -- common files
PKGNAME= backintime-common-${V}
REVISION= 0
WRKSRC= ${WRKDIST}/common
@ -12,6 +11,5 @@ RUN_DEPENDS= misc/fileutils \
net/rsync
SUBST_FILES= backintime config.py
USE_GROFF = Yes
.include <bsd.port.mk>

10
sysutils/backintime/common/distinfo
View File

@ -1,5 +1,5 @@
MD5 (backintime-1.0.6_src.tar.gz) = 9m/1l5pQSM4shbIseI92XA==
RMD160 (backintime-1.0.6_src.tar.gz) = Q+4EtHdbZfllA3o1sFIEaJRtl5I=
SHA1 (backintime-1.0.6_src.tar.gz) = 1XR7OiObVHqEbsHomXOOoIHMsbU=
SHA256 (backintime-1.0.6_src.tar.gz) = 56UhgQt0gr/v2UZ2x0IVWBjmB9lONVwANB9PZGrAq6E=
SIZE (backintime-1.0.6_src.tar.gz) = 291924
MD5 (backintime-1.0.8_src.tar.gz) = Z2x0PLZP3GRsKQxi5FZA/w==
RMD160 (backintime-1.0.8_src.tar.gz) = JRbr31KKPMrIyZOtJqXj5NiRELw=
SHA1 (backintime-1.0.8_src.tar.gz) = 2WKzdCM4CZGY7XY68iBqrEK6+uY=
SHA256 (backintime-1.0.8_src.tar.gz) = +4NzauBnGw1jRoqdOaKTNDINk98ASRHMGSsZid+X2TE=
SIZE (backintime-1.0.8_src.tar.gz) = 291473

12
sysutils/backintime/common/patches/patch-common_snapshots_py
View File

@ -1,11 +1,11 @@
$OpenBSD: patch-common_snapshots_py,v 1.2 2010/11/05 16:39:10 ajacoutot Exp $
$OpenBSD: patch-common_snapshots_py,v 1.3 2011/09/15 06:54:41 ajacoutot Exp $
OpenBSD does not support extended attributes & ACLs.
Needs the "--link" option from gcp(1) for incremental backups.
--- common/snapshots.py.orig Sun Oct 24 21:31:26 2010
+++ common/snapshots.py Fri Nov 5 16:11:52 2010
@@ -507,14 +507,14 @@ class Snapshots:
--- common/snapshots.py.orig Sun Jun 5 13:57:48 2011
+++ common/snapshots.py Wed Sep 14 15:17:46 2011
@@ -561,14 +561,14 @@ class Snapshots:
#cmd = "chmod -R u+rwx \"%s\"" % path
cmd = "find \"%s\" -type d -exec chmod u+wx {} \\;" % path #Debian patch
self._execute( cmd )
@ -22,7 +22,7 @@ Needs the "--link" option from gcp(1) for incremental backups.
logger.info( '%s is copied to folder %s' %( snapshot_id, new_folder ) )
self._execute( cmd )
@@ -1049,7 +1049,7 @@ class Snapshots:
@@ -1092,7 +1092,7 @@ class Snapshots:
self._execute( "find \"%s\" -type d -exec chmod u+wx {} \\;" % prev_snapshot_path ) #Debian patch
#clone snapshot
@ -31,7 +31,7 @@ Needs the "--link" option from gcp(1) for incremental backups.
self.append_to_take_snapshot_log( '[I] ' + cmd, 3 )
cmd_ret_val = self._execute( cmd )
self.append_to_take_snapshot_log( "[I] returns: %s" % cmd_ret_val, 3 )
@@ -1098,7 +1098,7 @@ class Snapshots:
@@ -1141,7 +1141,7 @@ class Snapshots:
#backup config file
logger.info( 'Save config file' )
self.set_take_snapshot_message( 0, _('Save config file ...') )

6
sysutils/backintime/gnome/Makefile
View File

@ -1,9 +1,8 @@
# $OpenBSD: Makefile,v 1.5 2011/06/08 17:50:25 jasper Exp $
# $OpenBSD: Makefile,v 1.6 2011/09/15 06:54:41 ajacoutot Exp $
COMMENT= simple backup tool -- GNOME UI
PKGNAME= backintime-gnome-${V}
REVISION= 0
CATEGORIES= x11
@ -12,9 +11,8 @@ WRKSRC= ${WRKDIST}/gnome
SUBST_FILES= backintime-gnome
CONFIGURE_ARGS= --no-check
USE_GROFF = Yes
RUN_DEPENDS= sysutils/backintime/common \
RUN_DEPENDS= sysutils/backintime/common>=${V} \
textproc/meld \
x11/gnome/py-gnome \
devel/py-notify \

10
sysutils/backintime/gnome/distinfo
View File

@ -1,5 +1,5 @@
MD5 (backintime-1.0.6_src.tar.gz) = 9m/1l5pQSM4shbIseI92XA==
RMD160 (backintime-1.0.6_src.tar.gz) = Q+4EtHdbZfllA3o1sFIEaJRtl5I=
SHA1 (backintime-1.0.6_src.tar.gz) = 1XR7OiObVHqEbsHomXOOoIHMsbU=
SHA256 (backintime-1.0.6_src.tar.gz) = 56UhgQt0gr/v2UZ2x0IVWBjmB9lONVwANB9PZGrAq6E=
SIZE (backintime-1.0.6_src.tar.gz) = 291924
MD5 (backintime-1.0.8_src.tar.gz) = Z2x0PLZP3GRsKQxi5FZA/w==
RMD160 (backintime-1.0.8_src.tar.gz) = JRbr31KKPMrIyZOtJqXj5NiRELw=
SHA1 (backintime-1.0.8_src.tar.gz) = 2WKzdCM4CZGY7XY68iBqrEK6+uY=
SHA256 (backintime-1.0.8_src.tar.gz) = +4NzauBnGw1jRoqdOaKTNDINk98ASRHMGSsZid+X2TE=
SIZE (backintime-1.0.8_src.tar.gz) = 291473

31
sysutils/backintime/gnome/patches/patch-gnome_plugins_gnomeplugin_py
View File

@ -1,31 +0,0 @@
$OpenBSD: patch-gnome_plugins_gnomeplugin_py,v 1.1 2010/11/05 16:39:10 ajacoutot Exp $
GError: 0 is not a valid notification ID
--- gnome/plugins/gnomeplugin.py.orig Fri Nov 5 17:10:07 2010
+++ gnome/plugins/gnomeplugin.py Fri Nov 5 17:13:01 2010
@@ -24,6 +24,11 @@ import threading
import time
import gettext
+try:
+ import glib
+except ImportError:
+ import gobject as glib
+
_=gettext.gettext
if len( os.getenv( 'DISPLAY', '' ) ) == 0:
@@ -147,7 +152,11 @@ class GnomePlugin( pluginmanager.Plugin ):
status_icon.set_visible( False )
gtk.main_iteration( False )
- self.notification.close()
+ try:
+ self.notification.close()
+ except glib.GError:
+ pass # Ignore error thrown when there's no message to close
+
pynotify.uninit()
logger.info( '[GnomePlugin.Systray.run] end loop' )

14
sysutils/backintime/gnome/patches/patch-gnome_settingsdialog_glade
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-gnome_settingsdialog_glade,v 1.2 2011/03/03 13:49:27 ajacoutot Exp $
--- gnome/settingsdialog.glade.orig Sun Jan 2 15:01:38 2011
+++ gnome/settingsdialog.glade Mon Feb 21 19:26:32 2011
@@ -1088,32 +1088,6 @@
$OpenBSD: patch-gnome_settingsdialog_glade,v 1.3 2011/09/15 06:54:41 ajacoutot Exp $
--- gnome/settingsdialog.glade.orig Wed Sep 14 15:33:09 2011
+++ gnome/settingsdialog.glade Wed Sep 14 15:33:24 2011
@@ -1326,36 +1326,6 @@
</packing>
</child>
<child>
@ -10,23 +10,27 @@ $OpenBSD: patch-gnome_settingsdialog_glade,v 1.2 2011/03/03 13:49:27 ajacoutot E
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_action_appearance">False</property>
- <property name="draw_indicator">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">2</property>
- </packing>
- </child>
- <child>
- <object class="GtkCheckButton" id="cb_run_ionice_from_user">
- <property name="label" translatable="yes">Run 'ionice' when tacking a manual snapshot (default: disabled)</property>
- <property name="label" translatable="yes">Run 'ionice' when taking a manual snapshot (default: disabled)</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_action_appearance">False</property>
- <property name="draw_indicator">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">3</property>
- </packing>
- </child>

12
sysutils/backintime/gnome/patches/patch-gnome_settingsdialog_py
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-gnome_settingsdialog_py,v 1.2 2011/03/03 13:49:27 ajacoutot Exp $
--- gnome/settingsdialog.py.orig Sun Jan 2 15:01:38 2011
+++ gnome/settingsdialog.py Mon Feb 21 19:26:32 2011
@@ -271,8 +271,6 @@ class SettingsDialog(object):
$OpenBSD: patch-gnome_settingsdialog_py,v 1.3 2011/09/15 06:54:41 ajacoutot Exp $
--- gnome/settingsdialog.py.orig Sun Jun 5 13:42:25 2011
+++ gnome/settingsdialog.py Wed Sep 14 15:31:23 2011
@@ -269,8 +269,6 @@ class SettingsDialog(object):
#nice & ionice
self.cb_run_nice_from_cron = get('cb_run_nice_from_cron')
@ -10,7 +10,7 @@ $OpenBSD: patch-gnome_settingsdialog_py,v 1.2 2011/03/03 13:49:27 ajacoutot Exp
self.cb_preserve_acl = get('cb_preserve_acl')
self.cb_preserve_xattr = get('cb_preserve_xattr')
self.cb_copy_unsafe_links = get('cb_copy_unsafe_links')
@@ -499,12 +497,6 @@ class SettingsDialog(object):
@@ -497,12 +495,6 @@ class SettingsDialog(object):
#run 'nice' from cron
self.cb_run_nice_from_cron.set_active(self.config.is_run_nice_from_cron_enabled( self.profile_id ))
@ -23,7 +23,7 @@ $OpenBSD: patch-gnome_settingsdialog_py,v 1.2 2011/03/03 13:49:27 ajacoutot Exp
#don't run when on battery
self.cb_no_on_battery.set_active( self.config.is_no_on_battery_enabled( self.profile_id ) )
@@ -591,8 +583,6 @@ class SettingsDialog(object):
@@ -589,8 +581,6 @@ class SettingsDialog(object):
#expert options
#self.config.set_per_directory_schedule( self.cb_per_directory_schedule.get_active() )
self.config.set_run_nice_from_cron_enabled( self.cb_run_nice_from_cron.get_active(), self.profile_id )

3
sysutils/backintime/gnome/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.2 2010/11/05 16:39:11 ajacoutot Exp $
@comment $OpenBSD: PLIST,v 1.3 2011/09/15 06:54:41 ajacoutot Exp $
bin/backintime-gnome
@man man/man1/backintime-gnome.1
share/applications/backintime-gnome.desktop
@ -20,7 +20,6 @@ share/backintime/plugins/gnomeplugin.py
@comment share/gnome/help/backintime/
@comment share/gnome/help/backintime/C/
@comment share/gnome/help/backintime/C/backintime.xml
@comment share/gnome/help/backintime/C/figures/
@comment share/gnome/help/backintime/C/legal.xml
@comment share/omf/backintime/
@comment share/omf/backintime/backintime-C.omf