[Python-apps-commits] r2803 - in packages/screenlets/trunk/debian (8 files)
gilir-guest at users.alioth.debian.org
gilir-guest at users.alioth.debian.org
Mon Apr 27 22:31:56 UTC 2009
Date: Monday, April 27, 2009 @ 22:31:55
Author: gilir-guest
Revision: 2803
Switch to quilt
Add patch to disable opacity when the screen is not composited (#518179)
Added:
packages/screenlets/trunk/debian/patches/13-opacity-option.patch
packages/screenlets/trunk/debian/patches/series
Modified:
packages/screenlets/trunk/debian/README.source
packages/screenlets/trunk/debian/changelog
packages/screenlets/trunk/debian/control
packages/screenlets/trunk/debian/patches/04-install-wallclock-in-home.patch
packages/screenlets/trunk/debian/patches/11-xfce-wallpaper-setting.patch
packages/screenlets/trunk/debian/rules
Modified: packages/screenlets/trunk/debian/README.source
===================================================================
--- packages/screenlets/trunk/debian/README.source 2009-04-27 20:36:51 UTC (rev 2802)
+++ packages/screenlets/trunk/debian/README.source 2009-04-27 22:31:55 UTC (rev 2803)
@@ -1,4 +1,57 @@
-This package uses CDBS simple patchsys. dpkg-source -x does produce source
-ready for building with dpkg-buildpackage. It does not procude source ready
-for editing. To edit or update a patch, use cdbs-edit-patch.
-See cdbs-edit-patch(1) manual page for details.
+This package uses quilt to manage all modifications to the upstream
+source. Changes are stored in the source package as diffs in
+debian/patches and applied during the build.
+
+To configure quilt to use debian/patches instead of patches, you want
+either to export QUILT_PATCHES=debian/patches in your environment
+or use this snippet in your ~/.quiltrc:
+
+ for where in ./ ../ ../../ ../../../ ../../../../ ../../../../../; do
+ if [ -e ${where}debian/rules -a -d ${where}debian/patches ]; then
+ export QUILT_PATCHES=debian/patches
+ fi
+ done
+
+To get the fully patched source after unpacking the source package, cd to
+the root level of the source package and run:
+
+ quilt push -a
+
+The last patch listed in debian/patches/series will become the current
+patch.
+
+To add a new set of changes, first run quilt push -a, and then run:
+
+ quilt new <patch>
+
+where <patch> is a descriptive name for the patch, used as the filename in
+debian/patches. Then, for every file that will be modified by this patch,
+run:
+
+ quilt add <file>
+
+before editing those files. You must tell quilt with quilt add what files
+will be part of the patch before making changes or quilt will not work
+properly. After editing the files, run:
+
+ quilt refresh
+
+to save the results as a patch.
+
+Alternately, if you already have an external patch and you just want to
+add it to the build system, run quilt push -a and then:
+
+ quilt import -P <patch> /path/to/patch
+ quilt push -a
+
+(add -p 0 to quilt import if needed). <patch> as above is the filename to
+use in debian/patches. The last quilt push -a will apply the patch to
+make sure it works properly.
+
+To remove an existing patch from the list of patches that will be applied,
+run:
+
+ quilt delete <patch>
+
+You may need to run quilt pop -a to unapply patches first before running
+this command.
Modified: packages/screenlets/trunk/debian/changelog
===================================================================
--- packages/screenlets/trunk/debian/changelog 2009-04-27 20:36:51 UTC (rev 2802)
+++ packages/screenlets/trunk/debian/changelog 2009-04-27 22:31:55 UTC (rev 2803)
@@ -1,3 +1,15 @@
+screenlets (0.1.2-6) UNRELEASED; urgency=low
+
+ * debian/rules: Replace simple-patchsys by quilt.
+ * debian/control: Build-depends on quilt.
+ * debian/patches:
+ - 13-opacity-option.patch: Disable the opacity option if the screen
+ is not composited (Closes: #518179).
+ - Update patches to apply with quilt.
+ * debian/README.source: Replace by the quilt one.
+
+ -- Julien Lavergne <julien.lavergne at gmail.com> Tue, 28 Apr 2009 00:21:57 +0200
+
screenlets (0.1.2-5) unstable; urgency=medium
* Urgency to medium to fix RC bug.
Modified: packages/screenlets/trunk/debian/control
===================================================================
--- packages/screenlets/trunk/debian/control 2009-04-27 20:36:51 UTC (rev 2802)
+++ packages/screenlets/trunk/debian/control 2009-04-27 22:31:55 UTC (rev 2803)
@@ -5,6 +5,7 @@
Uploaders: Python Applications Packaging Team <python-apps-team at lists.alioth.debian.org>
Build-Depends: debhelper (>= 5),
cdbs,
+ quilt,
python-dev (>= 2.3.5-11)
Build-Depends-Indep: python-support (>= 0.6.0),
doc-base
Modified: packages/screenlets/trunk/debian/patches/04-install-wallclock-in-home.patch
===================================================================
--- packages/screenlets/trunk/debian/patches/04-install-wallclock-in-home.patch 2009-04-27 20:36:51 UTC (rev 2802)
+++ packages/screenlets/trunk/debian/patches/04-install-wallclock-in-home.patch 2009-04-27 22:31:55 UTC (rev 2803)
@@ -1,8 +1,8 @@
#Upstream bugtracker entry: https://bugs.launchpad.net/screenlets/+bug/275301
#Copyright: Julien Lavergne
=== modified file 'src/share/screenlets/WallpaperClock/WallpaperClockScreenlet.py'
---- src/share/screenlets/WallpaperClock/WallpaperClockScreenlet.py 2008-08-30 08:46:17 +0000
-+++ src/share/screenlets/WallpaperClock/WallpaperClockScreenlet.py 2008-08-30 09:10:52 +0000
+--- screenlets/src/share/screenlets/WallpaperClock/WallpaperClockScreenlet.py 2008-08-30 08:46:17 +0000
++++ screenlets/src/share/screenlets/WallpaperClock/WallpaperClockScreenlet.py 2008-08-30 09:10:52 +0000
@@ -160,8 +160,8 @@
tar_opts = '-o'
Modified: packages/screenlets/trunk/debian/patches/11-xfce-wallpaper-setting.patch
===================================================================
--- packages/screenlets/trunk/debian/patches/11-xfce-wallpaper-setting.patch 2009-04-27 20:36:51 UTC (rev 2802)
+++ packages/screenlets/trunk/debian/patches/11-xfce-wallpaper-setting.patch 2009-04-27 22:31:55 UTC (rev 2803)
@@ -1,8 +1,8 @@
#Debian bug : #497222
#Upstream bug : https://bugs.launchpad.net/screenlets/+bug/263310
=== modified file 'src/share/screenlets/WallpaperClock/WallpaperClockScreenlet.py'
---- src/share/screenlets/WallpaperClock/WallpaperClockScreenlet.py 2008-08-30 09:22:46 +0000
-+++ src/share/screenlets/WallpaperClock/WallpaperClockScreenlet.py 2009-02-21 15:33:34 +0000
+--- screenlets/src/share/screenlets/WallpaperClock/WallpaperClockScreenlet.py 2008-08-30 09:22:46 +0000
++++ screenlets/src/share/screenlets/WallpaperClock/WallpaperClockScreenlet.py 2009-02-21 15:33:34 +0000
@@ -431,6 +431,12 @@
except:
pass
Added: packages/screenlets/trunk/debian/patches/13-opacity-option.patch
===================================================================
--- packages/screenlets/trunk/debian/patches/13-opacity-option.patch (rev 0)
+++ packages/screenlets/trunk/debian/patches/13-opacity-option.patch 2009-04-27 22:31:55 UTC (rev 2803)
@@ -0,0 +1,50 @@
+#Debian : http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=518179
+#Upstream : https://bugs.launchpad.net/screenlets/+bug/340197
+
+Index: trunk/src/lib/__init__.py
+===================================================================
+--- trunk.orig/src/lib/__init__.py 2009-04-28 00:15:03.000000000 +0200
++++ trunk/src/lib/__init__.py 2009-04-28 00:17:37.000000000 +0200
+@@ -865,6 +865,10 @@
+ self.first_run = True
+ self.window.hide()
+
++ #Make opacity available only when composite is enable
++ if not self.window.is_composited () :
++ self.disable_option('opacity')
++
+ def __setattr__ (self, name, value):
+ # set the value in GObject (ESSENTIAL!!!!)
+ self.on_before_set_atribute(name, value)
+@@ -1726,7 +1730,11 @@
+
+ if not self.window.is_composited () :
+ self.show_buttons = False
+- # print _('Warning - Buttons will not be shown until screenlet is restarted')
++ self.disable_option("opacity")
++ # print _('Warning - Buttons will not be shown until screenlet is restarted')
++
++ if self.window.is_composited () :
++ self.enable_option("opacity")
+
+ self.is_sticky = self.is_sticky #and again ...
+ self.keep_above= self.keep_above
+Index: trunk/src/lib/options.py
+===================================================================
+--- trunk.orig/src/lib/options.py 2009-04-28 00:15:12.000000000 +0200
++++ trunk/src/lib/options.py 2009-04-28 00:18:08.000000000 +0200
+@@ -423,6 +423,14 @@
+ o.disabled = True
+ return True
+ return False
++
++ def enable_option (self, name):
++ """Enable the inputs for a certain Option."""
++ for o in self.__options__:
++ if o.name == name:
++ o.disabled = False
++ return True
++ return False
+
+ def export_options_as_list (self):
+ """Returns all editable options within a list (without groups)
Added: packages/screenlets/trunk/debian/patches/series
===================================================================
--- packages/screenlets/trunk/debian/patches/series (rev 0)
+++ packages/screenlets/trunk/debian/patches/series 2009-04-27 22:31:55 UTC (rev 2803)
@@ -0,0 +1,10 @@
+01-scripts-cleanup.patch
+02-fix-acpi-crash.patch
+03-fix-wallpaperclock-location.patch
+04-install-wallclock-in-home.patch
+05-places-no-bookmark.patch
+06-main-menu-no-bookmark.patch
+10-ImageMenuItem-update.patch
+11-xfce-wallpaper-setting.patch
+12-new-class-creation.patch
+13-opacity-option.patch
Modified: packages/screenlets/trunk/debian/rules
===================================================================
--- packages/screenlets/trunk/debian/rules 2009-04-27 20:36:51 UTC (rev 2802)
+++ packages/screenlets/trunk/debian/rules 2009-04-27 22:31:55 UTC (rev 2803)
@@ -5,7 +5,7 @@
DEB_PYTHON_SYSTEM=pysupport
include /usr/share/cdbs/1/class/python-distutils.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
+include /usr/share/quilt/quilt.make
DEB_PYTHON_MODULE_PACKAGE := screenlets
DEB_PYTHON_PRIVATE_MODULES_DIRS := debian/tmp/usr/share/screenlets
More information about the Python-apps-commits
mailing list