[Pkg-gambas-commits] [SCM] gambas3 branch, master, updated. debian/2.99.3-1-16-g2d40f0a

[José L?=.=?UTF-8?Q? Redrejo Rodríguez]

The following commit has been merged in the master branch:
commit 2d40f0a2c062670c88bac3d34bd14a43abf50fae
Author: José L. Redrejo Rodríguez <jredrejo at debian.org>
Date:   Fri May 4 14:20:08 2012 +0200

    added two needed patches for the sources in Debian

diff --git a/debian/patches/detect_browser_debian b/debian/patches/detect_browser_debian
new file mode 100644
index 0000000..b554ac6
--- /dev/null
+++ b/debian/patches/detect_browser_debian
@@ -0,0 +1,38 @@
+Index: gambas3-3.1.1/app/src/gambas3/.src/Project.module
+===================================================================
+--- gambas3-3.1.1.orig/app/src/gambas3/.src/Project.module	2012-05-04 14:08:01.000000000 +0200
++++ gambas3-3.1.1/app/src/gambas3/.src/Project.module	2012-05-04 14:15:15.000000000 +0200
+@@ -4809,7 +4809,7 @@
+       Case "epiphany"
+         aTest = ["epiphany"]
+ 
+-      Case "firefox"
++      Case "firefox", "iceweasel"
+         aTest = ["firefox", "mozilla-firefox"]
+ 
+       Case "seamonkey"
+@@ -4824,6 +4824,7 @@
+         Else If Application.Env["GNOME_DESKTOP_SESSION_ID"] Then
+           aTest.Add("epiphany")
+           aTest.Add("firefox")
++          aTest.Add("iceweasel")
+         Endif
+ 
+     End Select
+@@ -4831,6 +4832,7 @@
+     aTest.Add("konqueror")
+     aTest.Add("mozilla-firefox")
+     aTest.Add("firefox")
++    aTest.Add("iceweasel")
+     aTest.Add("mozilla")
+     aTest.Add("seamonkey")
+     aTest.Add("opera")
+@@ -4850,7 +4852,7 @@
+     sLink = "file://" & Replace(sLink, "?", "%3F")
+   Endif
+ 
+-  If Browser = "firefox" Then
++  If Browser = "firefox" OR Browser = "iceweasel"  Then
+     hFirefox = Shell "firefox -remote \"openURL(" & sLink & ",new-window)\"" Wait
+     If hFirefox.Value = 2 Then
+       Shell Browser & " " & Chr$(34) & sLink & Chr$(34)
diff --git a/debian/patches/dont_compile_examples b/debian/patches/dont_compile_examples
new file mode 100644
index 0000000..782bd1b
--- /dev/null
+++ b/debian/patches/dont_compile_examples
@@ -0,0 +1,21 @@
+Index: gambas3-3.1.1/examples/Makefile.am
+===================================================================
+--- gambas3-3.1.1.orig/examples/Makefile.am	2012-05-04 14:16:34.000000000 +0200
++++ gambas3-3.1.1/examples/Makefile.am	2012-05-04 14:17:38.000000000 +0200
+@@ -14,11 +14,11 @@
+ 	@rm -rf $(DESTDIR)$(gbdatadir)/examples
+ 	@$(INSTALL) -d $(DESTDIR)$(gbdatadir)/examples
+ 	@cp -R $(srcdir)/examples $(DESTDIR)$(gbdatadir)
+-	@(cd $(DESTDIR)$(gbdatadir)/examples; d=`pwd`; for p in */ */*/; do cd $$d/$$p; \
+-	  if test -e .project; then \
+-	    echo "Compiling $$p..."; cd $$d/$$p; $(DESTDIR)$(bindir)/gbc$(GAMBAS_VERSION) -ag -r $(DESTDIR)$(prefix); $(DESTDIR)$(bindir)/gba$(GAMBAS_VERSION); \
+-	  fi \
+-	done)
++#	@(cd $(DESTDIR)$(gbdatadir)/examples; d=`pwd`; for p in */ */*/; do cd $$d/$$p; \
++#	  if test -e .project; then \
++#	    echo "Compiling $$p..."; cd $$d/$$p; $(DESTDIR)$(bindir)/gbc$(GAMBAS_VERSION) -ag -r $(DESTDIR)$(prefix); $(DESTDIR)$(bindir)/gba$(GAMBAS_VERSION); \
++#	  fi \
++#	done)
+ 
+ uninstall-local:
+ 	@rm -rf $(DESTDIR)$(gbdatadir)/examples
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..6d0b999
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,2 @@
+detect_browser_debian
+dont_compile_examples

-- 
Gambas 3