[Git][java-team/libjpf-java][master] 9 commits: [svn-upgrade] Integrating new upstream version, libjpf-java (1.5.1+dfsg)

Bas Couwenberg (@sebastic) gitlab at salsa.debian.org
Mon Dec 20 20:36:49 GMT 2021



Bas Couwenberg pushed to branch master at Debian Java Maintainers / libjpf-java


Commits:
cabbcd44 by gregor herrmann at 2009-09-02T20:30:33Z
[svn-upgrade] Integrating new upstream version, libjpf-java (1.5.1+dfsg)

- - - - -
53e9b9d6 by Holger Levsen at 2021-12-20T21:06:55+01:00
Import Debian changes 1.5.1+dfsg-4.1

libjpf-java (1.5.1+dfsg-4.1) unstable; urgency=medium
..
  * Non maintainer upload by the Reproducible Builds team.
  * No source change upload to rebuild on buildd with .buildinfo files.
..
libjpf-java (1.5.1+dfsg-4) unstable; urgency=low
..
  [ gregor herrmann ]
  * Update Vcs-* headers.
..
  [ tony mancill ]
  * Update Maintainer field for Java team maintenance.
  * Add gregor to Uploaders.
  * Set Standards-Version to 3.9.3 (no changes).
  * Drop unneeded dependency on JRE.
