[Python-apps-commits] r714 - in packages/screenlets/trunk/debian (5 files)

gilir-guest at users.alioth.debian.org gilir-guest at users.alioth.debian.org
Wed Feb 27 19:48:20 UTC 2008 

    Date: Wednesday, February 27, 2008 @ 19:48:17
  Author: gilir-guest
Revision: 714

* Some cleanup

Added:
  packages/screenlets/trunk/debian/patches/01-fix-menu-icon.patch
  packages/screenlets/trunk/debian/patches/02-Fix-encoding-desktop-file.patch
Modified:
  packages/screenlets/trunk/debian/changelog
  packages/screenlets/trunk/debian/control
  packages/screenlets/trunk/debian/screenlets.install

Modified: packages/screenlets/trunk/debian/changelog
===================================================================
--- packages/screenlets/trunk/debian/changelog	2008-02-26 15:08:33 UTC (rev 713)
+++ packages/screenlets/trunk/debian/changelog	2008-02-27 19:48:17 UTC (rev 714)
@@ -3,15 +3,16 @@
   * New upstream release
   * debian/control
    - Add screenlets-doc binary.
-   - Add python-epydoc, doc-base, python-docutils and screenlets Build Depends 
-   to build API documentation.
+   - Change python-dev to python-all-dev in Build Depends.
+   - Move python-central to Build-Depends-Indep.
+   - Add python-epydoc, doc-base, python-docutils and screenlets 
+     Build-Depends-Indep to build API documentation.
    - Add python-imaging Recommends for SlideShow Screenlets.
    - Add python-feedparser Recommends for ClearRSS Screenlets.
    - Wrap Build Depends and Depends.
-   - Change python-dev to python-all-dev Build Depends.
    - Add Suggest metacity (>= 2.21.4) which support composite.
    - Add Suggest python-dcop for the NowPlaying Screenlets.
-   - Mention in the description that Screenlets work also on non-compisited 
+   - Mention in the description that Screenlets work also on non-composited 
    desktop.
   * debian/copyright
    - Update upstream authors.
@@ -23,11 +24,10 @@
    - Add a binary-predeb rule to delete empty /usr/lib folder and bad 
    theme folder.
    - Remove other rm and rmdir commands, handle by *.install files.
-   - Fix 755 mode for svg and conf files.
+   - Fix 755 mode for conf files.
    - Add screenletsd.1 in man pages.
   * debian/screenlets.install
    - Rename install to screenlets.install to add screenlets-doc package.
-   - Add all installed files.
    - Install dbus service properly.
   * debian/screenlets-doc.install
    - Install docs files.
@@ -35,7 +35,10 @@
    - Rename links to screenlets.links.
   * debian/patches
    - Drop 09-delete-example-files.patch, handle by *.install files.
-   - Drop all others patches, merge upstream.
+   - Drop previous patches, merge upstream.
+   - 01-fix-menu-icon.patch : Fix "non icon" bug in contextual menu.
+   - 02-Fix-encoding-desktop-file.patch : Delete encoding in screenlets-manager
+     desktop file.
   * debian/watch
    - Update to the new location of upstream tarball.
   * Debian/README

Modified: packages/screenlets/trunk/debian/control
===================================================================
--- packages/screenlets/trunk/debian/control	2008-02-26 15:08:33 UTC (rev 713)
+++ packages/screenlets/trunk/debian/control	2008-02-27 19:48:17 UTC (rev 714)
@@ -5,12 +5,12 @@
 Uploaders: Python Applications Packaging Team <python-apps-team at lists.alioth.debian.org>
 Build-Depends: 	debhelper (>= 5), 
 		cdbs,
-		python-central (>= 0.5.6), 
-		python-all-dev (>= 2.3.5-11),
-		screenlets,
-		python-epydoc,
-		doc-base,
-		python-docutils
+		python-all-dev (>= 2.3.5-11)
+Build-Depends-Indep:	python-central (>= 0.5.6),
+			screenlets,
+			python-epydoc,
+			doc-base,
+			python-docutils
 Standards-Version: 3.7.3
 Homepage: http://screenlets.org
 XS-Python-Version: current
@@ -61,9 +61,8 @@
 Package: screenlets-doc
 Section: doc
 Architecture: all
