[freehep-export] 01/01: Standardise package.
Giovanni Mascellani
gio at moszumanska.debian.org
Mon Jun 6 17:11:44 UTC 2016
This is an automated email from the git hooks/post-receive script.
gio pushed a commit to branch master
in repository freehep-export.
commit e72e4b1d7a37b4de62670bff690d2ae3382104c9
Author: Giovanni Mascellani <mascellani at poisson.phc.unipi.it>
Date: Sun Jun 5 17:16:24 2016 +0200
Standardise package.
---
debian/README.source | 24 ------------------------
debian/changelog | 11 +++++++++++
debian/control | 10 +++++-----
debian/gbp.conf | 5 -----
debian/patches/classpath.diff | 25 +++++++++++++++++++++++++
debian/patches/deps.diff | 19 +++++++++++++++++++
debian/patches/patch/pom.xml.diff | 30 ------------------------------
debian/patches/series | 3 ++-
debian/rules | 8 +++++---
9 files changed, 67 insertions(+), 68 deletions(-)
diff --git a/debian/README.source b/debian/README.source
deleted file mode 100644
index 23fcf29..0000000
--- a/debian/README.source
+++ /dev/null
@@ -1,24 +0,0 @@
-Information about freehep-export
-------------------------------
-
-DEBIANIZATION
-
-This package was debianized using the mh_make command
-from the maven-debian-helper package.
-
-The build system uses Maven but prevents it from downloading
-anything from the Internet, making the build compliant with
-the Debian policy.
-
-
-QUILT
-
-This package uses quilt to manage all modifications to the upstream
-source. Changes are stored in the source package as diffs in
-debian/patches and applied during the build. Please see:
-
- /usr/share/doc/quilt/README.source
-
-for more information on how to apply the patches, modify patches, or
-remove a patch.
-
diff --git a/debian/changelog b/debian/changelog
index a1ee080..bde364c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
freehep-export (2.1.1-3) UNRELEASED; urgency=medium
+ [ Philipp Huebner ]
* Added myself as uploader
* Updated Standards-Version: 3.9.6 (no changes needed)
* Updated VCS links
@@ -7,6 +8,16 @@ freehep-export (2.1.1-3) UNRELEASED; urgency=medium
* Updated debian/copyright and made it lintian clean
* Dropped Depends on jre
+ [ Giovanni Mascellani ]
+ * Remove obsolete lines from gbp.conf.
+ * Move package to priority extra.
+ * Use secure Vcs-* URLs.
+ * Bump Standards-Version to 3.9.8 (no changes required).
+ * Build with debhelper 9 instead of CDBS.
+ * Quit using topgit and remove leftovers.
+ * Remove trivial information in debian/README.source.
+ * Add classpath to the JAR manifest.
+
-- Philipp Huebner <debalance at debian.org> Tue, 20 Oct 2015 16:29:19 +0200
freehep-export (2.1.1-2) unstable; urgency=low
diff --git a/debian/control b/debian/control
index 1e22ad2..8f09c73 100644
--- a/debian/control
+++ b/debian/control
@@ -1,16 +1,16 @@
Source: freehep-export
Section: java
-Priority: optional
+Priority: extra
Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
Uploaders: Giovanni Mascellani <gio at debian.org>,
Gabriele Giacone <1o5g4r8o at gmail.com>,
Philipp Huebner <debalance at debian.org>
-Build-Depends: debhelper (>= 9), cdbs, maven-debian-helper, default-jdk, quilt
+Build-Depends: debhelper (>= 9), maven-debian-helper, default-jdk, quilt
Build-Depends-Indep: libsurefire-java (>= 2.4.3), libfreehep-swing-java,
libmaven-exec-plugin-java, libjas-plotter-java
-Standards-Version: 3.9.6
-Vcs-Git: git://anonscm.debian.org/pkg-java/freehep/freehep-export.git
-Vcs-Browser: http://anonscm.debian.org/cgit/pkg-java/freehep/freehep-export.git
+Standards-Version: 3.9.8
+Vcs-Git: https://anonscm.debian.org/git/pkg-java/freehep/freehep-export.git
+Vcs-Browser: https://anonscm.debian.org/git/pkg-java/freehep/freehep-export.git
Homepage: http://java.freehep.org/
Package: libfreehep-export-java
diff --git a/debian/gbp.conf b/debian/gbp.conf
index d730773..cec628c 100644
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@ -1,7 +1,2 @@
-
[DEFAULT]
-cleaner = fakeroot debian/rules clean
-upstream-branch = upstream
-debian-branch = build
pristine-tar = True
-
diff --git a/debian/patches/classpath.diff b/debian/patches/classpath.diff
new file mode 100644
index 0000000..7282d16
--- /dev/null
+++ b/debian/patches/classpath.diff
@@ -0,0 +1,25 @@
+From: Giovanni Mascellani <gio at debian.org>
+Subject: Add classpath to compiled JAR
+Index: freehep-export/pom.xml
+===================================================================
+--- freehep-export.orig/pom.xml
++++ freehep-export/pom.xml
+@@ -49,6 +49,18 @@
+ <mainClass>org.freehep.util.export.test.ExportFileTypeTest</mainClass>
+ </configuration>
+ </plugin>
++ <plugin>
++ <artifactId>maven-jar-plugin</artifactId>
++ <configuration>
++ <archive>
++ <manifest>
++ <addClasspath>true</addClasspath>
++ <classpathLayoutType>repository</classpathLayoutType>
++ <classpathPrefix>/usr/share/maven-repo</classpathPrefix>
++ </manifest>
++ </archive>
++ </configuration>
++ </plugin>
+ </plugins>
+ </build>
+
diff --git a/debian/patches/deps.diff b/debian/patches/deps.diff
new file mode 100644
index 0000000..0e1497a
--- /dev/null
+++ b/debian/patches/deps.diff
@@ -0,0 +1,19 @@
+From: Giovanni Mascellani <gio at debian.org>
+Subject: Remove useless dependency on jas-plotter.
+Index: freehep-export/pom.xml
+===================================================================
+--- freehep-export.orig/pom.xml
++++ freehep-export/pom.xml
+@@ -23,12 +23,6 @@
+ <artifactId>freehep-swing</artifactId>
+ <version>2.0.3</version>
+ </dependency>
+- <dependency>
+- <groupId>org.freehep</groupId>
+- <artifactId>jas-plotter</artifactId>
+- <version>2.2</version>
+- <scope>test</scope>
+- </dependency>
+ </dependencies>
+ <build>
+ <plugins>
diff --git a/debian/patches/patch/pom.xml.diff b/debian/patches/patch/pom.xml.diff
deleted file mode 100644
index 0a74721..0000000
--- a/debian/patches/patch/pom.xml.diff
+++ /dev/null
@@ -1,30 +0,0 @@
-From: Giovanni Mascellani <mascellani at poisson.phc.unipi.it>
-Subject: [PATCH] patch/pom.xml
-
-Fixes pom.xml, which shouldn't depend on jas-plotter.
-
-Signed-off-by: Giovanni Mascellani <mascellani at poisson.phc.unipi.it>
-
----
- pom.xml | 6 ------
- 1 files changed, 0 insertions(+), 6 deletions(-)
-
-diff --git a/pom.xml b/pom.xml
-index 67a92df..22d5408 100644
---- a/pom.xml
-+++ b/pom.xml
-@@ -23,12 +23,6 @@
- <artifactId>freehep-swing</artifactId>
- <version>2.0.3</version>
- </dependency>
-- <dependency>
-- <groupId>org.freehep</groupId>
-- <artifactId>jas-plotter</artifactId>
-- <version>2.2</version>
-- <scope>test</scope>
-- </dependency>
- </dependencies>
- <build>
- <plugins>
---
-tg: (c262cd6..) patch/pom.xml (depends on: master)
diff --git a/debian/patches/series b/debian/patches/series
index abd225c..ded0b47 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
-patch/pom.xml.diff -p1
+deps.diff
+classpath.diff
diff --git a/debian/rules b/debian/rules
index 9873a98..6d7053b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,8 +1,10 @@
#!/usr/bin/make -f
+# -*- makefile -*-
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/maven.mk
--include /usr/share/topgit/tg2quilt.mk
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
JAVA_HOME := /usr/lib/jvm/default-java
+%:
+ dh $@ --buildsystem=maven
--
Alioth's hooks/post-receive on /srv/git.debian.org/git/pkg-java/freehep/freehep-export.git
More information about the pkg-java-commits
mailing list