This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository jajuk.
commit ced903d4e13075c51a2400cfee2fbf0714740e14 Author: Emmanuel Bourg <[email protected]> Date: Wed Nov 29 13:00:23 2017 +0100 Build with the DH sequencer instead of CDBS --- debian/changelog | 1 + debian/clean | 1 + debian/control | 2 +- debian/patches/01_build.patch | 2 +- debian/rules | 24 ++++++++++++------------ 5 files changed, 16 insertions(+), 14 deletions(-) diff --git a/debian/changelog b/debian/changelog index 15edd97..f411e76 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ jajuk (1:1.10.9+dfsg2-4) UNRELEASED; urgency=medium * Team upload. + * Build with the DH sequencer instead of CDBS * Fixed the mangling of the Debian version in debian/watch * Standards-Version updated to 4.1.1 diff --git a/debian/clean b/debian/clean new file mode 100644 index 0000000..e660fd9 --- /dev/null +++ b/debian/clean @@ -0,0 +1 @@ +bin/ diff --git a/debian/control b/debian/control index 226a051..3315218 100644 --- a/debian/control +++ b/debian/control @@ -6,7 +6,7 @@ Uploaders: Varun Hiremath <[email protected]>, Torsten Werner <[email protected]>, Damien Raude-Morvan <[email protected]>, Felix Natter <[email protected]> -Build-Depends: cdbs, debhelper (>= 9) +Build-Depends: debhelper (>= 9) Build-Depends-Indep: ant, default-jdk, entagged, diff --git a/debian/patches/01_build.patch b/debian/patches/01_build.patch index 3a940d2..2fa78f4 100644 --- a/debian/patches/01_build.patch +++ b/debian/patches/01_build.patch @@ -48,7 +48,7 @@ Last-Update: 2016-03-11 + <include name='commons-collections3.jar' /> + <!--<include name='commons-httpclient.jar' />--> + <include name='commons-logging.jar' /> -+ <!--<include name='entagged-tageditor.jar' />--><!--??--> ++ <include name='entagged-tageditor.jar' /> + <include name='jaudiotagger.jar' /> + <include name='jcommon.jar' /> + <include name='jfreechart.jar' /> diff --git a/debian/rules b/debian/rules index 0763c8f..7341aef 100755 --- a/debian/rules +++ b/debian/rules @@ -1,22 +1,22 @@ #!/usr/bin/make -f -include /usr/share/cdbs/1/class/ant.mk -include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/dpkg/pkg-info.mk -JAVA_HOME := /usr/lib/jvm/default-java +%: + dh $@ --buildsystem=ant -DEB_ANT_BUILDFILE := build_enduser.xml -DEB_ANT_BUILD_TARGET := package_jar -DEB_ANT_ARGS := -Dbuild.time='$(shell dpkg-parsechangelog --show-field Date)' -DEB_JARS := animation basicplayer cobra commons-codec commons-collections3 commons-logging entagged-tageditor jaudiotagger jcommon jfreechart jl jmactritonusspi jogg jorbis jspeex log4j-1.2 mp3spi substance swingx tritonus_share vldocking vorbisspi jna dbus miglayout jhlabs-filters lastfm commons-lang commons-io xstream simple-validation guava +override_dh_auto_build: + dh_auto_build -- -f build_enduser.xml package_jar -Dbuild.time='$(shell dpkg-parsechangelog --show-field Date)' -install/jajuk:: - install -m 755 -D debian/jajuk.sh $(DEB_DESTDIR)/usr/bin/jajuk - install -m 644 -D bin/jajuk.jar $(DEB_DESTDIR)/usr/share/java/jajuk-$(DEB_UPSTREAM_VERSION).jar - dh_link /usr/share/java/jajuk-$(DEB_UPSTREAM_VERSION).jar /usr/share/java/jajuk.jar +override_dh_auto_install: + install -m 755 -D debian/jajuk.sh debian/jajuk/usr/bin/jajuk + install -m 644 -D bin/jajuk.jar debian/jajuk/usr/share/java/jajuk-$(DEB_VERSION_UPSTREAM).jar + dh_link /usr/share/java/jajuk-$(DEB_VERSION_UPSTREAM).jar /usr/share/java/jajuk.jar install -m 644 -D src/main/resources/icons/64x64/jajuk-icon_64x64.png \ - $(DEB_DESTDIR)/usr/share/icons/hicolor/64x64/apps/jajuk.png + debian/jajuk/usr/share/icons/hicolor/64x64/apps/jajuk.png dh_install debian/jajuk.desktop /usr/share/applications/ +override_dh_auto_clean: + get-orig-source: uscan --force-download --rename --repack -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/jajuk.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