-Depends: 	${misc:Depends}, 
-		${python:Depends}, 
-XB-Python-Version: ${python:Versions}
+Depends: 	screenlets,
+		${misc:Depends}
 Description: Widget-like mini-applications for GNOME - Documentation package
  Screenlets are small owner-drawn applications (written in Python) that can be
  described as "the virtual representation of things lying/standing around on

Added: packages/screenlets/trunk/debian/patches/01-fix-menu-icon.patch
===================================================================
--- packages/screenlets/trunk/debian/patches/01-fix-menu-icon.patch	                        (rev 0)
+++ packages/screenlets/trunk/debian/patches/01-fix-menu-icon.patch	2008-02-27 19:48:17 UTC (rev 714)
@@ -0,0 +1,24 @@
+diff -ur screenlets.orig/src/share/screenlets/Gmail/menu.xml screenlets/src/share/screenlets/Gmail/menu.xml
+--- screenlets.orig/src/share/screenlets/Gmail/menu.xml	2008-02-20 20:46:15.000000000 +0100
++++ screenlets/src/share/screenlets/Gmail/menu.xml	2008-02-20 20:46:43.000000000 +0100
+@@ -21,6 +21,6 @@
+ 	<!-- Uncomment to add Hide/show option to menu -->
+ 	<!--<item label="Hide/Show" id="hide_show" />-->
+ 	<!-- user definable actions here: -->
+-	<imageitem label="Update"  id="update" />
++	<item label="Update"  id="update" />
+ 
+ </menu>
+Seulement dans screenlets/src/share/screenlets/Gmail: menu.xml~
+diff -ur screenlets.orig/src/share/screenlets/MyIp/menu.xml screenlets/src/share/screenlets/MyIp/menu.xml
+--- screenlets.orig/src/share/screenlets/MyIp/menu.xml	2008-02-20 20:46:16.000000000 +0100
++++ screenlets/src/share/screenlets/MyIp/menu.xml	2008-02-20 20:53:11.000000000 +0100
+@@ -22,6 +22,6 @@
+ 	<!--<item label="Hide/Show" id="hide_show" />-->
+ 	<!-- user definable actions here: -->
+ 	<!-- <imageitem label="radio name"  id="radio address SPACE radio name" />-->
+-	<imageitem label="Update now"  id="update" />
++	<item label="Update now"  id="update" />
+ 	
+ </menu>
+Seulement dans screenlets/src/share/screenlets/MyIp: menu.xml~

Added: packages/screenlets/trunk/debian/patches/02-Fix-encoding-desktop-file.patch
===================================================================
--- packages/screenlets/trunk/debian/patches/02-Fix-encoding-desktop-file.patch	                        (rev 0)
+++ packages/screenlets/trunk/debian/patches/02-Fix-encoding-desktop-file.patch	2008-02-27 19:48:17 UTC (rev 714)
@@ -0,0 +1,12 @@
+diff -ur screenlets.orig/desktop-menu/screenlets-manager.desktop screenlets/desktop-menu/screenlets-manager.desktop
+--- screenlets.orig/desktop-menu/screenlets-manager.desktop	2008-02-26 22:22:10.000000000 +0100
++++ screenlets/desktop-menu/screenlets-manager.desktop	2008-02-26 22:25:46.000000000 +0100
+@@ -7,7 +7,6 @@
+ Comment=A graphical tool to manage your Screenlets.
+ Comment[de]=Ein grafisches Werkzeug, um Ihre Screenlets zu verwalten.
+ Comment[et]=Graafiline tööriist Screenlets vidinate haldamiseks
+-Encoding=UTF-8
+ Icon=/usr/share/icons/screenlets.svg
+ Exec=/usr/share/screenlets-manager/screenlets-manager.py > /dev/null
+ StartupNotify=true
+Seulement dans screenlets/desktop-menu: screenlets-manager.desktop~

Modified: packages/screenlets/trunk/debian/screenlets.install
===================================================================
--- packages/screenlets/trunk/debian/screenlets.install	2008-02-26 15:08:33 UTC (rev 713)
+++ packages/screenlets/trunk/debian/screenlets.install	2008-02-27 19:48:17 UTC (rev 714)
@@ -1,6 +1,4 @@
-debian/tmp/usr/bin/screenlets-manager
-debian/tmp/usr/bin/screenlets-packager
-debian/tmp/usr/bin/screenletsd
+debian/tmp/usr/bin
 debian/tmp/usr/share/screenlets
 debian/tmp/usr/lib
 debian/tmp/usr/share/screenlets-manager

More information about the Python-apps-commits mailing list