[Pkg-mono-svn-commits] rev 3349 - in beagle/trunk/debian: . patches

Jose Carlos Garcia Sogo jsogo at alioth.debian.org
Sun Sep 16 01:05:59 UTC 2007 

Author: jsogo
Date: 2007-09-16 01:05:59 +0000 (Sun, 16 Sep 2007)
New Revision: 3349

Modified:
   beagle/trunk/debian/beagle.menu
   beagle/trunk/debian/changelog
   beagle/trunk/debian/control
   beagle/trunk/debian/patches/00list
   beagle/trunk/debian/patches/fix_desktop_files.dpatch
Log:
 beagle:
  + Fix beagle.menu file and make it compatible with new names
  + Merge beagle-settings patch in fix_desktop_files so it can be cleanly
  uanpplied, fixing "building twice in a row fails" bug. Also, make some 
  other changes in Categories so it is also lintian clean


Modified: beagle/trunk/debian/beagle.menu
===================================================================
--- beagle/trunk/debian/beagle.menu	2007-09-15 23:19:30 UTC (rev 3348)
+++ beagle/trunk/debian/beagle.menu	2007-09-16 01:05:59 UTC (rev 3349)
@@ -1,2 +1,2 @@
-?package(beagle):needs="X11" section="Applications/Tools"\
+?package(beagle):needs="X11" section="Apps/Tools"\
   title="Beagle Search" command="/usr/bin/beagle-search" icon="/usr/share/pixmaps/system-search.png"

