[med-svn] [Git][med-team/libcolt-free-java][master] 13 commits: Create copy of sources in backup which can be restored in dh_clean
Andreas Tille (@tille)
gitlab at salsa.debian.org
Mon Feb 5 13:07:07 GMT 2024
Andreas Tille pushed to branch master at Debian Med / libcolt-free-java
Commits:
5802d718 by Andreas Tille at 2024-02-05T13:34:29+01:00
Create copy of sources in backup which can be restored in dh_clean
- - - - -
e44a9bdc by Andreas Tille at 2024-02-05T13:36:03+01:00
Lintian-overrides (see lintian bug #1017966)
- - - - -
db486e65 by Andreas Tille at 2024-02-05T13:46:13+01:00
Do not provide two dh_clean targets
- - - - -
991356f6 by Andreas Tille at 2024-02-05T13:56:30+01:00
Finally really fix clean target
- - - - -
3502e681 by Andreas Tille at 2024-02-05T13:57:19+01:00
Upload can probably be done to unstable
- - - - -
1b9e7edb by Andreas Tille at 2024-02-05T13:57:47+01:00
routine-update: Standards-Version: 4.6.2
- - - - -
561fe4d8 by Andreas Tille at 2024-02-05T13:57:47+01:00
routine-update: debhelper-compat 13
- - - - -
badf0f7c by Andreas Tille at 2024-02-05T13:57:51+01:00
routine-update: Add salsa-ci file
- - - - -
9522e94a by Andreas Tille at 2024-02-05T13:57:51+01:00
routine-update: Rules-Requires-Root: no
- - - - -
55381b92 by Andreas Tille at 2024-02-05T13:57:52+01:00
Trim trailing whitespace.
Changes-By: lintian-brush
Fixes: lintian: trailing-whitespace
See-also: https://lintian.debian.org/tags/trailing-whitespace.html
- - - - -
20da6170 by Andreas Tille at 2024-02-05T13:57:57+01:00
Use secure URI in Homepage field.
Changes-By: lintian-brush
Fixes: lintian: homepage-field-uses-insecure-uri
See-also: https://lintian.debian.org/tags/homepage-field-uses-insecure-uri.html
- - - - -
4a6224e8 by Andreas Tille at 2024-02-05T13:58:10+01:00
routine-update: watch file standard 4
- - - - -
85f5361a by Andreas Tille at 2024-02-05T13:59:48+01:00
routine-update: Ready to upload to unstable
- - - - -
8 changed files:
- debian/changelog
- − debian/compat
- debian/control
- debian/libcolt-free-java-doc.javadoc
- debian/rules
- + debian/salsa-ci.yml
- + debian/source/lintian-overrides
- debian/watch
Changes:
=====================================
debian/changelog
=====================================
@@ -1,3 +1,18 @@
+libcolt-free-java (1.2.0+dfsg-8) unstable; urgency=medium
+
+ * Create copy of sources in backup which can be restored in dh_clean
+ Closes: #1045303
+ * Lintian-overrides (see lintian bug #1017966)
+ * Standards-Version: 4.6.2 (routine-update)
+ * debhelper-compat 13 (routine-update)
+ * Add salsa-ci file (routine-update)
+ * Rules-Requires-Root: no (routine-update)
+ Trim trailing whitespace.
+ Use secure URI in Homepage field.
+ * watch file standard 4 (routine-update)
+
+ -- Andreas Tille <tille at debian.org> Mon, 05 Feb 2024 13:58:11 +0100
+
libcolt-free-java (1.2.0+dfsg-8~exp1) experimental; urgency=medium
* Team upload.
=====================================
debian/compat deleted
=====================================
@@ -1 +0,0 @@
-11
=====================================
debian/control
=====================================
@@ -3,14 +3,15 @@ Maintainer: Debian Med Packaging Team <debian-med-packaging at lists.alioth.debian.
Uploaders: Andreas Tille <tille at debian.org>
Section: java
Priority: optional
-Build-Depends: debhelper (>= 11~),
+Build-Depends: debhelper-compat (= 13),
javahelper,
default-jdk,
ant
-Standards-Version: 4.3.0
+Standards-Version: 4.6.2
Vcs-Browser: https://salsa.debian.org/med-team/libcolt-free-java
Vcs-Git: https://salsa.debian.org/med-team/libcolt-free-java.git
-Homepage: http://dst.lbl.gov/ACSSoftware/colt/
+Homepage: https://dst.lbl.gov/ACSSoftware/colt/
+Rules-Requires-Root: no
Package: libcolt-free-java
Architecture: all
=====================================
debian/libcolt-free-java-doc.javadoc
=====================================
@@ -1 +1 @@
-doc /usr/share/doc/libcolt-free-java
+doc usr/share/doc/libcolt-free-java
=====================================
debian/rules
=====================================
@@ -5,6 +5,7 @@ JAVA_HOME=/usr/lib/jvm/default-java
%:
dh $@ --with javahelper
+
override_dh_auto_configure:
# move files from freehep-jaida into place - unfortunately these files do not build
# mkdir -p src/hep
@@ -15,9 +16,11 @@ override_dh_auto_build:
#Make this directory on build because GIT won't let you commit an empty
#directory
mkdir -p lib
+ # create backup copy of sources which will be changed below
+ cp -a src src.bak
# Fix broken encodings that were not catched in fix_invalid_encoding.patch
export LC_ALL=C; \
- for utf16 in `find . -name "*.java" -exec file \{\} \; | grep "ISO-8859 text" | sed 's/: .*//'` ; do \
+ for utf16 in `find src -name "*.java" -exec file \{\} \; | grep "ISO-8859 text" | sed 's/: .*//'` ; do \
echo "Fixing ISO-8859 encoding of $$utf16" ; \
sed -i '/^Copyright/{;N;s/Copyright.*1999 CERN - European Organization for Nuclear Research/Copyright (c) 1999 CERN - European Organization for Nuclear Research/;}' $$utf16; \
done
@@ -33,10 +36,10 @@ override_dh_clean:
rm -rf lib/*.jar
#This will deliberately fail if lib contains anything but jars
! [ -d lib ] || rmdir lib
+ if [ -d src.bak ] ; then rm -rf src; mv src.bak src ; fi
rm -rf src/hep/aida
override_jh_installlibs:
#In this case leave on the +dfsg version suffix as it affects the methods
#available vs. the vanilla upstream lib.
jh_installlibs -v --version-strip=X
-
=====================================
debian/salsa-ci.yml
=====================================
@@ -0,0 +1,4 @@
+---
+include:
+ - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/salsa-ci.yml
+ - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/pipeline-jobs.yml
=====================================
debian/source/lintian-overrides
=====================================
@@ -0,0 +1,2 @@
+# See lintian bug #1017966
+libcolt-free-java source: source-is-missing
=====================================
debian/watch
=====================================
@@ -1,3 +1,3 @@
-version=3
+version=4
opts="repacksuffix=+dfsg,dversionmangle=s/\+dfsg//g" \
http://acs.lbl.gov/software/colt/colt-download/releases/colt-([\d\.]+)\.tar\.gz
View it on GitLab: https://salsa.debian.org/med-team/libcolt-free-java/-/compare/12a00f67053e48699b374d9aacdb9e56b2f7fa85...85f5361a80dd52789493f9285946337909b992dd
--
View it on GitLab: https://salsa.debian.org/med-team/libcolt-free-java/-/compare/12a00f67053e48699b374d9aacdb9e56b2f7fa85...85f5361a80dd52789493f9285946337909b992dd
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-med-commit/attachments/20240205/6748fe95/attachment-0001.htm>
More information about the debian-med-commit
mailing list