[SCM] UNNAMED PROJECT branch, master, updated. debian/1.2-14-3-g2040d10

[tony mancill]

The following commit has been merged in the master branch:
commit 267fd2d0a87bb75b881c2fff8abe8b619ecdfb8c
Author: tony mancill <tmancill at debian.org>
Date:   Tue Jun 18 21:47:39 2013 -0700

    update xulrunner dependencies

diff --git a/debian/changelog b/debian/changelog
index 68f740d..759ce68 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+tuxguitar (1.2-15) unstable; urgency=low
+
+  * Update list of possible xulrunner dependencies (Closes: #712677)
+  * Add "file" to Depends; it is used in /usr/bin/tuxguitar.
+
+ -- tony mancill <tmancill at debian.org>  Tue, 18 Jun 2013 21:37:33 -0700
+
 tuxguitar (1.2-14) experimental; urgency=low
 
   * Team upload.
diff --git a/debian/control b/debian/control
index 645f282..996ae4f 100644
--- a/debian/control
+++ b/debian/control
@@ -23,6 +23,7 @@ Vcs-Browser: http://git.debian.org/?p=pkg-java/tuxguitar.git
 Package: tuxguitar
 Architecture: all
 Depends: default-jre | java2-runtime,
+ file,
  libitext-java,
  libswt-gtk-3-java,
  libswt-cairo-gtk-3-jni,
diff --git a/debian/patches/01-tuxguitar-rzr.patch b/debian/patches/01-tuxguitar-rzr.patch
index 1b0fbc4..03a31a3 100644
--- a/debian/patches/01-tuxguitar-rzr.patch
+++ b/debian/patches/01-tuxguitar-rzr.patch
@@ -1,7 +1,5 @@
-Index: tuxguitar-1.2/Makefile
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ tuxguitar-1.2/Makefile	2011-10-15 22:35:25.000000000 -0400
+--- /dev/null
++++ b/Makefile
 @@ -0,0 +1,263 @@
 +#! /usr/bin/make -f
 +# -*- makefile -*-
@@ -266,10 +264,8 @@ Index: tuxguitar-1.2/Makefile
 +../${snapshot_dir} ../${release_dir}:
 +	svn co ${scmroot} $@
 +
-Index: tuxguitar-1.2/misc/tuxguitar.sh
-===================================================================
---- tuxguitar-1.2.orig/misc/tuxguitar.sh	2011-10-15 22:35:24.000000000 -0400
-+++ tuxguitar-1.2/misc/tuxguitar.sh	2011-10-15 22:36:20.000000000 -0400
+--- a/misc/tuxguitar.sh
++++ b/misc/tuxguitar.sh
 @@ -4,7 +4,7 @@
  #@Licence: LGPL
  #@Description: Wrapper script for starting java application tuxguitar
@@ -331,7 +327,7 @@ Index: tuxguitar-1.2/misc/tuxguitar.sh
      file -L "$f" >/dev/null 2>&1 || f=""
      echo "$f"
  }
-@@ -91,36 +94,53 @@
+@@ -91,36 +94,59 @@
      test -r "$t/libxpcom.so" && d="$t"
      t="/usr/lib/xulrunner-1.9"
      test -r "$t/libxpcom.so" && d="$t"
@@ -343,6 +339,12 @@ Index: tuxguitar-1.2/misc/tuxguitar.sh
 +    test -r "$t/libxpcom.so" && d="$t"
 +    t="/usr/lib/xulrunner-7.0"
 +    test -r "$t/libxpcom.so" && d="$t"
++    t="/usr/lib/xulrunner-10.0"
++    test -r "$t/libxpcom.so" && d="$t"
++    t="/usr/lib/xulrunner-17.0"
++    test -r "$t/libxpcom.so" && d="$t"
++    t="/usr/lib/xulrunner-21.0"
++    test -r "$t/libxpcom.so" && d="$t"
      echo "$d"
  }
  
@@ -391,7 +393,7 @@ Index: tuxguitar-1.2/misc/tuxguitar.sh
  tuxguitar_()
  {
      local PACKAGE=${PACKAGE:=tuxguitar}
-@@ -140,11 +160,11 @@
+@@ -140,11 +166,11 @@
      [ -r "$t" ] && CLASSPATH=${CLASSPATH}:$t
  
      JAVA_FLAGS=${JAVA_FLAGS:="-Xms128m -Xmx128m"}
@@ -408,7 +410,7 @@ Index: tuxguitar-1.2/misc/tuxguitar.sh
      local arg=""
      [ -z "$1" ] && arg="/usr/share/tuxguitar/tuxguitar.tg"
  # run java
-@@ -155,6 +175,7 @@
+@@ -155,6 +181,7 @@
  }
  
  # main
diff --git a/debian/rules b/debian/rules
index c995be3..1425672 100755
--- a/debian/rules
+++ b/debian/rules
@@ -15,7 +15,7 @@ DEB_DESTDIR_TMP?=${CURDIR}/debian/tmp/${MAINPACKAGE}
 ifeq ($(shell dpkg-vendor --derives-from Ubuntu && echo yes),yes)
 	XULRUNNERDEPENDS = -Vxulrunner:Depends=""
 else
-	XULRUNNERDEPENDS = -Vxulrunner:Depends="xulrunner-10.0 | xulrunner-9.0 | xulrunner-8.0 | xulrunner-7.0 | xulrunner-6.0 | xulrunner-5.0 | xulrunner-1.9.1"
+	XULRUNNERDEPENDS = -Vxulrunner:Depends="xulrunner-21.0 | xulrunner-20.0 | xulrunner-17.0 | xulrunner-10.0 | xulrunner-9.0 | xulrunner-8.0 | xulrunner-7.0 | xulrunner-6.0 | xulrunner-5.0 | xulrunner-1.9.1"
 endif
 
 build: build-arch build-indep
@@ -23,8 +23,7 @@ build-arch: build-stamp
 build-indep: build-stamp
 build-stamp:
 	dh_testdir
-#	${MAKE} clean
-	${MAKE}
+#	${MAKE} clean ${MAKE}
 	docbook-to-man misc/${PACKAGE}.sgml > debian/${PACKAGE}.1
 	touch $@
 

-- 
UNNAMED PROJECT