..
libjpf-java (1.5.1+dfsg-3) unstable; urgency=low
..
  [ Giovanni Mascellani ]
  * Added installation of POM files (closes: #611497).
..
libjpf-java (1.5.1+dfsg-2) unstable; urgency=low
..
  [ gregor herrmann ]
  * debian/control: change build dependency from default-jdk-builddep to
    default-jdk.
..
  [ tony mancill ]
  * Bump Standards-Version to 3.9.1: no changes.
  * Add ${misc:Depends} to debian/control.
  * Convert to source format 3.0 (quilt) and javahelper.
  * Add debian/libjpf-java.docs file to include upstream README.txt
  * debhelper dependency is now version 7.0.50 or later.
..
libjpf-java (1.5.1+dfsg-1) unstable; urgency=low
..
  * Initial release (closes: #519124).

- - - - -
482270d3 by gregor herrmann at 2021-12-20T21:09:45+01:00
Update debian/repack.stub.

- - - - -
88b7cafd by gregor herrmann at 2021-12-20T21:10:27+01:00
update changelog

Git-Dch: Ignore

- - - - -
23913e39 by gregor herrmann at 2021-12-20T21:10:36+01:00
Remove myself from Uploaders.

- - - - -
bdaddb9d by gregor herrmann at 2021-12-20T21:11:35+01:00
update changelog

Gbp-Dch: Ignore

- - - - -
86f45dc8 by Bas Couwenberg at 2021-12-20T21:12:33+01:00
Add gbp.conf to use pristine-tar & --source-only-changes by default.

- - - - -
62c4d918 by Bas Couwenberg at 2021-12-20T21:19:59+01:00
Update Vcs-* URLs for Salsa.

- - - - -
ce3a433c by Bas Couwenberg at 2021-12-20T21:35:44+01:00
Use Files-Excluded instead of repack.sh.

- - - - -


8 changed files:

- debian/changelog
- debian/control
- debian/copyright
- + debian/gbp.conf
- − debian/repack.local
- − debian/repack.stub
- debian/rules
- debian/watch


Changes:

=====================================
debian/changelog
=====================================
@@ -1,10 +1,22 @@
 libjpf-java (1.5.1+dfsg-5) UNRELEASED; urgency=medium
 
-  * Update debian/repack.stub.
+  [ gregor herrmann ]
   * Remove myself from Uploaders.
 
+  [ Bas Couwenberg ]
+  * Add gbp.conf to use pristine-tar & --source-only-changes by default.
+  * Update Vcs-* URLs for Salsa.
+  * Use Files-Excluded instead of repack.sh.
+
  -- gregor herrmann <gregoa at debian.org>  Sat, 23 Feb 2013 14:11:23 +0100
 
+libjpf-java (1.5.1+dfsg-4.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>  Sat, 02 Jan 2021 01:09:09 +0100
+
 libjpf-java (1.5.1+dfsg-4) unstable; urgency=low
 
   [ gregor herrmann ]


=====================================
debian/control
=====================================
@@ -13,8 +13,8 @@ Build-Depends-Indep: default-jdk,
                      libonemind-commons-java-java,
                      libonemind-commons-invoke-java
 Standards-Version: 3.9.3
-Vcs-Browser: http://git.debian.org/?p=pkg-java/libjpf-java.git
-Vcs-Git: git://git.debian.org/git/pkg-java/libjpf-java.git
+Vcs-Browser: https://salsa.debian.org/java-team/libjpf-java
+Vcs-Git: https://salsa.debian.org/java-team/libjpf-java.git
 Homepage: http://jpf.sourceforge.net/
 
 Package: libjpf-java


=====================================
debian/copyright
=====================================
@@ -4,6 +4,7 @@ Upstream-Contact: Dmitry Olshansky
 Source: http://jpf.sourceforge.net/
 Comment: The +dfsg version is created by removing the lib/ directory from
  the upstream zip file. This directory contains compiled code without source.
+Files-Excluded: lib/*
 
 Files: *
 Copyright: 2004-2007 Dmitry Olshansky


=====================================
debian/gbp.conf
=====================================
@@ -0,0 +1,19 @@
+[DEFAULT]
+
+# The default name for the upstream branch is "upstream".
+# Change it if the name is different (for instance, "master").
+upstream-branch = upstream
+
+# The default name for the Debian branch is "master".
+# Change it if the name is different (for instance, "debian/unstable").
+debian-branch = master
+
+# git-import-orig uses the following names for the upstream tags.
+# Change the value if you are not using git-import-orig
+upstream-tag = upstream/%(version)s
+
+# Always use pristine-tar.
+pristine-tar = True
+
+[buildpackage]
+pbuilder-options = --source-only-changes


=====================================
debian/repack.local deleted
=====================================
@@ -1 +0,0 @@
-rm lib


=====================================
debian/repack.stub deleted
=====================================
@@ -1,88 +0,0 @@
-#!/bin/sh
-
-: <<=cut
-=pod
-
-=head1 NAME
-
-repack.stub - script to repack upstream tarballs from uscan
-
-=head1 INSTRUCTIONS
-
-put this in debian/repack.stub and add "debian sh debian/repack.stub" to
-the end of the line in debian/watch. you will also need to add a version
-mangle to debian/watch.
-
-then create a debian/repack.local. this is a shell script that is
-sourced under "set -e", so be careful to check returns codes.
-
-=head1 FUNCTIONS
-
-=over 4
-
-=item rm
-
-rm is replaced by a function that does some magic ("rm -rv" by default), but also changes MANIFEST if $MANIFEST is 1
-
-=item mv
-
-mv is replaced by a function that just does mv (by default), but also changes MANIFEST if $MANIFEST is 1
-
-=item requires_version
-
-requires_version is there for future usage for requiring certain versions of the script
-
-=back
-
-=head1 VARIABLES
-
-=over 4
-
-=item SUFFIX
-
-defaults to +dfsg
-
-what to append to the upstream version
-
-=item RM_OPTS
-
-defaults to -vrf
-
-options to pass to rm
-
-=item MANIFEST
-
-defaults to 0, set to 1 to turn on.
-
-this will manipulate MANIFEST files in CPAN tarballs.
-
-=item UP_BASE
-
-this is the directory where the upstream source is.
-
-=back
-
-=head1 COPYRIGHT AND LICENSE
-
-Copyright 2009, Ryan Niebur <ryan at debian.org>
-
-License: Artistic or GPL-1+
-
-=cut
-
-if [ -z "$REPACK_SH" ]; then
-    if [ -f ../../scripts/repack.sh ]; then
-        REPACK_SH=../../scripts/repack.sh
-    fi
-    if [ -z "$REPACK_SH" ] && which repack.sh > /dev/null; then
-        REPACK_SH=$(which repack.sh)
-    fi
-fi
-
-if [ ! -f "$REPACK_SH" ]; then
-    echo "Couldn't find a repack.sh. please put it in your PATH, put it at ../../scripts/repack.sh, or put it somewhere else and set the REPACK_SH variable"
-    echo "You can get it from http://anonscm.debian.org/gitweb/?p=pkg-perl/scripts.git;a=blob_plain;f=repack.sh;hb=HEAD"
-    exit 1
-fi
-
-exec "$REPACK_SH" "$@"


=====================================
debian/rules
=====================================
@@ -6,9 +6,6 @@ export CLASSPATH=/usr/share/java/commons-logging.jar:/usr/share/java/jxp.jar:/us
 %:
 	dh $@ --with javahelper
 
-get-orig-source:
-	uscan --repack --verbose --force --rename
-
 clean:
 	dh clean --with javahelper
 	mh_clean


=====================================
debian/watch
=====================================
@@ -1,3 +1,6 @@
-version=3
-opts="dversionmangle=s/\+dfsg//" \
-	http://sf.net/jpf/jpf-src-([\d.]+)\.zip debian sh debian/repack.stub
+version=4
+opts=\
+dversionmangle=s/\+(debian|dfsg|ds|deb)\d*$//,\
+uversionmangle=s/(\d)[_\.\-\+]?((RC|rc|pre|dev|beta|alpha)\d*)$/$1~$2/;s/RC/rc/,\
+repacksuffix=+dfsg \
+http://sf.net/jpf/jpf-src-([\d.]+)\.zip



View it on GitLab: https://salsa.debian.org/java-team/libjpf-java/-/compare/2800bb0d537f99cd8e09d7979527d52ec54f382c...ce3a433c8fa66f6ba5e72d23bddacee551d88d34

-- 
View it on GitLab: https://salsa.debian.org/java-team/libjpf-java/-/compare/2800bb0d537f99cd8e09d7979527d52ec54f382c...ce3a433c8fa66f6ba5e72d23bddacee551d88d34
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/20211220/b31e4232/attachment.htm>


More information about the pkg-java-commits mailing list