[med-svn] r12438 - in trunk/packages/pcalendar/trunk/debian: . bin
Andreas Tille
tille at alioth.debian.org
Tue Oct 16 12:24:06 UTC 2012
Author: tille
Date: 2012-10-16 12:24:05 +0000 (Tue, 16 Oct 2012)
New Revision: 12438
Added:
trunk/packages/pcalendar/trunk/debian/bin/
trunk/packages/pcalendar/trunk/debian/bin/pcalendar
trunk/packages/pcalendar/trunk/debian/pcalendar.manifest
Removed:
trunk/packages/pcalendar/trunk/debian/run.sh
Modified:
trunk/packages/pcalendar/trunk/debian/changelog
trunk/packages/pcalendar/trunk/debian/compat
trunk/packages/pcalendar/trunk/debian/control
trunk/packages/pcalendar/trunk/debian/pcalendar.install
trunk/packages/pcalendar/trunk/debian/rules
Log:
Simplify packaging by using short dh rules file inclusive javahelper (and all the needed changes around)
Copied: trunk/packages/pcalendar/trunk/debian/bin/pcalendar (from rev 12423, trunk/packages/pcalendar/trunk/debian/run.sh)
===================================================================
--- trunk/packages/pcalendar/trunk/debian/bin/pcalendar (rev 0)
+++ trunk/packages/pcalendar/trunk/debian/bin/pcalendar 2012-10-16 12:24:05 UTC (rev 12438)
@@ -0,0 +1,2 @@
+#!/bin/sh
+java -jar /usr/share/java/pcalendar.jar "$@"
Modified: trunk/packages/pcalendar/trunk/debian/changelog
===================================================================
--- trunk/packages/pcalendar/trunk/debian/changelog 2012-10-16 11:22:37 UTC (rev 12437)
+++ trunk/packages/pcalendar/trunk/debian/changelog 2012-10-16 12:24:05 UTC (rev 12438)
@@ -1,8 +1,17 @@
pcalendar (3.3.0-1) UNRELEASED; urgency=low
* New upstream version
- * Added myself to uploaders
* wrote debian/watch
+ * debian/control:
+ - Build-Depends: default-jdk, javahelper
+ - Debhelper 9
+ * debian/rules: rewritten to short dh notation
+ * debian/patches/build.patch:
+ - Remove javadoc target because it disturbs javahelper
+ - Create unversioned jarfile
+ - drop manifest and ratherprovide debian/pcalendar.manifest
+ * move debian/run.sh to debian/bin/pcalendar to enable more simple
+ usage of dh_install
-- Andreas Tille <tille at debian.org> Tue, 16 Oct 2012 11:45:12 +0200
Modified: trunk/packages/pcalendar/trunk/debian/compat
===================================================================
--- trunk/packages/pcalendar/trunk/debian/compat 2012-10-16 11:22:37 UTC (rev 12437)
+++ trunk/packages/pcalendar/trunk/debian/compat 2012-10-16 12:24:05 UTC (rev 12438)
@@ -1 +1 @@
-7
+9
Modified: trunk/packages/pcalendar/trunk/debian/control
===================================================================
--- trunk/packages/pcalendar/trunk/debian/control 2012-10-16 11:22:37 UTC (rev 12437)
+++ trunk/packages/pcalendar/trunk/debian/control 2012-10-16 12:24:05 UTC (rev 12438)
@@ -4,8 +4,8 @@
Maintainer: Debian Med Packaging Team <debian-med-packaging at lists.alioth.debian.org>
Uploaders: Miriam Ruiz <little_miry at yahoo.es>,
Andreas Tille <tille at debian.org>
-Build-Depends: debhelper (>= 7), dh-buildinfo, quilt,
- openjdk-6-jdk, ant, junit4, libxerces2-java
+Build-Depends: debhelper (>= 9), dh-buildinfo, quilt,
+ default-jdk, javahelper, ant, junit4, libxerces2-java
Standards-Version: 3.9.2
Homepage: http://linuxorg.sourceforge.net/
Vcs-Browser: http://svn.debian.org/wsvn/debian-med/trunk/packages/pcalendar/trunk/
Modified: trunk/packages/pcalendar/trunk/debian/pcalendar.install
===================================================================
--- trunk/packages/pcalendar/trunk/debian/pcalendar.install 2012-10-16 11:22:37 UTC (rev 12437)
+++ trunk/packages/pcalendar/trunk/debian/pcalendar.install 2012-10-16 12:24:05 UTC (rev 12438)
@@ -1,4 +1,5 @@
-*.jar usr/share/pcalendar/
-debian/*.desktop usr/share/applications/
-debian/pcalendar*.png usr/share/pixmaps/
-debian/pcalendar*.xpm usr/share/pixmaps/
+*.jar usr/share/java/
+debian/bin/* usr/bin
+debian/*.desktop usr/share/applications/
+debian/pcalendar*.png usr/share/pixmaps/
+debian/pcalendar*.xpm usr/share/pixmaps/
Added: trunk/packages/pcalendar/trunk/debian/pcalendar.manifest
===================================================================
--- trunk/packages/pcalendar/trunk/debian/pcalendar.manifest (rev 0)
+++ trunk/packages/pcalendar/trunk/debian/pcalendar.manifest 2012-10-16 12:24:05 UTC (rev 12438)
@@ -0,0 +1,3 @@
+/usr/share/java/pcalendar.jar:
+ Main-Class: net.sf.linuxorg.pcal.PCalendar
+ Class-Path: /usr/share/java/xercesImpl.jar
Modified: trunk/packages/pcalendar/trunk/debian/rules
===================================================================
--- trunk/packages/pcalendar/trunk/debian/rules 2012-10-16 11:22:37 UTC (rev 12437)
+++ trunk/packages/pcalendar/trunk/debian/rules 2012-10-16 12:24:05 UTC (rev 12438)
@@ -1,61 +1,11 @@
#!/usr/bin/make -f
+# -*- makefile -*-
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
-config: config-stamp
-config-stamp:
- dh_testdir
- [ ! -d debian/patches ] || $(MAKE) -f /usr/share/quilt/quilt.make patch
- touch $@
+%:
+ dh $@ --with javahelper
-build-indep: build-stamp
-build-stamp: config
- dh_testdir
- ant compile
- ant jar
- touch $@
-
-build-arch:
-
-build: build-arch build-indep
-
-clean:
- dh_testdir
- dh_testroot
- rm -f build-stamp config-stamp
- ant clean
- [ ! -d debian/patches ] || $(MAKE) -f /usr/share/quilt/quilt.make unpatch
- dh_clean
-
-install: build
- dh_testdir
- dh_testroot
- dh_prep
- dh_installdirs
- mkdir -p $(CURDIR)/debian/pcalendar/usr/bin
- install -m 755 debian/run.sh $(CURDIR)/debian/pcalendar/usr/bin/pcalendar
-
-binary-indep: install
- dh_testdir
- dh_testroot
+override_dh_installchangelogs:
dh_installchangelogs PeriodicCalendar/net/sf/linuxorg/pcal/docs/ChangeLog
- dh_installdocs
- dh_installexamples
- dh_install
- dh_installmenu
- dh_installman
- dh_installmime
- dh_link
- dh_compress
- dh_fixperms
- [ ! -e /usr/bin/dh_buildinfo ] || dh_buildinfo
- dh_installdeb
- dh_gencontrol
- dh_md5sums
- dh_builddeb
-
-binary-arch: install
-
-binary: binary-indep binary-arch
-.PHONY: config build-indep build-arch build clean binary-indep binary-arch binary install
Deleted: trunk/packages/pcalendar/trunk/debian/run.sh
===================================================================
--- trunk/packages/pcalendar/trunk/debian/run.sh 2012-10-16 11:22:37 UTC (rev 12437)
+++ trunk/packages/pcalendar/trunk/debian/run.sh 2012-10-16 12:24:05 UTC (rev 12438)
@@ -1,6 +0,0 @@
-#!/bin/sh --
-
-OLD_DIR="`pwd`"
-cd "/usr/share/pcalendar"
-java -jar pcalendar-3.2.0.jar "$@"
-cd "$OLD_DIR"
More information about the debian-med-commit
mailing list