[SCM] project-x packaging repository branch, master, updated. debian/0.90.4+cvs20091114.1925.dfsg-1-9-gac79e3c

Thu May 24 21:34:36 UTC 2012

The following commit has been merged in the master branch:
commit ddc90b98b4d5334ab59cdc7212135dd936310765
Author: etobi <git at e-tobi.net>
Date:   Thu May 24 20:53:38 2012 +0200

    Use source format 3.0 (quilt) now

diff --git a/debian/changelog b/debian/changelog
index 8830d7d..e8577f8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 project-x (0.91.0-1) UNRELEASED; urgency=low
 
   * New upstream release
+  * Use source format 3.0 (quilt) now
 
  -- Tobias Grimm <etobi at debian.org>  Thu, 24 May 2012 20:49:29 +0200
 
diff --git a/debian/compat b/debian/compat
index 7ed6ff8..7f8f011 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-5
+7
diff --git a/debian/control b/debian/control
index 1d78e1e..3b08d5f 100644
--- a/debian/control
+++ b/debian/control
@@ -2,9 +2,9 @@ Source: project-x
 Section: unknown
 Priority: optional
 Maintainer: Tobias Grimm <tg at e-tobi.net>
-Build-Depends: debhelper (>= 5), cdbs, dpatch, default-jdk-builddep,
+Build-Depends: debhelper (>= 7.0.50~), default-jdk-builddep,
  libcommons-net-java, liboro-java
-Standards-Version: 3.8.3
+Standards-Version: 3.9.3
 
 Package: project-x
 Architecture: all
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index 206830f..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1,3 +0,0 @@
-01_percentage-fix
-02_class-path
-03_default-ini
diff --git a/debian/patches/01_percentage-fix.dpatch b/debian/patches/01_percentage-fix.patch
similarity index 61%
rename from debian/patches/01_percentage-fix.dpatch
rename to debian/patches/01_percentage-fix.patch
index 6b4944f..81fbe96 100644
--- a/debian/patches/01_percentage-fix.dpatch
+++ b/debian/patches/01_percentage-fix.patch
@@ -8,15 +8,16 @@
 ## DP: line (required by vdr-plugin-burn)
 
 @DPATCH@
-diff -urNad Project-X~/src/net/sourceforge/dvb/projectx/common/GuiInterface.java Project-X/src/net/sourceforge/dvb/projectx/common/GuiInterface.java
---- Project-X~/src/net/sourceforge/dvb/projectx/common/GuiInterface.java	2008-09-28 12:03:24.000000000 +0200
-+++ Project-X/src/net/sourceforge/dvb/projectx/common/GuiInterface.java	2009-11-14 00:53:48.000000000 +0100
+Index: project-x/src/net/sourceforge/dvb/projectx/common/GuiInterface.java
+===================================================================
+--- project-x.orig/src/net/sourceforge/dvb/projectx/common/GuiInterface.java	2012-05-24 20:49:15.000000000 +0200
++++ project-x/src/net/sourceforge/dvb/projectx/common/GuiInterface.java	2012-05-24 20:55:16.000000000 +0200
 @@ -190,7 +190,7 @@
- 			impl.updateProgressBar(percent);
- 
- 		else
--			System.out.print("\r" + percent + " %");
+ 			impl.updateProgressBar(percent);
+ 
+ 		else
+-			System.out.print("\r" + percent + " %");
 +			System.out.print(percent + " %\r");
