diff options
| author | Andreas Tille <tille@debian.org> | 2024-12-18 20:19:12 +0100 |
|---|---|---|
| committer | git-ubuntu importer <ubuntu-devel-discuss@lists.ubuntu.com> | 2024-12-19 04:42:30 +0000 |
| commit | 676f7bbd4f2f8008872ba170027bfce6bc026eff (patch) | |
| tree | d18ab836c65fd0906e6054857b80837c581ded42 | |
| parent | 7d7b9c3851bf1a576020235babb482eb5994d0a7 (diff) | |
2.3.4.726-7 (patches unapplied)HEADimport/2.3.4.726-7ubuntu/stonking-develubuntu/stonkingubuntu/resolute-develubuntu/resoluteubuntu/questing-develubuntu/questingubuntu/plucky-proposedubuntu/plucky-develubuntu/pluckyubuntu/develdebian/sid
Imported using git-ubuntu import.
Notes
Notes:
* Team upload.
* Fix Vcs fields
* Standards-Version: 4.7.0 (routine-update)
* debhelper-compat 13 (routine-update)
* Drop useless get-orig-source target (routine-update)
* Rules-Requires-Root: no (routine-update)
* Trim trailing whitespace.
* Use secure URI in Homepage field.
* watch file standard 4 (routine-update)
* Secure URL in watch file
| -rw-r--r-- | debian/changelog | 15 | ||||
| -rw-r--r-- | debian/compat | 1 | ||||
| -rw-r--r-- | debian/control | 11 | ||||
| -rw-r--r-- | debian/gbp.conf | 2 | ||||
| -rw-r--r-- | debian/patches/01-jdbc-compatibility.patch | 4 | ||||
| -rwxr-xr-x | debian/rules | 3 | ||||
| -rw-r--r-- | debian/watch | 4 |
7 files changed, 27 insertions, 13 deletions
diff --git a/debian/changelog b/debian/changelog index 059873a..7c07f25 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,18 @@ +libibatis-java (2.3.4.726-7) unstable; urgency=medium + + * Team upload. + * Fix Vcs fields + * Standards-Version: 4.7.0 (routine-update) + * debhelper-compat 13 (routine-update) + * Drop useless get-orig-source target (routine-update) + * Rules-Requires-Root: no (routine-update) + * Trim trailing whitespace. + * Use secure URI in Homepage field. + * watch file standard 4 (routine-update) + * Secure URL in watch file + + -- Andreas Tille <tille@debian.org> Wed, 18 Dec 2024 20:19:12 +0100 + libibatis-java (2.3.4.726-6.1) unstable; urgency=medium * Non maintainer upload by the Reproducible Builds team. diff --git a/debian/compat b/debian/compat deleted file mode 100644 index ec63514..0000000 --- a/debian/compat +++ /dev/null @@ -1 +0,0 @@ -9 diff --git a/debian/control b/debian/control index 1f653e0..14c8bed 100644 --- a/debian/control +++ b/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org> Uploaders: Torsten Werner <twerner@debian.org>, Varun Hiremath <varun@debian.org> Build-Depends: ant, - debhelper (>= 9), + debhelper-compat (= 13), default-jdk, libcglib-java, libcommons-dbcp-java, @@ -13,10 +13,11 @@ Build-Depends: ant, liblog4j1.2-java, liboscache-java, maven-repo-helper -Standards-Version: 3.9.8 -Homepage: http://ibatis.apache.org -Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/libibatis-java.git -Vcs-Git: https://anonscm.debian.org/git/pkg-java/libibatis-java.git +Standards-Version: 4.7.0 +Homepage: https://ibatis.apache.org +Rules-Requires-Root: no +Vcs-Browser: https://salsa.debian.org/java-team/libibatis-java +Vcs-Git: https://salsa.debian.org/java-team/libibatis-java.git Package: libibatis-java Architecture: all diff --git a/debian/gbp.conf b/debian/gbp.conf new file mode 100644 index 0000000..cec628c --- /dev/null +++ b/debian/gbp.conf @@ -0,0 +1,2 @@ +[DEFAULT] +pristine-tar = True diff --git a/debian/patches/01-jdbc-compatibility.patch b/debian/patches/01-jdbc-compatibility.patch index f229e52..345d7ad 100644 --- a/debian/patches/01-jdbc-compatibility.patch +++ b/debian/patches/01-jdbc-compatibility.patch @@ -3,7 +3,7 @@ Author: Emmanuel Bourg <ebourg@apache.org> Forwarded: not-needed --- a/src/com/ibatis/common/jdbc/SimpleDataSource.java +++ b/src/com/ibatis/common/jdbc/SimpleDataSource.java -@@ -257,6 +257,18 @@ +@@ -257,6 +257,18 @@ public class SimpleDataSource implements return DriverManager.getLogWriter();
}
@@ -24,7 +24,7 @@ Forwarded: not-needed * database to make sure the connection is still good.
--- a/src/com/ibatis/sqlmap/engine/type/CallableStatementResultSet.java +++ b/src/com/ibatis/sqlmap/engine/type/CallableStatementResultSet.java -@@ -595,4 +595,211 @@ +@@ -595,4 +595,211 @@ public class CallableStatementResultSet return cs.wasNull();
}
diff --git a/debian/rules b/debian/rules index a57a714..b0c08c6 100755 --- a/debian/rules +++ b/debian/rules @@ -8,6 +8,3 @@ override_dh_auto_build: override_dh_auto_clean: dh_auto_clean -- -f debian/build.xml - -get-orig-source: - uscan --download-current-version --force-download --no-symlink diff --git a/debian/watch b/debian/watch index 967248e..4df9764 100644 --- a/debian/watch +++ b/debian/watch @@ -1,3 +1,3 @@ -version=3 +version=4 opts=uversionmangle=s/-/./ \ -http://svn.apache.org/repos/asf/ibatis/java/ibatis-2/tags/ .*java_release_(2.*)/ debian debian/orig-tar.sh +https://svn.apache.org/repos/asf/ibatis/java/ibatis-2/tags/ .*java_release_(2.*)/ debian debian/orig-tar.sh |