[Git][debian/libpixels-java][debian/sid] 2 commits: Update Debian packaging to modern standards (10y since last upload!)

Martina Ferrari (@tina) gitlab at salsa.debian.org
Mon Jan 10 16:55:04 GMT 2022



Martina Ferrari pushed to branch debian/sid at Debian / libpixels-java


Commits:
edd9a2b2 by Martina Ferrari at 2022-01-10T16:51:55+00:00
Update Debian packaging to modern standards (10y since last upload!)

- - - - -
344f8f88 by Martina Ferrari at 2022-01-10T16:54:56+00:00
releasing package libpixels-java version 2.1.3+svn.42-3

- - - - -


10 changed files:

- debian/changelog
- − debian/compat
- debian/control
- debian/copyright
- + debian/gbp.conf
- + debian/jlibs
- − debian/repack.sh
- debian/rules
- debian/source/format
- − debian/watch


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,10 @@
+libpixels-java (2.1.3+svn.42-3) unstable; urgency=medium
+
+  * Reconstructed repository from last upload.
+  * Update Debian packaging to modern standards (10y since last upload!)
+
+ -- Martina Ferrari <tina at debian.org>  Mon, 10 Jan 2022 16:52:07 +0000
+
 libpixels-java (2.1.3+svn.42-2.1) unstable; urgency=medium
 
   * Non maintainer upload by the Reproducible Builds team.


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


=====================================
debian/control
=====================================
@@ -1,16 +1,27 @@
 Source: libpixels-java
+Maintainer: Martina Ferrari <tina at debian.org>
 Section: java
 Priority: optional
-Maintainer: Martina Ferrari <tina at debian.org>
-Build-Depends: debhelper (>> 5), javahelper (>= 0.40~)
-Build-Depends-Indep: default-jdk, ant
-Standards-Version: 3.9.3
+Build-Depends:
+ debhelper-compat (= 13),
+ dh-sequence-javahelper,
+ javahelper,
+Build-Depends-Indep:
+ ant,
+ default-jdk,
+Standards-Version: 4.6.0
+Vcs-Browser: https://salsa.debian.org/debian/libpixels-java
+Vcs-Git: https://salsa.debian.org/debian/libpixels-java.git
 Homepage: http://java.net/projects/pixels
-Vcs-Browser: http://canterville.mine.nu/wsvn/debian/trunk/libpixels-java
+Rules-Requires-Root: no
 
 Package: libpixels-java
 Architecture: all
-Depends: ${java:Depends}, ${misc:Depends}
+Depends:
+ ${java:Depends},
+ ${misc:Depends},
+Recommends:
+ ${java:Recommends},
 Description: manipulation and filtering of images in Java
  A large number of Java Image filters which are all standard Java
  BufferedImageOps and can be plugged directly into existing programs.


=====================================
debian/copyright
=====================================
@@ -1,18 +1,14 @@
-Format-Specification:
-    http://wiki.debian.org/Proposals/CopyrightFormat?action=recall&rev=196
-Upstream-Maintainer: Jerry Huxtable <jerry at jhlabs.com>
-Upstream-Source: http://java.net/projects/pixels
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Contact: Jerry Huxtable <jerry at jhlabs.com>
+Source: http://www.jhlabs.com/ip/filters/index.html
 Upstream-Name: pixels
 
