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

apo pushed a commit to branch master
in repository libjfreechart-java.

commit 4f8eabe6f6dc5852aa3a46f0955093a69e1b4e49
Author: Markus Koschany <a...@debian.org>
Date:   Sat Oct 15 23:42:56 2016 +0200

    Switch from cdbs to dh sequencer.
---
 debian/control |  2 +-
 debian/rules   | 81 +++++++++++++++++++++++++++++-----------------------------
 2 files changed, 42 insertions(+), 41 deletions(-)

diff --git a/debian/control b/debian/control
index 90edf1d..6f37bef 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,7 @@ Uploaders: Christian Bayle <ba...@debian.org>,
            Varun Hiremath <va...@debian.org>,
            Vincent Fourmond <fourm...@debian.org>,
            Jakub Adam <jakub.a...@ktknet.cz>
-Build-Depends: cdbs, debhelper (>= 10), maven-repo-helper
+Build-Depends: debhelper (>= 10), maven-repo-helper
 Build-Depends-Indep: ant,
                      bnd (>= 2.1.0),
                      default-jdk,
diff --git a/debian/rules b/debian/rules
index 26251e5..66aa469 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,46 +1,47 @@
 #!/usr/bin/make -f
-# debian/rules file for jfreechart (uses cdbs)
-
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/ant.mk
-
-JAVA_HOME := /usr/lib/jvm/default-java
-
-DEB_JARS := jcommon servlet-api-3.1
-DEB_ANT_BUILDFILE := ant/build.xml
-DEB_ANT_BUILD_TARGET := compile javadoc
-PACKAGE := jfreechart
-MAVEN_REPO := http://repo1.maven.org/maven2
-
-clean::
-       -rm -rf build
-       -rm -rf javadoc
-       -rm -f lib/jfreechart-$(DEB_UPSTREAM_VERSION)*.jar lib/swtgraphics2d.jar
-       -rm -f debian/*.jar
-
-common-build-indep::
-       ant -f ant/build-swt.xml
-
-install/lib$(PACKAGE)-java::
-       jh_manifest -c jcommon.jar lib/jfreechart-$(DEB_UPSTREAM_VERSION).jar
-       bnd wrap --properties debian/jfreechart.bnd --output 
debian/jfreechart-$(DEB_UPSTREAM_VERSION).jar \
-               lib/jfreechart-$(DEB_UPSTREAM_VERSION).jar
-       mh_installpoms -plib$(PACKAGE)-java
-       mh_installjar -plib$(PACKAGE)-java -l debian/poms/$(PACKAGE).pom 
debian/$(PACKAGE)-$(DEB_UPSTREAM_VERSION).jar
-
-install/lib$(PACKAGE)-swt-java::
-       jh_manifest -c "jcommon.jar jfreechart-$(DEB_UPSTREAM_VERSION).jar 
swt4.jar" \
-               lib/jfreechart-$(DEB_UPSTREAM_VERSION)-swt.jar
-       bnd wrap --properties debian/jfreechart-swt.bnd --output 
debian/jfreechart-$(DEB_UPSTREAM_VERSION)-swt.jar \
-               lib/jfreechart-$(DEB_UPSTREAM_VERSION)-swt.jar
-       dh_install -plib$(PACKAGE)-swt-java 
debian/jfreechart-$(DEB_UPSTREAM_VERSION)-swt.jar /usr/share/java
-       dh_link -plib$(PACKAGE)-swt-java 
/usr/share/java/jfreechart-$(DEB_UPSTREAM_VERSION)-swt.jar 
/usr/share/java/jfreechart-swt.jar
 
-get-orig-source:
-       uscan --download-current-version --no-symlink
+export JAVA_HOME=/usr/lib/jvm/default-java
+export 
CLASSPATH=/usr/share/java/jcommon.jar:/usr/share/java/servlet-api-3.1.jar
+VERSION:=1.0.19
+
+%:
+       dh $@ --with maven_repo_helper --buildsystem=ant
+
+override_dh_auto_build:
+       ant -f ant/build.xml compile javadoc
+       #bnd wrap --properties debian/jcommon.bnd --output 
debian/jcommon-$(VERSION).jar \
+               jcommon-$(VERSION).jar
+
+override_dh_auto_clean:
+       $(RM) *.jar
+       $(RM) lib/*.jar
+       $(RM) debian/*.jar
+       $(RM) -r build javadoc
+
 
 get-orig-pom:
        mkdir -p debian/poms
-       wget  -U NoSuchBrowser/1.0 -O debian/poms/$(PACKAGE).pom \
-        
$(MAVEN_REPO)/jfree/$(PACKAGE)/$(DEB_UPSTREAM_VERSION)/$(PACKAGE)-$(DEB_UPSTREAM_VERSION).pom
+       wget  -U NoSuchBrowser/1.0 -O debian/poms/jcommon.pom \
+               
https://oss.sonatype.org/content/repositories/releases/org/jfree/jcommon/$(VERSION)/jcommon-$(VERSION).pom
+
+get-orig-source:
+       uscan --download-current-version --force-download --repack 
--compression xz
+
+#common-build-indep::
+#      ant -f ant/build-swt.xml
+
+#install/lib$(PACKAGE)-java::
+#      jh_manifest -c jcommon.jar lib/jfreechart-$(DEB_UPSTREAM_VERSION).jar
+#      bnd wrap --properties debian/jfreechart.bnd --output 
debian/jfreechart-$(DEB_UPSTREAM_VERSION).jar \
+#              lib/jfreechart-$(DEB_UPSTREAM_VERSION).jar
+#      mh_installpoms -plib$(PACKAGE)-java
+#      mh_installjar -plib$(PACKAGE)-java -l debian/poms/$(PACKAGE).pom 
debian/$(PACKAGE)-$(DEB_UPSTREAM_VERSION).jar
+
+#install/lib$(PACKAGE)-swt-java::
+#      jh_manifest -c "jcommon.jar jfreechart-$(DEB_UPSTREAM_VERSION).jar 
swt4.jar" \
+#              lib/jfreechart-$(DEB_UPSTREAM_VERSION)-swt.jar
+#      bnd wrap --properties debian/jfreechart-swt.bnd --output 
debian/jfreechart-$(DEB_UPSTREAM_VERSION)-swt.jar \
+#              lib/jfreechart-$(DEB_UPSTREAM_VERSION)-swt.jar
+#      dh_install -plib$(PACKAGE)-swt-java 
debian/jfreechart-$(DEB_UPSTREAM_VERSION)-swt.jar /usr/share/java
+#      dh_link -plib$(PACKAGE)-swt-java 
/usr/share/java/jfreechart-$(DEB_UPSTREAM_VERSION)-swt.jar 
/usr/share/java/jfreechart-swt.jar
 

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

_______________________________________________
pkg-java-commits mailing list
pkg-java-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits

Reply via email to