[f2j] 27/31: Remove non-free parts from the code and upload to main

[Andreas Tille]

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

tille pushed a commit to branch master
in repository f2j.

commit 77245f467409d8128c5e836646a6c54bb710d091
Author: Andreas Tille <tille at debian.org>
Date:   Fri Jan 29 15:53:54 2016 +0100

    Remove non-free parts from the code and upload to main
---
 debian/changelog | 3 ++-
 debian/control   | 3 +--
 debian/copyright | 5 +++++
 debian/rules     | 2 +-
 debian/watch     | 4 ++--
 5 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 387d3be..b7d7916 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
-f2j (0.8.1-3) UNRELEASED; urgency=medium
+f2j (0.8.1+dfsg-1) UNRELEASED; urgency=medium
 
+  * Remove non-free parts from the code and upload to main
   * Moved packaging from Debian Med SVN to Debian Java Git
   * debhelper 9
   * cme fix dpkg-control
diff --git a/debian/control b/debian/control
index 7b1c502..40b7570 100644
--- a/debian/control
+++ b/debian/control
@@ -2,8 +2,7 @@ Source: f2j
 Maintainer: Debian Med Packaging Team <debian-med-packaging at lists.alioth.debian.org>
 Uploaders: Olivier Sallou <osallou at debian.org>,
            Andreas Tille <tille at debian.org>
-Section: non-free/java
-XS-Autobuild: yes
+Section: java
 Priority: optional
 Build-Depends: debhelper (>= 9),
                default-jdk,
diff --git a/debian/copyright b/debian/copyright
index 6c8f5ac..281ec7c 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -2,6 +2,11 @@ Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: f2j
 Upstream-Contact: Keith Seymour <seymour at cs.utk.edu>
 Source: http://sourceforge.net/projects/f2j/
+Files-Excluded: goto_trans
+                */CVS
+                */configure
+                */*~
+                util/org/j_paine/formatter/PrintfFormat.java
 
 Files: goto_trans/*
 Copyright: 2008 Aart J.C. Bik
diff --git a/debian/rules b/debian/rules
index f6da015..9d55130 100755
--- a/debian/rules
+++ b/debian/rules
@@ -21,4 +21,4 @@ override_dh_clean:
 
 get-orig-source:
 	mkdir -p ../tarballs
-	uscan --verbose --force-download --destdir=../tarballs
+	uscan --verbose --force-download --repack --compression xz --destdir=../tarballs
diff --git a/debian/watch b/debian/watch
index f7eb0a0..b5f4f09 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,4 +1,4 @@
-# Compulsory line, this is a version 3 file
 version=3
 
-http://sf.net/f2j/f2j-(.+)\.tgz
+opts="repacksuffix=+dfsg,dversionmangle=s/\+dfsg//g" \
+  http://sf.net/f2j/f2j-(.+)\.tgz

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