-Please note that the current zipfile provided by upstream lacks source, so the
-code is currently fetched from svn, use `uscan --force-download' to obtain it.
-
 Files: *
 Copyright: © 2006 Jerry Huxtable <jerry at jhlabs.com>
 License: Apache-2.0
 
 Files: debian/*
-Copyright: © 2008-2012 Martina Ferrari <tina at debian.org>
+Copyright: © 2008-2022 Martina Ferrari <tina at debian.org>
 License: Apache-2.0
  Using the same license as upstream.
 


=====================================
debian/gbp.conf
=====================================
@@ -0,0 +1,4 @@
+[DEFAULT]
+debian-branch = debian/sid
+pristine-tar = False
+upstream-tree = SLOPPY


=====================================
debian/jlibs
=====================================
@@ -0,0 +1 @@
+pixels.jar


=====================================
debian/repack.sh deleted
=====================================
@@ -1,44 +0,0 @@
-#!/bin/sh
-# This script overwrites the (bogus) file downloaded by uscan. The upstream
-# author suggested currently to use only svn.
-# Should be called as "repack.sh --upstream-source <ver> <downloaded file>
-# (for example, via uscan)
-
-set -e
-set -u
-
-FILE=$3
-PKG=`dpkg-parsechangelog|grep ^Source:|sed 's/^Source: //'`
-VER=$2
-#VER=`dpkg-parsechangelog|grep ^Version:|sed 's/^Version: //; s/+dfsg-[^-]\+$//'`
-
-printf "\nRepackaging $FILE\n"
-
-DIR=`mktemp -d ./tmpRepackXXXXXX`
-trap "rm -rf $DIR" QUIT INT EXIT
-
-mkdir $DIR/$PKG-$VER
-#unzip $FILE -d $DIR/$PKG-$VER
-
-REPACK=${PKG}_$VER.orig.tar.gz
-
-UP_DIR=$PKG-$VER
-
-(
-    set -e
-    set -u
-
-    cd $DIR
-    REPACK_DIR="$PKG-$VER.orig"
-
-    svn export https://svn.java.net/svn/pixels~svn/trunk \
-	"$REPACK_DIR"
-    #mv $UP_DIR $REPACK_DIR
-    tar -c $REPACK_DIR | gzip -9 > $REPACK
-)
-
-#mv $DIR/$REPACK $FILE
-mv $DIR/$REPACK `dirname $FILE`
-rm $FILE
-
-echo "*** $FILE repackaged"


=====================================
debian/rules
=====================================
@@ -4,53 +4,8 @@
 #export DH_VERBOSE=1
 
 export JAVA_HOME=/usr/lib/jvm/default-java
-
 # Put depended upon jars in here
 # export CLASSPATH=
 
-build: build-arch-stamp build-indep-stamp
-build-arch: build-arch-stamp
-build-arch-stamp:
-	dh_testdir
-	touch $@
-
-build-indep: build-indep-stamp
-build-indep-stamp:
-	dh_testdir
-	jh_build
-	touch $@
-
-clean:
-	dh_testdir
-	dh_testroot
-	jh_clean
-	dh_clean build-stamp build-indep-stamp build-arch-stamp
-
-install-indep: build-indep
-	dh_testdir
-	dh_testroot
-	dh_clean -k
-	dh_installdirs
-
-binary-arch: build-arch
-
-binary-indep: build-indep install-indep
-	# Create the package here
-	dh_testdir
-	dh_testroot
-	dh_clean -k
-	dh_install -i
-	dh_installdocs -i
-	dh_installchangelogs -i
-	jh_installjavadoc -i
-	jh_installlibs -i pixels.jar
-	jh_depends -i
-	dh_compress -i
-	dh_fixperms -i
-	dh_installdeb -i
-	dh_gencontrol -i
-	dh_md5sums -i
-	dh_builddeb -i
-
-binary: binary-indep binary-arch
-.PHONY: build build-arch build-indep clean binary-indep binary-arch binary install-indep
+%:
+	dh $@ --with javahelper


=====================================
debian/source/format
=====================================
@@ -1 +1 @@
-1.0
+3.0 (quilt)


=====================================
debian/watch deleted
=====================================
@@ -1,6 +0,0 @@
-version=3
-# Dummy watch file as upstream doesn't provide version data.
-opts="uversionmangle=s/$/+svn/" \
-	http://java.net/projects/pixels/downloads \
-	.*/pixels-core-(\d.*?)(?:-SNAPSHOT)?-bin.zip \
-	debian debian/repack.sh



View it on GitLab: https://salsa.debian.org/debian/libpixels-java/-/compare/e520e7a3170da8afd067c3224371766027b26ca9...344f8f88722a6f534a285fece9080475e20189c3

-- 
View it on GitLab: https://salsa.debian.org/debian/libpixels-java/-/compare/e520e7a3170da8afd067c3224371766027b26ca9...344f8f88722a6f534a285fece9080475e20189c3
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/20220110/7be38b7b/attachment.htm>


More information about the pkg-java-commits mailing list