[Git][java-team/ognl][master] 7 commits: Use debhelper-compat 13

Tony Mancill (@tmancill) gitlab at salsa.debian.org
Tue Jan 30 06:46:16 GMT 2024



Tony Mancill pushed to branch master at Debian Java Maintainers / ognl


Commits:
2991d886 by tony mancill at 2024-01-29T22:19:18-08:00
Use debhelper-compat 13

- - - - -
c8665400 by tony mancill at 2024-01-29T22:20:01-08:00
Set Rules-Requires-Root: no in debian/control

- - - - -
33cecfe3 by tony mancill at 2024-01-29T22:24:30-08:00
Combine Build-Depends-Indep into Build-Depends

- - - - -
e0ca5908 by tony mancill at 2024-01-29T22:26:18-08:00
Update Vcs fields to point to Salsa

- - - - -
3a6cb6af by tony mancill at 2024-01-29T22:27:04-08:00
Bump Standards-Version to 4.6.2

- - - - -
313065e5 by tony mancill at 2024-01-29T22:38:29-08:00
d/copyright formatting

- - - - -
a6f8e09f by tony mancill at 2024-01-29T22:38:29-08:00
Prepare changelog for upload

- - - - -


4 changed files:

- debian/changelog
- − debian/compat
- debian/control
- debian/copyright


Changes:

=====================================
debian/changelog
=====================================
@@ -1,11 +1,21 @@
-ognl (2.7.3-8) UNRELEASED; urgency=medium
+ognl (2.7.3-8) unstable; urgency=medium
 
+  * Team upload
+
+  [ Vladimir Petko ]
   * d/p/01_build_xml.diff: javacc calls System.exit() and it is no
     longer intercepted due to SecurityManager changes in Java 21.
     Rollback changes to build.xml so that javacc command is forked and
-    does not abort the ant process (Closes:  #1057528).
+    does not abort the ant process (Closes: #1057528).
+
+  [ tony mancill ]
+  * Use debhelper-compat 13
+  * Set Rules-Requires-Root: no in debian/control
+  * Combine Build-Depends-Indep into Build-Depends
+  * Update Vcs fields to point to Salsa
+  * Bump Standards-Version to 4.6.2
 
- -- Vladimir Petko <vladimir.petko at canonical.com>  Tue, 30 Jan 2024 12:23:31 +1300
+ -- tony mancill <tmancill at debian.org>  Mon, 29 Jan 2024 22:27:10 -0800
 
 ognl (2.7.3-7) unstable; urgency=medium
 


=====================================
debian/compat deleted
=====================================
@@ -1 +0,0 @@
-11


=====================================
debian/control
=====================================
@@ -3,20 +3,23 @@ Section: java
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Damien Raude-Morvan <drazzib at debian.org>
-Build-Depends: ant, debhelper (>= 11), default-jdk
-Build-Depends-Indep: ant-contrib,
-                     ant-optional,
-                     docbook-xml,
-                     docbook-xsl,
-                     javacc,
-                     junit4,
-                     libjavassist-java,
-                     libxalan2-java,
-                     maven-repo-helper
-Standards-Version: 4.1.4
-Vcs-Git: https://anonscm.debian.org/git/pkg-java/ognl.git
-Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/ognl.git
-Homepage: http://commons.apache.org/ognl/
+Build-Depends: ant,
+               ant-contrib,
+               ant-optional,
+               debhelper-compat (= 13),
+               default-jdk,
+               docbook-xml,
+               docbook-xsl,
+               javacc,
+               junit4,
+               libjavassist-java,
+               libxalan2-java,
+               maven-repo-helper,
+Standards-Version: 4.6.2
+Vcs-Git: https://salsa.debian.org/java-team/ognl.git
+Vcs-Browser: https://salsa.debian.org/java-team/ognl
+Homepage: https://commons.apache.org/ognl/
+Rules-Requires-Root: no
 
 Package: libognl-java
 Architecture: all


=====================================
debian/copyright
=====================================
@@ -5,40 +5,40 @@ Source: http://svn.opensymphony.com/svn/ognl/
 Copyright: 2001-2004, The OpenSymphony Group
 License: other
   The OpenSymphony Software License, Version 1.1
-
+  .
   (this license is derived and fully compatible with the Apache Software
   License - see http://www.apache.org/LICENSE.txt)
-
+  .
   Copyright (c) 2001-2004 The OpenSymphony Group. All rights reserved.
-
+  .
   Redistribution and use in source and binary forms, with or without
   modification, are permitted provided that the following conditions
   are met:
-
+  .
   1. Redistributions of source code must retain the above copyright
      notice, this list of conditions and the following disclaimer.
-
+  .
   2. Redistributions in binary form must reproduce the above copyright
      notice, this list of conditions and the following disclaimer in
      the documentation and/or other materials provided with the
      distribution.
-
+  .
   3. The end-user documentation included with the redistribution,
      if any, must include the following acknowledgment:
         "This product includes software developed by the
          OpenSymphony Group (http://www.opensymphony.com/)."
      Alternately, this acknowledgment may appear in the software itself,
      if and wherever such third-party acknowledgments normally appear.
-
+  .
   4. The names "OpenSymphony" and "The OpenSymphony Group"
      must not be used to endorse or promote products derived from this
      software without prior written permission. For written
      permission, please contact license at opensymphony.com .
-
+  .
   5. Products derived from this software may not be called "OpenSymphony"
      or "OGNL", nor may "OpenSymphony" or "OGNL" appear in their
      name, without prior written permission of the OpenSymphony Group.
-
+  .
   THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
   WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
   OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
@@ -59,11 +59,11 @@ Copyright: 1998-2004, Drew Davidson <drew at ognl.org>
 Licence: BSD
   Copyright (c) 1998-2004, Drew Davidson and Luke Blanshard
     All rights reserved.
-
+  .
   Redistribution and use in source and binary forms, with or without
     modification, are permitted provided that the following conditions are
     met:
-
+  .
   Redistributions of source code must retain the above copyright notice,
     this list of conditions and the following disclaimer.
   Redistributions in binary form must reproduce the above copyright
@@ -72,7 +72,7 @@ Licence: BSD
   Neither the name of the Drew Davidson nor the names of its contributors
     may be used to endorse or promote products derived from this software
     without specific prior written permission.
-
+  .
   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
     "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
     LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS



View it on GitLab: https://salsa.debian.org/java-team/ognl/-/compare/7d19d519819d6abb89488ba0fb0f4b5c433fb3ca...a6f8e09f53b0afdf75770841b9570454330a8656

-- 
View it on GitLab: https://salsa.debian.org/java-team/ognl/-/compare/7d19d519819d6abb89488ba0fb0f4b5c433fb3ca...a6f8e09f53b0afdf75770841b9570454330a8656
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/20240130/8775e6a1/attachment.htm>


More information about the pkg-java-commits mailing list