[statsvn] 22/37: [statsvn] Beginnings of the new upstream release

Emmanuel Bourg ebourg-guest at moszumanska.debian.org
Thu Apr 19 22:55:43 BST 2018 

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository statsvn.

commit 822f60e95b68ae0417abd24d296456527f6b1db4
Author: Vincent Fourmond <fourmond at debian.org>
Date:   Mon Mar 8 21:17:19 2010 +0000

    [statsvn] Beginnings of the new upstream release
---
 debian/changelog                                                 | 9 +++++++++
 debian/control                                                   | 9 ++++-----
 debian/new-upstream                                              | 4 ++--
 debian/patches/00list                                            | 3 ---
 ...10-build-xml-classpath.dpatch => 10-build-xml-classpath.diff} | 7 ++++---
 ...ml-build-jar-only.dpatch => 15-build-xml-build-jar-only.diff} | 7 ++++---
 .../{20-disable-jtreemap.dpatch => 20-disable-jtreemap.diff}     | 0
 debian/patches/series                                            | 2 ++
 debian/rules                                                     | 4 ++--
 debian/source/format                                             | 1 +
 10 files changed, 28 insertions(+), 18 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 0d95f2a..52193f0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+statsvn (0.7.0.dfsg-1) NOTREADYYET; urgency=low