- 	}
- 
- 	/**
+ 	}
+ 
+ 	/**
diff --git a/debian/patches/02_class-path.dpatch b/debian/patches/02_class-path.patch
similarity index 67%
rename from debian/patches/02_class-path.dpatch
rename to debian/patches/02_class-path.patch
index 08f86a7..3a35e8e 100644
--- a/debian/patches/02_class-path.dpatch
+++ b/debian/patches/02_class-path.patch
@@ -5,12 +5,13 @@
 ## DP: No description.
 
 @DPATCH@
-diff -urNad Project-X~/MANIFEST.MF Project-X/MANIFEST.MF
---- Project-X~/MANIFEST.MF	2005-09-10 17:51:52.000000000 +0200
-+++ Project-X/MANIFEST.MF	2009-11-14 20:07:37.000000000 +0100
+Index: project-x/MANIFEST.MF
+===================================================================
+--- project-x.orig/MANIFEST.MF	2012-05-24 20:49:14.000000000 +0200
++++ project-x/MANIFEST.MF	2012-05-24 20:57:48.000000000 +0200
 @@ -1,4 +1,4 @@
- Manifest-Version: 1.0
- Main-Class: net.sourceforge.dvb.projectx.common.Start
- Created-By: 1.2.2 (Sun Microsystems Inc.)
--Class-Path: lib/commons-net-1.3.0.jar lib/jakarta-oro-2.0.8.jar
-+Class-Path: /usr/share/java/commons-net.jar /usr/share/java/oro.jar
+ Manifest-Version: 1.0
+ Main-Class: net.sourceforge.dvb.projectx.common.Start
+ Created-By: 1.2.2 (Sun Microsystems Inc.)
+-Class-Path: lib/commons-net-1.3.0.jar lib/jakarta-oro-2.0.8.jar
++Class-Path: /usr/share/java/commons-net.jar /usr/share/java/oro.jar
diff --git a/debian/patches/03_default-ini.dpatch b/debian/patches/03_default-ini.dpatch
deleted file mode 100644
index 14dec20..0000000
--- a/debian/patches/03_default-ini.dpatch
+++ /dev/null
@@ -1,31 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 03_default-ini.dpatch by Tobias Grimm <etobi at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
- at DPATCH@
-diff -urNad project-x-0.90.4+cvs20091114.1925.dfsg~/src/net/sourceforge/dvb/projectx/common/Resource.java project-x-0.90.4+cvs20091114.1925.dfsg/src/net/sourceforge/dvb/projectx/common/Resource.java
---- project-x-0.90.4+cvs20091114.1925.dfsg~/src/net/sourceforge/dvb/projectx/common/Resource.java	2008-02-18 19:34:48.000000000 +0100
-+++ project-x-0.90.4+cvs20091114.1925.dfsg/src/net/sourceforge/dvb/projectx/common/Resource.java	2009-11-14 20:41:39.000000000 +0100
-@@ -64,7 +64,7 @@
- 	private static final String PJX_RESOURCE_PREFIX = "pjxresources";
- 
- 	/** current working directory */
--	public static final String workdir = System.getProperty("user.dir");
-+	public static final String workdir = System.getProperty("user.home");
- 	
- 	/** os dependent file separator */
- 	public static final String filesep = System.getProperty("file.separator");
-diff -urNad project-x-0.90.4+cvs20091114.1925.dfsg~/src/net/sourceforge/dvb/projectx/common/Settings.java project-x-0.90.4+cvs20091114.1925.dfsg/src/net/sourceforge/dvb/projectx/common/Settings.java
---- project-x-0.90.4+cvs20091114.1925.dfsg~/src/net/sourceforge/dvb/projectx/common/Settings.java	2008-02-18 19:34:48.000000000 +0100
-+++ project-x-0.90.4+cvs20091114.1925.dfsg/src/net/sourceforge/dvb/projectx/common/Settings.java	2009-11-14 20:41:56.000000000 +0100
-@@ -56,7 +56,7 @@
- public class Settings extends Object {
- 
- 	/** the default ini filename */
--	private static final String DEFAULT_INI = "X.ini";
-+	private static final String DEFAULT_INI = ".project-x.ini";
- 
- 	/** the current ini filename */
- 	private String inifile = "";
diff --git a/debian/patches/03_default-ini.patch b/debian/patches/03_default-ini.patch
new file mode 100644
index 0000000..7b89855
--- /dev/null
+++ b/debian/patches/03_default-ini.patch
@@ -0,0 +1,33 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 03_default-ini.dpatch by Tobias Grimm <etobi at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+Index: project-x/src/net/sourceforge/dvb/projectx/common/Resource.java
+===================================================================
+--- project-x.orig/src/net/sourceforge/dvb/projectx/common/Resource.java	2012-05-24 20:49:15.000000000 +0200
++++ project-x/src/net/sourceforge/dvb/projectx/common/Resource.java	2012-05-24 20:58:54.000000000 +0200
+@@ -64,7 +64,7 @@
+ 	private static final String PJX_RESOURCE_PREFIX = "pjxresources";
+ 
+ 	/** current working directory */
+-	public static final String workdir = System.getProperty("user.dir");
++	public static final String workdir = System.getProperty("user.home");
+ 	
+ 	/** os dependent file separator */
+ 	public static final String filesep = System.getProperty("file.separator");
+Index: project-x/src/net/sourceforge/dvb/projectx/common/Settings.java
+===================================================================
+--- project-x.orig/src/net/sourceforge/dvb/projectx/common/Settings.java	2012-05-24 20:49:15.000000000 +0200
++++ project-x/src/net/sourceforge/dvb/projectx/common/Settings.java	2012-05-24 20:59:22.000000000 +0200
+@@ -56,7 +56,7 @@
+ public class Settings extends Object {
+ 
+ 	/** the default ini filename */
+-	private static final String DEFAULT_INI = "X.ini";
++	private static final String DEFAULT_INI = ".project-x.ini";
+ 
+ 	/** the current ini filename */
+ 	private String inifile = "";
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..09ba518
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,3 @@
+01_percentage-fix.patch
+02_class-path.patch
+03_default-ini.patch
diff --git a/debian/rules b/debian/rules
index 23fadba..f766be4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,6 +1,7 @@
 #!/usr/bin/make -f
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/rules/dpatch.mk
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
 
 JAVA_HOME	:= /usr/lib/jvm/default-java
 
@@ -10,27 +11,12 @@ CLASSPATH 	= /usr/share/java/commons-net.jar:usr/share/java/oro.jar
 JAVADOC		= $(JAVA_HOME)/bin/javadoc
 JARNAME		= ProjectX.jar
 
-${JARNAME}:
+%:
+	dh $@
+
+override_dh_auto_build-indep:
 	mkdir -p build
 	${JAVAC} -source 1.4 -target 1.4 -encoding iso8859-1 -classpath ${CLASSPATH} -O -g:none -d build @sources.lst
 	cp ./resources/* ./build
 	${JAR} cfvm ${JARNAME}  MANIFEST.MF -C build .
-
-build/project-x:: ${JARNAME}
-
-clean::
-	rm -rf build
-	rm -rf ProjectX.jar
-
-VERSION_DATE = $(shell /bin/date --utc +%0Y%0m%0d.%0k%0M)
-VERSION_ID = 0.90.4+cvs$(VERSION_DATE).dfsg
-UPSTREAM_DIR = project-x-"$(VERSION_ID)"
-
-get-orig-source:
-	echo Downloading ProjectX $(VERSION_ID) from cvs...
-	cvs -z3 -d:pserver:anonymous at project-x.cvs.sourceforge.net:/cvsroot/project-x export -DNOW Project-X
-	mv Project-X $(UPSTREAM_DIR)
-	rm -rf $(UPSTREAM_DIR)/build $(UPSTREAM_DIR)/doc $(UPSTREAM_DIR)/c_src $(UPSTREAM_DIR)/lib
-	tar cvfz "../project-x_$(VERSION_ID).orig.tar.gz" $(UPSTREAM_DIR)
-	rm -rf $(UPSTREAM_DIR)
-	dch -v "$(VERSION_ID)-1" "New Upstream Snapshot"
+	dh_auto_build
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 0000000..163aaf8
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)

-- 
project-x packaging repository

