[Git][java-team/kxml2][master] 10 commits: Inject changelog entry of NMU
Andreas Tille (@tille)
gitlab at salsa.debian.org
Sun Feb 2 18:49:11 GMT 2025
Andreas Tille pushed to branch master at Debian Java Maintainers / kxml2
Commits:
a8936b3d by Andreas Tille at 2025-02-02T18:30:56+01:00
Inject changelog entry of NMU
- - - - -
8ac3eda4 by Andreas Tille at 2025-02-02T18:38:20+01:00
Fix Homepage
- - - - -
19684d8c by Andreas Tille at 2025-02-02T18:54:35+01:00
Fix watch file, remove files from upstream source via Files-Excluded
- - - - -
a946da63 by Andreas Tille at 2025-02-02T19:03:45+01:00
Standards-Version: 4.7.0 (routine-update)
- - - - -
01c6332a by Andreas Tille at 2025-02-02T19:03:46+01:00
debhelper-compat 13 (routine-update)
- - - - -
3d465f8d by Andreas Tille at 2025-02-02T19:04:53+01:00
Reorder sequence of d/control fields by cme (routine-update)
- - - - -
7b2faae3 by Andreas Tille at 2025-02-02T19:05:26+01:00
Do not parse d/changelog (routine-update)
- - - - -
1970d2ed by Andreas Tille at 2025-02-02T19:07:05+01:00
Make "Files: *" paragraph the first in the copyright file.
Changes-By: lintian-brush
Fixes: lintian: global-files-wildcard-not-first-paragraph-in-dep5-copyright
See-also: https://lintian.debian.org/tags/global-files-wildcard-not-first-paragraph-in-dep5-copyright.html
- - - - -
98a8bf80 by Andreas Tille at 2025-02-02T19:46:37+01:00
Do not generate OSGi metadata into kxml2-min jar manifest --> this fails to build
- - - - -
b26c249d by Andreas Tille at 2025-02-02T19:48:59+01:00
Adapt doc-base to location choosen by later debhelper compat level
- - - - -
8 changed files:
- − debian/README.source
- debian/changelog
- − debian/compat
- debian/control
- debian/copyright
- debian/libkxml2-java-doc.doc-base
- debian/rules
- debian/watch
Changes:
=====================================
debian/README.source deleted
=====================================
@@ -1,8 +0,0 @@
-kxml2 for Debian
-----------------
-
-The source tarball has been repackaged to remove binary *.class and *.jar files.
-
- -- David Paleino <dapal at debian.org> Sun, 06 Jun 2010 15:34:49 +0200
-
-
=====================================
debian/changelog
=====================================
@@ -1,15 +1,34 @@
kxml2 (2.3.0+ds1-3) UNRELEASED; urgency=low
+ * Team Upload
+
+ [ Jakub Adam ]
* Build-depend on maven-repo-helper (>= 1.5~):
- fixes lintian-reported error missing-build-dependency-for-dh-addon.
* Update format of d/copyright:
- fixes lintian-reported warning obsolete-field-in-dep5-copyright.
* Add Jakub Adam to Uploaders.
* Bump Standards-Version to 3.9.4: no changes needed.
- * Generate OSGi metadata into kxml2-min jar manifest.
+
+ [ Andreas Tille ]
+ * Fix Homepage
+ * Fix watch file, remove files from upstream source via Files-Excluded
+ * Standards-Version: 4.7.0 (routine-update)
+ * debhelper-compat 13 (routine-update)
+ * Reorder sequence of d/control fields by cme (routine-update)
+ * Do not parse d/changelog (routine-update)
+ * Make "Files: *" paragraph the first in the copyright file.
+ * Adapt doc-base to location chosen by later debhelper compat level
-- Jakub Adam <jakub.adam at ktknet.cz> Sat, 27 Oct 2012 13:43:09 +0200
+kxml2 (2.3.0+ds1-2.1) unstable; urgency=medium
+
+ * Non maintainer upload by the Reproducible Builds team.
+ * No source change upload to rebuild on buildd with .buildinfo files.
+
+ -- Holger Levsen <holger at debian.org> Mon, 28 Dec 2020 01:58:32 +0100
+
kxml2 (2.3.0+ds1-2) unstable; urgency=low
* Switch maintainership to pkg-java team:
=====================================
debian/compat deleted
=====================================
@@ -1 +0,0 @@
-7
=====================================
debian/control
=====================================
@@ -1,25 +1,24 @@
Source: kxml2
-Section: java
-Priority: extra
Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-Uploaders: Damien Raude-Morvan <drazzib at debian.org>, Jakub Adam <jakub.adam at ktknet.cz>
-Build-Depends:
- debhelper (>= 7.3.3~)
- , libxpp3-java
- , ant
- , default-jdk
- , maven-repo-helper (>= 1.5~)
- , bnd
-Standards-Version: 3.9.4
-Homepage: http://kxml.sourceforge.net/
-Vcs-Git: git://git.debian.org/pkg-java/kxml2.git
-Vcs-Browser: http://git.debian.org/?p=pkg-java/kxml2.git;a=summary
+Uploaders: Damien Raude-Morvan <drazzib at debian.org>,
+ Jakub Adam <jakub.adam at ktknet.cz>
+Section: java
+Priority: optional
+Build-Depends: debhelper-compat (= 13),
+ libxpp3-java,
+ ant,
+ default-jdk-headless,
+ maven-repo-helper,
+ bnd
+Standards-Version: 4.7.0
+Vcs-Browser: https://salsa.debian.org/java-team/kxml2
+Vcs-Git: https://salsa.debian.org/java-team/kxml2.git
+Homepage: https://github.com/kobjects/kxml2
Package: libkxml2-java
Architecture: all
-Depends:
- ${java:Depends}
- , ${misc:Depends}
+Depends: ${java:Depends},
+ ${misc:Depends}
Description: small XML parser, designed for small environments
kXML is a small XML pull parser, specially designed for constrained
environments such as Applets, Personal Java or MIDP devices. In
@@ -42,9 +41,8 @@ Description: small XML parser, designed for small environments
Package: libkxml2-java-doc
Architecture: all
Section: doc
-Depends:
- ${java:Depends}
- , ${misc:Depends}
+Depends: ${java:Depends},
+ ${misc:Depends}
Description: small XML parser, designed for small environments - docs
kXML is a small XML pull parser, specially designed for constrained
environments such as Applets, Personal Java or MIDP devices. In
=====================================
debian/copyright
=====================================
@@ -1,13 +1,16 @@
-Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
-
-Files: debian/*
-Copyright: © 2010, David Paleino <dapal at debian.org>
-License: MIT
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: kxml2
+Source: https://github.com/kobjects/kxml2
+Files-Excluded: */*.jar
Files: *
Copyright: © 2002-2004, Stefan Haustein, Oberhausen, Rhld., Germany
License: MIT
+Files: debian/*
+Copyright: © 2010, David Paleino <dapal at debian.org>
+License: MIT
+
License: MIT
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
=====================================
debian/libkxml2-java-doc.doc-base
=====================================
@@ -4,5 +4,5 @@ Author: Stefan Haustein
Section: Programming/Java
Format: HTML
-Index: /usr/share/doc/libkxml2-java-doc/javadoc/index.html
-Files: /usr/share/doc/libkxml2-java-doc/javadoc/*.html
+Index: /usr/share/doc/libkxml2-java/javadoc/index.html
+Files: /usr/share/doc/libkxml2-java/javadoc/*.html
=====================================
debian/rules
=====================================
@@ -4,26 +4,14 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
-CURVER=$(shell dpkg-parsechangelog | grep ^Version | cut -d\ -f2 | cut -d- -f1)
-UPVER=$(shell echo $(CURVER) | cut -d+ -f1)
-
%:
dh $@ --with maven_repo_helper
override_dh_auto_build:
dh_auto_build -- build_jar
- bnd wrap -properties debian/kxml2-min.bnd -output dist/kxml2-min-*.jar dist/kxml2-min-*.jar
+ # Generate OSGi metadata into kxml2-min jar manifest.
+# This fails to build
+# bnd wrap -properties debian/kxml2-min.bnd -output dist/kxml2-min-*.jar dist/kxml2-min-*.jar
override_dh_auto_clean:
dh_clean dist/*
-
-get-orig-source:
- uscan --verbose \
- --download-version $(UPVER) \
- --force-download \
- --destdir .
- unzip -d kxml2-$(CURVER) kxml2-src-$(UPVER).zip
- find kxml2-$(CURVER) \( -name "*.class" -o -name "*.jar" \) -delete
- tar cf kxml2_$(CURVER).orig.tar kxml2-$(CURVER)
- gzip -9 kxml2_$(CURVER).orig.tar
- rm -vrf kxml2-$(CURVER) kxml2-src-$(UPVER).zip
=====================================
debian/watch
=====================================
@@ -1,3 +1,4 @@
-version=3
-opts=dversionmangle=s/\+ds1// \
-http://sf.net/kxml/kxml2-src-(.*)\.zip
+version=4
+
+opts="repacksuffix=+dfsg,dversionmangle=auto,filenamemangle=s%(?:.*?)?v?(\d[\d.]*)\.tar\.gz%@PACKAGE at -$1.tar.gz%" \
+ https://github.com/kobjects/kxml2/tags (?:.*?/)?v?(\d[\d.]*)\.tar\.gz
View it on GitLab: https://salsa.debian.org/java-team/kxml2/-/compare/7ac486512f188a803a223b24c98320fd6f870bd8...b26c249dd96ee95820ee51fdb67c4878d8b75d4e
--
View it on GitLab: https://salsa.debian.org/java-team/kxml2/-/compare/7ac486512f188a803a223b24c98320fd6f870bd8...b26c249dd96ee95820ee51fdb67c4878d8b75d4e
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/pkg-java-commits/attachments/20250202/fd4d5003/attachment.htm>
More information about the pkg-java-commits
mailing list