+
+  * New upstream release (closes: #572613)
+  * Switch to source format 3.0 (quilt)
+  * Drop build-dependency on dpatch, now unneeded
+  * Now conforms to standards 3.8.4
+
+ -- Vincent Fourmond <fourmond at debian.org>  Mon, 08 Mar 2010 21:16:59 +0100
+
 statsvn (0.5.0.dfsg-1) unstable; urgency=low
 
   * New upstream release
diff --git a/debian/control b/debian/control
index d989347..5ad9f12 100644
--- a/debian/control
+++ b/debian/control
@@ -4,10 +4,9 @@ Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Vincent Fourmond <fourmond at debian.org>
 Build-Depends-Indep: java-gcj-compat-dev
-Build-Depends: cdbs, debhelper (>= 5), dpatch, ant,
- libbackport-util-concurrent-java, 
- libjcommon-java, libjfreechart-java, statcvs (>= 1:0.5.0)
-Standards-Version: 3.8.2
+Build-Depends: cdbs, debhelper (>= 5), ant, libbackport-util-concurrent-java, 
+ libjcommon-java, libjfreechart-java, statcvs (>= 1:0.7.0)
+Standards-Version: 3.8.4
 Homepage: http://www.statsvn.org/
 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/statsvn
 Vcs-Browser: http://svn.debian.org/viewsvn/pkg-java/trunk/statsvn
@@ -16,7 +15,7 @@ Vcs-Browser: http://svn.debian.org/viewsvn/pkg-java/trunk/statsvn
 Package: statsvn
 Architecture: all
 Depends: java-gcj-compat | java-runtime, libjcommon-java,
- libjfreechart-java, libbackport-util-concurrent-java, statcvs (>= 1:0.5.0),
+ libjfreechart-java, libbackport-util-concurrent-java, statcvs (>= 1:0.7.0),
  subversion, java-wrappers (>= 0.1.4), ${misc:Depends}
 Description: SVN repository statistics
  StatSVN retrieves information from a Subversion repository and generates
diff --git a/debian/new-upstream b/debian/new-upstream
index 4e905fa..cb3880c 100755
--- a/debian/new-upstream
+++ b/debian/new-upstream
@@ -21,11 +21,11 @@ dir=`mktemp -d`
 
 # We repackage the upstream source zip file:
 unzip $filename -d $dir
-origname=statsvn_$version.dfsg.orig.tar.gz
+origname=statsvn_$version.dfsg.orig.tar.bz2
 
 # We repackage excluding the lib/ subdir -- and various other ones
 cd $dir
-tar cvz \
+tar cvj \
     --exclude '*/lib/*.jar' \
     --exclude 'bin' \
     --exclude '*jtreemap*.jar' \
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index 33a420b..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1,3 +0,0 @@
-10-build-xml-classpath
-15-build-xml-build-jar-only
-# 20-disable-jtreemap
diff --git a/debian/patches/10-build-xml-classpath.dpatch b/debian/patches/10-build-xml-classpath.diff
similarity index 71%
rename from debian/patches/10-build-xml-classpath.dpatch
rename to debian/patches/10-build-xml-classpath.diff
index 8e743a5..6611a10 100755
--- a/debian/patches/10-build-xml-classpath.dpatch
+++ b/debian/patches/10-build-xml-classpath.diff
@@ -4,9 +4,10 @@
 ## DP: Fix classpath to debian-specific values
 
 @DPATCH@
-diff -urNad statsvn-0.3.1.dfsg~/build.xml statsvn-0.3.1.dfsg/build.xml
---- statsvn-0.3.1.dfsg~/build.xml	2007-02-19 09:16:02.000000000 +0100
-+++ statsvn-0.3.1.dfsg/build.xml	2008-03-01 22:07:22.000000000 +0100
+Index: statsvn-0.7.0.dfsg/build.xml
+===================================================================
+--- statsvn-0.7.0.dfsg.orig/build.xml	2009-08-17 16:01:36.000000000 +0200
++++ statsvn-0.7.0.dfsg/build.xml	2010-03-08 20:25:39.047528376 +0100
 @@ -24,9 +24,11 @@
  
  	<path id="project.class.path">
diff --git a/debian/patches/15-build-xml-build-jar-only.dpatch b/debian/patches/15-build-xml-build-jar-only.diff
similarity index 77%
rename from debian/patches/15-build-xml-build-jar-only.dpatch
rename to debian/patches/15-build-xml-build-jar-only.diff
index 2cc0a8b..2a55dd1 100755
--- a/debian/patches/15-build-xml-build-jar-only.dpatch
+++ b/debian/patches/15-build-xml-build-jar-only.diff
@@ -4,9 +4,10 @@
 ## DP: Only build the jar file during the build
 
 @DPATCH@
-diff -urNad statsvn-0.3.1.dfsg~/build.xml statsvn-0.3.1.dfsg/build.xml
---- statsvn-0.3.1.dfsg~/build.xml	2008-03-01 22:25:23.000000000 +0100
-+++ statsvn-0.3.1.dfsg/build.xml	2008-03-01 22:25:52.000000000 +0100
+Index: statsvn-0.7.0.dfsg/build.xml
+===================================================================
+--- statsvn-0.7.0.dfsg.orig/build.xml	2010-03-08 20:25:30.347534255 +0100
++++ statsvn-0.7.0.dfsg/build.xml	2010-03-08 20:25:34.015528882 +0100
 @@ -1,6 +1,6 @@
  <?xml version="1.0" encoding="ISO-8859-1"?>
  
diff --git a/debian/patches/20-disable-jtreemap.dpatch b/debian/patches/20-disable-jtreemap.diff
similarity index 100%
rename from debian/patches/20-disable-jtreemap.dpatch
rename to debian/patches/20-disable-jtreemap.diff
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..a9fe732
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,2 @@
+10-build-xml-classpath.diff
+15-build-xml-build-jar-only.diff
diff --git a/debian/rules b/debian/rules
index eb76c88..7689a70 100755
--- a/debian/rules
+++ b/debian/rules
@@ -12,9 +12,9 @@ VERSION = $(shell dpkg-parsechangelog | egrep '^Version' | \
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/ant.mk
-include /usr/share/cdbs/1/rules/dpatch.mk
+# include /usr/share/cdbs/1/rules/dpatch.mk
 
-JAVA_HOME_DIRS       := /usr/lib/jvm/java-gcj
+JAVA_HOME_DIRS       := /usr/lib/jvm/default-java
 ANT_HOME             := /usr/share/ant
 DEB_JARS             := $(ANT_HOME)/lib/ant-launcher.jar \
 	junit jcommon jfreechart
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)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/statsvn.git

More information about the pkg-java-commits mailing list