[med-svn] [dicoogle] 09/13: Normalised packaging

Andreas Tille tille at debian.org
Mon Dec 25 11:13:47 UTC 2017


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

tille pushed a commit to branch master
in repository dicoogle.

commit b8cfb4d3432a2ca96d83995d3dc5b921c2405dcf
Author: Andreas Tille <tille at debian.org>
Date:   Wed Jan 4 10:02:31 2017 +0000

    Normalised packaging
---
 TODO                   | 23 -----------------------
 debian/changelog       |  7 +------
 debian/compat          |  2 +-
 debian/control         | 21 ++++++++++++---------
 debian/copyright       |  2 +-
 debian/get-orig-source | 35 -----------------------------------
 debian/rules           |  3 ---
 debian/watch           |  8 ++++----
 8 files changed, 19 insertions(+), 82 deletions(-)

diff --git a/TODO b/TODO
deleted file mode 100644
index bc09f48..0000000
--- a/TODO
+++ /dev/null
@@ -1,23 +0,0 @@
-docs do not even build:
-
-Exception occurred:
-  File "/usr/lib/pymodules/python2.6/sphinx/cmdline.py", line 188, in main
-    app.build(force_all, filenames)
-  File "/usr/lib/pymodules/python2.6/sphinx/application.py", line 207, in build
-    self.builder.build_update()
-  File "/usr/lib/pymodules/python2.6/sphinx/builders/__init__.py", line 198, in build_update
-    'out of date' % len(to_build))
-  File "/usr/lib/pymodules/python2.6/sphinx/builders/__init__.py", line 257, in build
-    self.finish()
-  File "/usr/lib/pymodules/python2.6/sphinx/builders/html.py", line 451, in finish
-    self.copy_static_files()
-  File "/usr/lib/pymodules/python2.6/sphinx/builders/html.py", line 571, in copy_static_files
-    icontarget)
-  File "/usr/lib/pymodules/python2.6/sphinx/util/osutil.py", line 114, in copyfile
-    shutil.copyfile(source, dest)
-  File "/usr/lib/python2.6/shutil.py", line 50, in copyfile
-    with open(src, 'rb') as fsrc:
-IOError: [Errno 2] No such file or directory: '/home/mathieu/debian/debian-med/trunk/packages/dicoogle/trunk/Dicoogle_v0.4beta3-source/docs/src/static/umit_16.ico'
-The full traceback has been saved in /tmp/sphinx-err-MDUjnR.log, if you want to report the issue to the developers.
-Please also report this if it was a user error, so that a better error message can be provided next time.
-
diff --git a/debian/changelog b/debian/changelog
index 3543dd9..54479ca 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,5 @@
-dicoogle (0.4-1) UNRELEASED; urgency=low
+dicoogle (2.1.0-1) UNRELEASED; urgency=low
 
   * Initial Debian Upload (Closes: #)
 
-  [ Thorsten Alteholz ]
-  * debian/get-orig-source: put orig.tar.gz in ../tarballs to allow
-    automatic build with svn-buildpackage
-  * new upstream version (beta3 now moved to release)
-
  -- Mathieu Malaterre <mathieu.malaterre at gmail.com>  Mon, 12 Sep 2011 09:56:16 +0200
diff --git a/debian/compat b/debian/compat
index 45a4fb7..f599e28 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-8
+10
diff --git a/debian/control b/debian/control
index 8617f24..805d6be 100644
--- a/debian/control
+++ b/debian/control
@@ -1,19 +1,22 @@
 Source: dicoogle
-Priority: optional
-Section: java
 Maintainer: Debian Med Packaging Team <debian-med-packaging at lists.alioth.debian.org>
-DM-Upload-Allowed: yes
 Uploaders: Mathieu Malaterre <mathieu.malaterre at gmail.com>
-Build-Depends: debhelper (>= 8), javahelper (>=0.25)
-Build-Depends-Indep: default-jdk, default-jdk-doc, ant
-Standards-Version: 3.9.2
+Section: java
+Priority: optional
+Build-Depends: debhelper (>= 10),
+               javahelper
+Build-Depends-Indep: default-jdk,
+                     default-jdk-doc,
+                     ant
+Standards-Version: 3.9.8
+Vcs-Browser: http://anonscm.debian.org/viewvc/debian-med/trunk/packages/dicoogle/trunk/
+Vcs-Svn: svn://anonscm.debian.org/debian-med/trunk/packages/dicoogle/trunk/
 Homepage: http://dicoogle.com
-Vcs-Browser: http://svn.debian.org/wsvn/debian-med/trunk/packages/dicoogle/trunk/
-Vcs-Svn: svn://svn.debian.org/debian-med/trunk/packages/dicoogle/trunk/
 
 Package: dicoogle
 Architecture: any
-Depends: ${java:Depends}, ${misc:Depends}
+Depends: ${java:Depends},
+         ${misc:Depends}
 Recommends: ${java:Recommends}
 Description: Java Advanced Imaging API reference implementation
  This project contains the source code for the core Java Advanced Imaging API
diff --git a/debian/copyright b/debian/copyright
index dd38eac..cd958ea 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,4 +1,4 @@
-Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: Dicoogle
 Source: http://dicoogle.com
 
diff --git a/debian/get-orig-source b/debian/get-orig-source
deleted file mode 100755
index a28ae31..0000000
--- a/debian/get-orig-source
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/bin/sh
-set -ex
-
-# TODO:
-PACKAGE=dicoogle
-
-VERSION=${VERSION:-$2}
-TARFILE=${TARFILE:-$3}
-
-if [ -z ${VERSION}]; then
-VERSION=`dpkg-parsechangelog | sed -n -e 's/^Version: \(.*\)-[^-]*$/\1/p'`
-fi
-
-REVISION=`echo $VERSION | sed -e 's/^.*svn//g'`
-
-
-if [ -z ${TARFILE}]; then
-TARFILE=${PACKAGE}_${VERSION}.orig.tar.gz
-fi
-
-FOLDER=${PACKAGE}-${VERSION}
-
-#
-# put orig.tar in ../tarballs (-> default location for svn-buildpackage)
-mkdir -p ../tarballs
-cd ../tarballs
-
-wget -c http://www.dicoogle.com/downloads/Dicoogle_v0.4-source.tar.gz
-tar xfz Dicoogle_v0.4-source.tar.gz
-mv Dicoogle_v0.4-source ${FOLDER}
-# only keep the linux shared libs:
-rm -rf ${FOLDER}/lib
-
-GZIP="--best --no-name" tar czf ${TARFILE} ${FOLDER}
-rm -rf ${FOLDER}
diff --git a/debian/rules b/debian/rules
index 16e92c8..7cecc72 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,6 +7,3 @@ JAVA_HOME=/usr/lib/jvm/default-java
 
 override_dh_auto_build:
 	ant -DBUILD_TYPE=fcs -f build.xml all
-
-get-orig-source:
-	./debian/get-orig-source
diff --git a/debian/watch b/debian/watch
index 493bca9..8eac465 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,5 +1,5 @@
-# Unfortunately the download area is not freely accessible
-# Would you mind talking to the authors?
+# FIXME: The mangling does not properly work
+version=4
 
-#version=3
-#http://www.dicoogle.com/downloads/Dicoogle_v([.\d]+)-source.tar.gz
+opts=filenamemangle='s/.resource=//' \
+  http://www.dicoogle.com/?page_id=67 .*/dm/\?resource=dicoogle-(\d[.\d]+)_source.zip

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/dicoogle.git



More information about the debian-med-commit mailing list