[Pkg-cli-apps-commits] r4227 - in /packages/gnome-do/trunk/debian: changelog control gnome-do.gconf-defaults patches/00list patches/01_fix_libX11_linkage.dpatch patches/05_fix_localised_theme_setting.dpatch patches/06_expand_homedir_in_open.dpatch rules

raof-guest at users.alioth.debian.org raof-guest at users.alioth.debian.org
Fri Nov 28 04:20:30 UTC 2008 

Author: raof-guest
Date: Fri Nov 28 04:20:18 2008
New Revision: 4227

URL: http://svn.debian.org/wsvn/pkg-cli-apps/?sc=1&rev=4227
Log:
  + Mono 2.0 transition:
    - Set MCS env variable to /usr/bin/csc when calling "dh build"
  + Add .PHONY for good measure
  + Add build-stamp target to avoid calling dh build twice.
* debian/patches/05_fix_localised_theme_setting:
  + Use the index of the selected theme rather than text of the theme
    when setting the UI preference.  The text is now correctly translated,
    so using the text no longer works (LP: #280719).
* debian/patches/06_expand_homedir_in_open:
  + Expand '~' in strings for the Open action (LP: #280540).
* debian/gnome-do.gconf-defaults:
  + Don't popup the UI on login; wait for the user to summon Do.
* debian/control
  + Mono 2.0 transition: 
    - build-depend on mono-devel (>= 2.0) rather than
      mono-gmcs.
  + 01_fix_libX11_linkage.dpatch updated to patch Makefile.am and Makefile.in

Added:
    packages/gnome-do/trunk/debian/gnome-do.gconf-defaults
    packages/gnome-do/trunk/debian/patches/05_fix_localised_theme_setting.dpatch
    packages/gnome-do/trunk/debian/patches/06_expand_homedir_in_open.dpatch
Modified:
    packages/gnome-do/trunk/debian/changelog
    packages/gnome-do/trunk/debian/control
    packages/gnome-do/trunk/debian/patches/00list
    packages/gnome-do/trunk/debian/patches/01_fix_libX11_linkage.dpatch
    packages/gnome-do/trunk/debian/rules

Modified: packages/gnome-do/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/gnome-do/trunk/debian/changelog?rev=4227&op=diff
==============================================================================
--- packages/gnome-do/trunk/debian/changelog (original)
+++ packages/gnome-do/trunk/debian/changelog Fri Nov 28 04:20:18 2008
@@ -4,19 +4,30 @@
   * New upstream release
   * debian/rules
     + Set GCONF_DISABLE_SCHEMAS_INSTALL; upstream now ships a gconf schema.
-
+    + Mono 2.0 transition:
+      - Set MCS env variable to /usr/bin/csc when calling "dh build"
+    + Add .PHONY for good measure
+    + Add build-stamp target to avoid calling dh build twice.
+  * debian/patches/05_fix_localised_theme_setting:
+    + Use the index of the selected theme rather than text of the theme
+      when setting the UI preference.  The text is now correctly translated,
+      so using the text no longer works (LP: #280719).
+  * debian/patches/06_expand_homedir_in_open:
+    + Expand '~' in strings for the Open action (LP: #280540).
+  * debian/gnome-do.gconf-defaults:
+    + Don't popup the UI on login; wait for the user to summon Do.
+  * debian/control
+    + Mono 2.0 transition: 
+      - build-depend on mono-devel (>= 2.0) rather than
+        mono-gmcs.
   [ David Paleino ]
   * debian/rules:
     + get-orig-source updated, puts the tarball, correctly renamed, to
       ../tarballs, to use it with svn-buildpackage
-    + updated to re-generate autotools files
-  * debian/control:
-    + Build-Depends-Indep updated
   * debian/patches/:
-    + 00_fix_build_system.dpatch added
-    + 01_fix_libX11_linkage.dpatch updated to patch Makefile.am, not Makefile.in
+    + 01_fix_libX11_linkage.dpatch updated to patch Makefile.am and Makefile.in
 
- -- David Paleino <d.paleino at gmail.com>  Fri, 28 Nov 2008 04:54:31 +0100
+ -- Christopher James Halse Rogers <raof at ubuntu.com>  Fri, 28 Nov 2008 15:19:20 +1100
 
 gnome-do (0.6.0.1-1) experimental; urgency=low
 

Modified: packages/gnome-do/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/gnome-do/trunk/debian/control?rev=4227&op=diff
==============================================================================
--- packages/gnome-do/trunk/debian/control (original)
+++ packages/gnome-do/trunk/debian/control Fri Nov 28 04:20:18 2008
@@ -5,10 +5,8 @@
 Uploaders: Christopher James Halse Rogers <raof at ubuntu.com>
 Build-Depends: debhelper (>= 7), 
 	       dpatch,
-	       mono-devel,
+	       mono-devel (>= 2.0),
 	       autotools-dev,
-	       autoconf,
-	       automake,
 	       libndesk-dbus1.0-cil,
 	       libndesk-dbus-glib1.0-cil,
 	       libgconf2.0-cil,
@@ -37,6 +35,7 @@
 Architecture: any
 Depends: ${cli:Depends}, 
 	 ${shlibs:Depends},
+	 ${misc:Depends},
 	 xdg-utils,
 	 dbus,
 	 procps

Added: packages/gnome-do/trunk/debian/gnome-do.gconf-defaults
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/gnome-do/trunk/debian/gnome-do.gconf-defaults?rev=4227&op=file
==============================================================================
--- packages/gnome-do/trunk/debian/gnome-do.gconf-defaults (added)
+++ packages/gnome-do/trunk/debian/gnome-do.gconf-defaults Fri Nov 28 04:20:18 2008
@@ -1,0 +1,1 @@
+/apps/gnome-do/preferences/core-preferences/QuietStart true

Modified: packages/gnome-do/trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/gnome-do/trunk/debian/patches/00list?rev=4227&op=diff
==============================================================================
--- packages/gnome-do/trunk/debian/patches/00list (original)
+++ packages/gnome-do/trunk/debian/patches/00list Fri Nov 28 04:20:18 2008
@@ -1,5 +1,6 @@
-00_fix_build_system
 01_fix_libX11_linkage
 02_use_cli_for_wrapper
 03_show_in_all_DEs
 04_fix_locale_dir
+05_fix_localised_theme_setting
+06_expand_homedir_in_open

Modified: packages/gnome-do/trunk/debian/patches/01_fix_libX11_linkage.dpatch
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/gnome-do/trunk/debian/patches/01_fix_libX11_linkage.dpatch?rev=4227&op=diff
==============================================================================
--- packages/gnome-do/trunk/debian/patches/01_fix_libX11_linkage.dpatch (original)
+++ packages/gnome-do/trunk/debian/patches/01_fix_libX11_linkage.dpatch Fri Nov 28 04:20:18 2008
@@ -17,3 +17,15 @@
 +libdo_la_LIBADD = $(LIBDO_LIBS) -lX11
  
  maintainer-clean-local:
+diff -urNad gnome-do-0.4.0.1~/libdo/Makefile.in gnome-do-0.4.0.1/libdo/Makefile.in
+--- gnome-do-0.4.0.1~/libdo/Makefile.in	2008-03-18 13:31:06.000000000 +1100
++++ gnome-do-0.4.0.1/libdo/Makefile.in	2008-03-18 13:57:00.000000000 +1100
+@@ -261,7 +261,7 @@
+ 	eggaccelerators.c
+ 
+ libdo_la_LDFLAGS = -export-dynamic -module -avoid-version
+-libdo_la_LIBADD = $(LIBDO_LIBS)
++libdo_la_LIBADD = $(LIBDO_LIBS) -lX11
+ all: all-am
+ 
+ .SUFFIXES:

Added: packages/gnome-do/trunk/debian/patches/05_fix_localised_theme_setting.dpatch
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/gnome-do/trunk/debian/patches/05_fix_localised_theme_setting.dpatch?rev=4227&op=file
==============================================================================
--- packages/gnome-do/trunk/debian/patches/05_fix_localised_theme_setting.dpatch (added)
+++ packages/gnome-do/trunk/debian/patches/05_fix_localised_theme_setting.dpatch Fri Nov 28 04:20:18 2008
@@ -1,0 +1,20 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 05_fix_localised_theme_setting.dpatch by Christopher James Halse Rogers <raof at ubuntu.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Use the index of the theme-selection ComboBox rather than the text
+## DP: in the box.  The ComboBox text is translated!
+
+ at DPATCH@
+diff -urNad gnome-do-0.6.1.0~/Do/src/Do.UI/GeneralPreferencesWidget.cs gnome-do-0.6.1.0/Do/src/Do.UI/GeneralPreferencesWidget.cs
+--- gnome-do-0.6.1.0~/Do/src/Do.UI/GeneralPreferencesWidget.cs	2008-10-07 08:02:58.000000000 +1100
++++ gnome-do-0.6.1.0/Do/src/Do.UI/GeneralPreferencesWidget.cs	2008-10-10 12:45:47.000000000 +1100
+@@ -133,7 +133,7 @@
+ 
+         protected virtual void OnThemeComboChanged (object sender, EventArgs e)
+         {
+-        	Do.Preferences.Theme = theme_combo.ActiveText;
++        	Do.Preferences.Theme = Themes[theme_combo.Active];
+         }
+ 
+         protected virtual void OnNotificationCheckClicked (object sender, System.EventArgs e)

Added: packages/gnome-do/trunk/debian/patches/06_expand_homedir_in_open.dpatch
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/gnome-do/trunk/debian/patches/06_expand_homedir_in_open.dpatch?rev=4227&op=file
==============================================================================
--- packages/gnome-do/trunk/debian/patches/06_expand_homedir_in_open.dpatch (added)
+++ packages/gnome-do/trunk/debian/patches/06_expand_homedir_in_open.dpatch Fri Nov 28 04:20:18 2008
@@ -1,0 +1,22 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 06_expand_homedir_in_open.dpatch by Christopher James Halse Rogers <raof at ubuntu.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Expand ~ when opening a TextItem as a file or folder.
+## DP: xdg-open obviously doesn't expand ~ itself.
+
+ at DPATCH@
+diff -urNad gnome-do-0.6.1.0~/Do.Addins/src/Do.Universe/OpenAction.cs gnome-do-0.6.1.0/Do.Addins/src/Do.Universe/OpenAction.cs
+--- gnome-do-0.6.1.0~/Do.Addins/src/Do.Universe/OpenAction.cs	2008-10-07 08:03:00.000000000 +1100
++++ gnome-do-0.6.1.0/Do.Addins/src/Do.Universe/OpenAction.cs	2008-10-10 12:47:40.000000000 +1100
+@@ -92,6 +92,10 @@
+ 				} else if (item is ITextItem) {
+ 					// item is a valid file or folder path.
+ 					toOpen = (item as ITextItem).Text
++						.Replace ("~", Paths.UserHome)
++						.Replace ("\\", "\\\\")
++						.Replace ("'", "\\'")
++						.Replace ("\"", "\\\"")
+ 						.Replace (" ", "\\ ");
+ 				}
+ 				Util.Environment.Open (toOpen);

Modified: packages/gnome-do/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/gnome-do/trunk/debian/rules?rev=4227&op=diff
==============================================================================
--- packages/gnome-do/trunk/debian/rules (original)
+++ packages/gnome-do/trunk/debian/rules Fri Nov 28 04:20:18 2008
@@ -9,19 +9,13 @@
 
 CURVER=$(shell dpkg-parsechangelog | grep ^Version | cut -d" " -f2 | cut -d"-" -f1 )
 
-build: patch-stamp
-	libtoolize
-	aclocal -I m4/shamrock/
-	autoconf
-	automake --add-missing --copy
-	
-	dh $@
+build: build-stamp
+build-stamp: patch-stamp
+	MCS=/usr/bin/csc dh build
+	touch $@
 
 clean: unpatch
 	dh $@
-	find . -name "Makefile.in" | xargs rm -rf
-	rm -rf autom4te.cache/
-	dh_clean configure config.sub config.guess ltmain.sh
 
 install: build
 	dh $@
@@ -46,5 +40,4 @@
 		--force-download \
 		--watchfile=$(dir $(_))/watch
 
-%:
-	dh $@
+.PHONY: build clean install binary binary-arch get-orig-source

More information about the Pkg-cli-apps-commits mailing list