diff -Nru piespy-0.4.0/debian/changelog piespy-0.4.0/debian/changelog --- piespy-0.4.0/debian/changelog 2016-03-21 18:35:26.000000000 +0000 +++ piespy-0.4.0/debian/changelog 2019-09-11 12:20:13.000000000 +0000 @@ -1,3 +1,17 @@ +piespy (0.4.0-5) unstable; urgency=medium + + * Package adopted by the Java Team (Closes: #614213) + * Build with the DH sequencer + * Removed the source files from the installed jars + * Generate Java 7 compatible bytecode + * Removed the unused ${shlibs:Depends} variable + * Removed the build dependency on fastjar + * Standards-Version updated to 4.4.0 + * Switch to debhelper level 11 + * Changed the priority from extra to optional + + -- Emmanuel Bourg Wed, 11 Sep 2019 14:20:13 +0200 + piespy (0.4.0-4) unstable; urgency=medium * QA upload. diff -Nru piespy-0.4.0/debian/compat piespy-0.4.0/debian/compat --- piespy-0.4.0/debian/compat 2016-03-21 18:35:26.000000000 +0000 +++ piespy-0.4.0/debian/compat 2019-09-11 11:56:37.000000000 +0000 @@ -1 +1 @@ -9 +11 diff -Nru piespy-0.4.0/debian/control piespy-0.4.0/debian/control --- piespy-0.4.0/debian/control 2016-03-21 18:35:26.000000000 +0000 +++ piespy-0.4.0/debian/control 2019-09-11 12:20:13.000000000 +0000 @@ -1,22 +1,21 @@ Source: piespy Section: net -Priority: extra -Maintainer: Debian QA Group +Priority: optional +Maintainer: Debian Java Maintainers +Uploaders: Emmanuel Bourg Build-Depends: - debhelper (>= 9), + debhelper (>= 11), default-jdk, docbook-xsl, - fastjar | jar, xsltproc -Standards-Version: 3.9.7 +Standards-Version: 4.4.0 +Vcs-Git: https://salsa.debian.org/java-team/piespy.git +Vcs-Browser: https://salsa.debian.org/java-team/piespy Homepage: http://www.jibble.org/piespy/ Package: piespy Architecture: all -Depends: - default-jre | java7-runtime, - ${misc:Depends}, - ${shlibs:Depends} +Depends: ${misc:Depends}, default-jre | java7-runtime Description: IRC bot to visualize social networks PieSpy is an IRC bot that monitors a set of IRC channels. It uses a simple set of heuristics to infer relationships between pairs of users. diff -Nru piespy-0.4.0/debian/piespy.manpages piespy-0.4.0/debian/piespy.manpages --- piespy-0.4.0/debian/piespy.manpages 1970-01-01 00:00:00.000000000 +0000 +++ piespy-0.4.0/debian/piespy.manpages 2019-09-11 11:56:37.000000000 +0000 @@ -0,0 +1 @@ +debian/piespy.1 diff -Nru piespy-0.4.0/debian/rules piespy-0.4.0/debian/rules --- piespy-0.4.0/debian/rules 2016-03-21 18:35:26.000000000 +0000 +++ piespy-0.4.0/debian/rules 2019-09-11 12:14:29.000000000 +0000 @@ -1,79 +1,30 @@ #!/usr/bin/make -f -# Uncomment this to turn on verbose mode. -#export DH_VERBOSE=1 -CFLAGS = -Wall -g +%: + dh $@ -ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) - CFLAGS += -O0 -else - CFLAGS += -O2 -endif - -## Upstream distributes pircbot as a JAR of both binaries and source. -## Here we rebuild it out of paranoia. - -pircbot.jar: - dh_testdir - cd lib && mkdir pircbot && cd pircbot && \ - jar -xf ../pircbot.jar && \ - find . -name '*.class' -exec rm {} ';' && \ - javac -source 1.6 -target 1.6 `find . -name '*.java'` && \ - jar -cf ../../pircbot.jar org - -piespy.jar: pircbot.jar - dh_testdir - mkdir piebuild && cd piebuild && cp -R ../org . && \ - find . -name '*.class' -exec rm {} ';' && \ - find . -name 'CVS' | xargs rm -rf && \ - javac -source 1.6 -target 1.6 -classpath $(CURDIR)/pircbot.jar `find . -name '*.java'` && \ - jar -cf ../piespy.jar org +override_dh_auto_build: -build-arch: build -build-indep: build + # Upstream distributes pircbot as a JAR of both binaries and source, here we rebuild it for DFSG compliance + mkdir -p target/pircbot-sources target/pircbot-classes + cd target/pircbot-sources && jar -xf ../../lib/pircbot.jar && find . -name '*.class' -exec rm {} ';' + javac -source 7 -target 7 -d target/pircbot-classes `find . -name '*.java'` + jar -cf target/pircbot.jar -C target/pircbot-classes . + + # Compile PieSpy + mkdir -p target/classes + javac -source 7 -target 7 -classpath target/pircbot.jar -d target/classes `find org -name '*.java'` + jar -cf target/piespy.jar -C target/classes . -build: pircbot.jar piespy.jar + # Generate the manpages cd debian/; \ xsltproc --nonet /usr/share/sgml/docbook/stylesheet/xsl/nwalsh/manpages/docbook.xsl piespy.man.xml -clean: - dh_testdir - dh_testroot - rm -rf build-stamp pircbot.jar piespy.jar lib/pircbot piebuild debian/piespy.1 - - dh_clean - -install: build - dh_testdir - dh_testroot - dh_prep - dh_installdirs - - install -m 644 pircbot.jar piespy.jar $(CURDIR)/debian/piespy/usr/share/piespy - install debian/piespy.sh $(CURDIR)/debian/piespy/usr/bin/piespy - - -# Build architecture-independent files here. -binary-indep: build install - dh_testdir - dh_testroot - dh_installchangelogs - dh_installdocs - dh_installexamples $(CURDIR)/config.ini - dh_install - dh_installman debian/piespy.1 - dh_link - dh_strip - dh_compress - dh_fixperms - dh_installdeb - dh_shlibdeps - dh_gencontrol - dh_md5sums - dh_builddeb - -binary-arch: - ### Nothing to do +override_dh_auto_clean: + rm -rf target debian/piespy.1 -binary: binary-indep binary-arch -.PHONY: build clean binary-indep binary-arch binary install configure +override_dh_auto_install: + dh_install target/pircbot.jar usr/share/piespy/ + dh_install target/piespy.jar usr/share/piespy/ + install debian/piespy.sh $(CURDIR)/debian/piespy/usr/bin/piespy + dh_installexamples $(CURDIR)/config.ini