Modified: beagle/trunk/debian/changelog
===================================================================
--- beagle/trunk/debian/changelog	2007-09-15 23:19:30 UTC (rev 3348)
+++ beagle/trunk/debian/changelog	2007-09-16 01:05:59 UTC (rev 3349)
@@ -6,9 +6,14 @@
   * debian/patches:
      + icedove: Patch sources to run icedove instead of
        non-existant thunderbird (Closes: #431163)
-     + beagle-settings: update
+     + fix_desktop_files: merge beagle-setting patch in it, both were
+       patching the same file, making building twice in a row fail (Closes: #424142)
+       Also, add Type description to .desktop file lacking it, and change
+       Categories for beagle-search.desktop file, making the package more
+       lintian clean.
+     + beagle-settings: disabled
 
- -- Jose Carlos Garcia Sogo <jsogo at debian.org>  Sun, 16 Sep 2007 01:19:48 +0200
+ -- Jose Carlos Garcia Sogo <jsogo at debian.org>  Sun, 16 Sep 2007 02:50:23 +0200
 
 beagle (0.2.17-2) unstable; urgency=medium
 

Modified: beagle/trunk/debian/control
===================================================================
--- beagle/trunk/debian/control	2007-09-15 23:19:30 UTC (rev 3348)
+++ beagle/trunk/debian/control	2007-09-16 01:05:59 UTC (rev 3349)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian Mono Group <pkg-mono-group at lists.alioth.debian.org>
 Uploaders: Jose Carlos Garcia Sogo <jsogo at debian.org>, Mirco Bauer <meebey at debian.org>
-Build-Depends: debhelper (>= 5.0.37.2), cli-common-dev (>= 0.4.4), dpatch, intltool, mono-gmcs (>= 1.2.4-1) | c-sharp-2.0-compiler, libmono-dev (>= 1.0), libmono-cairo2.0-cil, libgnome2.0-cil, libglade2.0-cil, libgconf2.0-cil, libgmime2.2-cil, libevolution3.0-cil (>= 0.13.3-1), libgtk2.0-dev, libexif-dev, libsqlite3-dev, libmono-sqlite2.0-cil, libxss-dev, zip, libgnomevfs2-dev (>= 2.6), libgnome2-dev (>= 2.6), libgalago1.0-cil, autotools-dev, python-all-dev (>= 2.3.5-11), python2.4-gtk2, python-gtk2-dev, librsvg2-dev, libxml2-dev (>= 2.6.19), libxss-dev, libmono-sharpzip0.6-cil, libmono-system-runtime2.0-cil, libwv-dev, libgsf0.0-cil, python-support (>= 0.4), unzip, gtk-doc-tools
+Build-Depends: debhelper (>= 5.0.37.2), cli-common-dev (>= 0.4.4), dpatch, intltool, mono-gmcs (>= 1.2.4-1) | c-sharp-2.0-compiler, libmono-dev (>= 1.0), libmono-cairo2.0-cil, libgnome2.0-cil, libglade2.0-cil, libgconf2.0-cil, libgmime2.2-cil, libevolution3.0-cil (>= 0.13.3-1), libgtk2.0-dev, libexif-dev, libsqlite3-dev, libmono-sqlite2.0-cil, libxss-dev, zip, libgnomevfs2-dev (>= 2.6), libgnome2-dev (>= 2.6), libgalago1.0-cil, autotools-dev, python-all-dev (>= 2.3.5-11), python2.4-gtk2, python-gtk2-dev, librsvg2-dev, libxml2-dev (>= 2.6.19), libmono-sharpzip0.6-cil, libmono-system-runtime2.0-cil, libwv-dev, libgsf0.0-cil, python-support (>= 0.4), unzip, gtk-doc-tools
 Standards-Version: 3.7.2
 XS-X-Vcs-Svn: svn://svn.debian.org/svn/pkg-mono/beagle/trunk
 

Modified: beagle/trunk/debian/patches/00list
===================================================================
--- beagle/trunk/debian/patches/00list	2007-09-15 23:19:30 UTC (rev 3348)
+++ beagle/trunk/debian/patches/00list	2007-09-16 01:05:59 UTC (rev 3349)
@@ -1,9 +1,9 @@
 beagle-crawl-safely.dpatch
 beagle_secure_scripts.dpatch
-beagle-settings.dpatch
+#beagle-settings.dpatch
+fix_desktop_files.dpatch
 crawl-rules.dpatch
 usebash.dpatch
 use-python2.4.dpatch
 relibtoolize.dpatch
-fix_desktop_files.dpatch
 icedove.dpatch

Modified: beagle/trunk/debian/patches/fix_desktop_files.dpatch
===================================================================
--- beagle/trunk/debian/patches/fix_desktop_files.dpatch	2007-09-15 23:19:30 UTC (rev 3348)
+++ beagle/trunk/debian/patches/fix_desktop_files.dpatch	2007-09-16 01:05:59 UTC (rev 3349)
@@ -5,47 +5,54 @@
 ## DP: No description.
 
 @DPATCH@
-diff -urNad beagle-0.2.16~/search/beagle-search-autostart.desktop beagle-0.2.16/search/beagle-search-autostart.desktop
---- beagle-0.2.16~/search/beagle-search-autostart.desktop	2007-01-24 18:52:33.000000000 +0100
-+++ beagle-0.2.16/search/beagle-search-autostart.desktop	2007-04-05 13:34:06.000000000 +0200
-@@ -3,6 +3,5 @@
+diff -urNad beagle-0.2.18~/beagled/beagled-autostart.desktop beagle-0.2.18/beagled/beagled-autostart.desktop
+--- beagle-0.2.18~/beagled/beagled-autostart.desktop	2007-03-15 21:17:13.000000000 +0100
++++ beagle-0.2.18/beagled/beagled-autostart.desktop	2007-09-16 02:54:25.000000000 +0200
+@@ -3,6 +3,7 @@
+ Exec=beagled --replace
+ Name=Beagle Search Daemon
+ Terminal=false
++Type=Application
+ X-KDE-autostart-phase=2
+ X-KDE-autostart-after=panel
+ X-KDE-StartupNotify=false
+diff -urNad beagle-0.2.18~/search/beagle-search-autostart.desktop beagle-0.2.18/search/beagle-search-autostart.desktop
+--- beagle-0.2.18~/search/beagle-search-autostart.desktop	2007-02-07 20:04:11.000000000 +0100
++++ beagle-0.2.18/search/beagle-search-autostart.desktop	2007-09-16 02:54:25.000000000 +0200
+@@ -2,7 +2,7 @@
+ Encoding=UTF-8
  Exec=beagle-search --icon
  Name=Beagle Search Tool
++Type=Application
  Terminal=false
 -X-KDE-autostart-phase=2
 -X-KDE-autostart-after=panel
 -X-KDE-StartupNotify=false
 +NotShowIn=KDE
 +X-GNOME-Autostart-enabled=false
-diff -urNad beagle-0.2.16~/search/beagle-search.desktop.in beagle-0.2.16/search/beagle-search.desktop.in
---- beagle-0.2.16~/search/beagle-search.desktop.in	2007-02-07 17:33:06.000000000 +0100
-+++ beagle-0.2.16/search/beagle-search.desktop.in	2007-04-05 13:34:06.000000000 +0200
-@@ -10,6 +10,7 @@
+diff -urNad beagle-0.2.18~/search/beagle-search.desktop.in.in beagle-0.2.18/search/beagle-search.desktop.in.in
+--- beagle-0.2.18~/search/beagle-search.desktop.in.in	2007-02-07 20:04:11.000000000 +0100
++++ beagle-0.2.18/search/beagle-search.desktop.in.in	2007-09-16 02:54:25.000000000 +0200
+@@ -9,7 +9,8 @@
+ Type=Application
  StartupNotify=true
  Encoding=UTF-8
- Categories=GNOME;GTK;Application;Core;Utility;Filesystem;
+-Categories=GNOME;GTK;Application;Core;Utility;Filesystem;
++Categories=GNOME;GTK;Core;Utility;Filesystem;
 +NotShowIn=KDE
  X-GNOME-Bugzilla-Bugzilla=GNOME
  X-GNOME-Bugzilla-Product=beagle
  X-GNOME-Bugzilla-Component=General
-diff -urNad beagle-0.2.16~/search/beagle-search.desktop.in.in beagle-0.2.16/search/beagle-search.desktop.in.in
---- beagle-0.2.16~/search/beagle-search.desktop.in.in	2007-01-24 18:52:33.000000000 +0100
-+++ beagle-0.2.16/search/beagle-search.desktop.in.in	2007-04-05 13:34:06.000000000 +0200
-@@ -10,6 +10,7 @@
- StartupNotify=true
- Encoding=UTF-8
- Categories=GNOME;GTK;Application;Core;Utility;Filesystem;
-+NotShowIn=KDE
- X-GNOME-Bugzilla-Bugzilla=GNOME
- X-GNOME-Bugzilla-Product=beagle
- X-GNOME-Bugzilla-Component=General
-diff -urNad beagle-0.2.16~/tools/beagle-settings.desktop.in.in beagle-0.2.16/tools/beagle-settings.desktop.in.in
---- beagle-0.2.16~/tools/beagle-settings.desktop.in.in	2007-02-06 21:40:12.000000000 +0100
-+++ beagle-0.2.16/tools/beagle-settings.desktop.in.in	2007-04-05 13:34:06.000000000 +0200
-@@ -7,6 +7,7 @@
+diff -urNad beagle-0.2.18~/tools/beagle-settings.desktop.in.in beagle-0.2.18/tools/beagle-settings.desktop.in.in
+--- beagle-0.2.18~/tools/beagle-settings.desktop.in.in	2007-02-07 20:04:11.000000000 +0100
++++ beagle-0.2.18/tools/beagle-settings.desktop.in.in	2007-09-16 02:54:25.000000000 +0200
+@@ -6,7 +6,9 @@
+ Exec=beagle-settings
  Icon=system-search
  Type=Application
- Categories=Application;Settings;AdvancedSettings;Utility;Filesystem;X-Ximian-Settings;
+-Categories=Application;Settings;AdvancedSettings;Utility;Filesystem;X-Ximian-Settings;
++StartupNotify=true
++Categories=Application;Settings;AdvancedSettings;Filesystem;X-Ximian-Settings;
 +NotShowIn=KDE
  X-GNOME-Bugzilla-Bugzilla=GNOME
  X-GNOME-Bugzilla-Product=beagle

More information about the Pkg-mono-svn-commits mailing list