--- Begin Message ---
Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock
Please unblock package arduino
After the release of the arduino version 2:1.8.13+dfsg1-1 Andreas
Beckmann reported an issue about a broken linkage from a specific
library the arduino package sometime needs.
This issue wasn't visible before as probably nobody used one ore more
functions from the Arduino IDE which would be require the availability
of the file bcprov.jar.
[ Reason ]
The main reason for the -2 version is a fix up of a wrong linking of
the required Java library /usr/share/java/bcprov.jar.
This was reported in #985506. To prevent similar bug reports it would be
nice if 2:1.8.13+dfsg1-2 could be accepted for migration into bullseye.
There are some adjustments made which are only have effect inside the
debian/ folder and mostly kind of documentation.
Update of README.Debian about how the Arduino reference can be made
available due manual action by the user.
Update of README.source to reflect the currect package workflow with
git-buildpackage.
Small typo fix in the changelog file.
Re-add the option 'pgpsigurlmangle' within the watch file.
Adding Rules-Requires-Root: no to the control file.
[ Impact ]
There is no impact except the Arduino IDE is now able to use functions
from the Java library bcprov.jar as the linking is now pointing to the
correct file.
[ Tests ]
Unfortunately the arduino package has no autopkgtests right now as the
setup of such tests is currently to complex and time consuming.
So the functionality of the IDE is tested manually after package build.
Build of various sketch files and upload of these to the classical
Arduino Uno and to a newer model Arduino Nano.
Testing of the internal update function for used libraries.
Testing of various menu function to ensure they are working the same way
as on a local installed upstream Arduino package.
[ Risks ]
I see no risk as the change on the user side is really small and fixing
a potential issue.
[ Checklist ]
[x] all changes are documented in the d/changelog
[x] I reviewed all changes and I approve them
[x] attach debdiff against the package in testing
Regards
Carsten
diff -Nru arduino-1.8.13+dfsg1/debian/arduino.links arduino-1.8.13+dfsg1/debian/arduino.links
--- arduino-1.8.13+dfsg1/debian/arduino.links 2021-01-08 12:42:36.000000000 +0100
+++ arduino-1.8.13+dfsg1/debian/arduino.links 2021-03-20 16:47:01.000000000 +0100
@@ -22,7 +22,7 @@
# From libbcpg-java (upstream is using bcpg-jdk15on)
usr/share/java/bcpg.jar usr/share/arduino/lib/bcpg.jar
# From libbcprov-java (upstream is using bcprov-jdk15on)
-bcprov-jdk15on-152.jar usr/share/arduino/lib/bcprov.jar
+usr/share/java/bcprov.jar usr/share/arduino/lib/bcprov.jar
# From libcommons-codec-java
usr/share/java/commons-codec.jar usr/share/arduino/lib/commons-codec.jar
# From libcommons-compress-java
diff -Nru arduino-1.8.13+dfsg1/debian/arduino.lintian-overrides arduino-1.8.13+dfsg1/debian/arduino.lintian-overrides
--- arduino-1.8.13+dfsg1/debian/arduino.lintian-overrides 2021-01-08 10:21:40.000000000 +0100
+++ arduino-1.8.13+dfsg1/debian/arduino.lintian-overrides 2021-03-20 16:47:01.000000000 +0100
@@ -4,3 +4,5 @@
arduino: package-contains-documentation-outside-usr-share-doc usr/share/arduino/tools/howto.txt
# We've rebuild one PDF file, not worth a doc base registration.
arduino: possible-documentation-but-no-doc-base-registration
+# That's intented that way by upstream.
+arduino: duplicate-files usr/share/doc/arduino/examples/* *
diff -Nru arduino-1.8.13+dfsg1/debian/arduino.README.Debian arduino-1.8.13+dfsg1/debian/arduino.README.Debian
--- arduino-1.8.13+dfsg1/debian/arduino.README.Debian 2021-01-08 10:21:40.000000000 +0100
+++ arduino-1.8.13+dfsg1/debian/arduino.README.Debian 2021-03-20 16:47:01.000000000 +0100
@@ -12,9 +12,6 @@
--Scott Howard <showard@debian.org>, Dec 12, 2011
-
-
-
Note for non-reparenting window manager users
---------------------------------------------
@@ -32,3 +29,43 @@
You can automate these tasks by writing them to your ~/.xsessionrc:
$ echo export _JAVA_AWT_WM_NONREPARENTING=true >> ~/.xsessionrc
+
+
+Make the Arduino reference locally available
+--------------------------------------------
+
+The Arduino Language reference isn't currently packaged within the arduino
+package, thus you will see a error message if you try open it from the menu
+Help -> Reference.
+The HTML files of the reference using a lot of references and resources to other
+sides (like fonts, CSS or Javascript) on the internet these are all privacy
+breaches from a POV of Debian.
+
+In order to make the Arduino Language reference callable from the IDE you can
+do the following steps that will download an archived version of the reference,
+extract the content and move that in place. You will need to have root access
+or sudo rights for the move of the extracted content!
+
+1. Download the archived content of the reference.
+
+ wget -P ~/Downloads https://downloads.arduino.cc/reference-1.6.6-3.zip
+
+2. Extract the content.
+
+ unzip ~/Downloads/reference-1.6.6-3.zip -d /tmp/reference
+
+3. Move the extracted reference.
+
+ # become root
+ mv -f /tmp/reference/* /usr/share/arduino/reference
+ # or if you are in the sudo group
+ sudo mv /tmp/reference/* /usr/share/arduino/reference
+ # remove used folder where content was extracted to (not fully needed)
+ rmdir /tmp/reference
+
+Please note that the content of the archive is missing some parts like used web
+fonts and thus the website is looking not fully equal to the upstream version.
+You will always find the current version of the reference online on
+
+ https://www.arduino.cc/reference/en
+
diff -Nru arduino-1.8.13+dfsg1/debian/changelog arduino-1.8.13+dfsg1/debian/changelog
--- arduino-1.8.13+dfsg1/debian/changelog 2021-01-26 19:13:48.000000000 +0100
+++ arduino-1.8.13+dfsg1/debian/changelog 2021-03-20 16:47:01.000000000 +0100
@@ -1,3 +1,23 @@
+arduino (2:1.8.13+dfsg1-2) unstable; urgency=medium
+
+ * Team upload
+ * [e1dccaf] d/u/metadata: Adding DEP12 based metadata
+ * [5ca53c5] d/README.source: Rework information and suggestions
+ * [990e2d7] README.Debian: Adding notes regarding IDE language reference
+ We don't package the Arduino language reference currently, but having
+ (offline) access to it might be desirable by users.
+ Adding some steps how the reference could be made available within the
+ IDE.
+ * [81e8635] d/control: Adding entry for Rules-Requires-Root: no
+ * [3f07192] d/watch: re-add the pgpsigurlmangle option
+ * [e1f08c2] d/arduino.lintian-overrides: ignore duplicated pics
+ Ignore potential duplicated png files within the documentation, they are
+ very small.
+ * [5e9abef] d/arduino.links: Correct linking to bcprov.jar
+ (Closes: #985506)
+
+ -- Carsten Schoenert <c.schoenert@t-online.de> Sat, 20 Mar 2021 16:47:01 +0100
+
arduino (2:1.8.13+dfsg1-1) unstable; urgency=medium
* Team upload
@@ -262,7 +282,7 @@
* New upstream release
- No wifishield firmware inluded in Debian: pre-compiled avr32 binaries
- with no sane build system. For source code and binaries, see the
+ with no sane build system. For source code and binaries, see the
wifishield repo on github
* refreshed patches:
- debian/patches/SimpleDateFormat_fix.diff deleted, applied upstream
@@ -498,7 +518,7 @@
This allows arduino to start when using a sun-java jre. See Debian
bug 382686.
- -- Scott Howard <showard314@gmail.com> Sat, 30 Oct 2010 11:26:53 -0400
+ -- Scott Howard <showard314@gmail.com> Sat, 30 Oct 2010 11:26:53 -0400
arduino (0021+dfsg-2) experimental; urgency=low
diff -Nru arduino-1.8.13+dfsg1/debian/control arduino-1.8.13+dfsg1/debian/control
--- arduino-1.8.13+dfsg1/debian/control 2021-01-26 19:11:43.000000000 +0100
+++ arduino-1.8.13+dfsg1/debian/control 2021-03-20 16:47:01.000000000 +0100
@@ -44,6 +44,7 @@
Homepage: https://www.arduino.cc
Vcs-Browser: https://salsa.debian.org/electronics-team/arduino/arduino
Vcs-Git: https://salsa.debian.org/electronics-team/arduino/arduino.git
+Rules-Requires-Root: no
Package: arduino
Architecture: any-amd64 any-i386 arm64 armel armhf
diff -Nru arduino-1.8.13+dfsg1/debian/README.source arduino-1.8.13+dfsg1/debian/README.source
--- arduino-1.8.13+dfsg1/debian/README.source 2021-01-08 12:42:36.000000000 +0100
+++ arduino-1.8.13+dfsg1/debian/README.source 2021-03-20 16:37:20.000000000 +0100
@@ -1,72 +1,72 @@
+Organization of maintenance for src:arduino
+-------------------------------------------
-For my co-maintainers and my future self.
+This package is maintained with git-buildpackage(1).
+It uses pristine-tar(1) to store enough information in git to generate bit
+identical tarballs when building the package without having downloaded an
+upstream tarball first.
+
+When working with patches it is recommended to use "gbp pq import" to
+import the patches, modify the source and then use "gbp pq export
+--commit" to commit the modifications.
+
+The changelog is generated using "gbp dch" so if you submit any changes
+don't bother to add changelog entries but rather provide a nice git commit
+message that can then end up in the changelog.
+
+It is recommended to build the package with pbuilder using:
+
+ gbp builpackage --git-pbuilder
+
+For information on how to set up a pbuilder environment see the
+git-pbuilder(1) manpage. In short:
+
+ DIST=sid git-pbuilder create
+ gbp clone https://salsa.debian.org/electronics-team/arduino/arduino.git
+ cd arduino
+ gbp buildpackage --git-pbuilder
+
+
+Importing a new upstream version
+--------------------------------
+
+To minimize workload and decrease possible mistakes the preferred way to
+import a new version is doing this by git-buildpackage and let d/gbp.conf
+control the whole import process. Importing a new version is done by
+
+ gbp import orig --sign-tags [--verbose] /path/to/arduino-$version.tar.xz
+
+In case you need to modify the list of files or folders to exclude you can
+tune this by modifying the section [import-orig] in d/gbp.conf. Don't forget
+to also adjust d/copyright afterwards in case adjustments are needed.
+
+Once the new version is imported you will need to check the patch queue is
+applying or needs also adjustments. Also here git-buildpackage is helping
+with this task.
+
+ gbp pq import [--time-machine=x]
+
+In case the upstream changes are small git will discover the changes and will
+apply the patch from the queue. Depending on the upstream changes you will
+need to use the option '--time-machine=' so git-buildpackage will apply the
+patch queue to an older version from there you can use the rebase option.
+In case '--time-machine=' was needed to get used you need to rebase the
+patch-queue branch against the version in your packaging branch which is
+mostly debian/sid (or debian/experimental).
+
+ git rebase debian/sid
+
+As usual you need to fix any rebasing issue if pop up. Once finished you
+can export back the patch queue.
+
+ gbp pq export
+
+This will switch back to your working packaging branch and also creates all
+files and folder under debian/patches/. Review the changes and commit your
+work, please explain in the commit message what's new or what did change in
+the patch queue. This will help later preparing the d/changelog entry!
-With
- uscan
-you can get upstream tarball.
-Or when up-to-date with upstream
- uscan --force-download # short is uscan -dd
-
-DFSG it.
-Remove all jar files from tarball that upstream provides.
- * uncompress and untar
- * some check on *.jar being a "JAR"
- * find Arduino-X.Y.Z -name \*.jar -delete
- * mv Arduino-X.Y.Z/ arduino-X.Y.Z+dfsg/
- * tar cf arduino_X.Y.Z+dfsg.orig.tar arduino-X.Y.Z+dfsg/
- * xz arduino_X.Y.Z+dfsg.orig.tar
-
-Then "git stuff"
- git checkout upstream
- rm -r *
- rm -rf .settings/
- tar xf ../arduino-X.Y.Z+dfsg.orig.tar.xz --strip-components=1
- git add .
- git commit -m "Imported Upstream version X.Y.Z+dfsg"
- git tag
- git tag upstream/X.Y.Z+dfsg
- git push https://${LOGNAME}@salsa.debian.org/electronics-team/arduino/arduino.git
- git push --tag https://${LOGNAME}@salsa.debian.org/electronics-team/arduino/arduino.git
- git checkout pristine-tar
- pristine-tar commit ../arduino-X.Y.Z+dfsg.orig.tar.xz upstream/X.Y.Z+dfsg
- git push https://${LOGNAME}@salsa.debian.org/electronics-team/arduino/arduino.git
- git checkout master
-
-Import by
- debian/script/import ../arduino*VERSION*tar*z
-
-
-Now the real thing
-
-The upstream arduino assumes there is Internet connection during build.
-That would be a moving target for source code inspection.
-Most files in debian/patches/ cope with preventing Internet access at build.
-
-
-We have / had in May 2017 three branches in use:
- * master
- * upstream
- * pristine-tar
-They were updated by hand.
-Tooling like "git-buildpackage" might work here.
-Currently, May 2017, not verified. TODO: can gbp be used?
-
-
- git push https://${LOGNAME}@salsa.debian.org/electronics-team/arduino/arduino.git
- git push --tags https://${LOGNAME}@salsa.debian.org/electronics-team/arduino/arduino.git
-
-
-Please keep this file in shape
-
-TODO
-----
-This was in debian/rules
-# override_dh_installdocs:
-# dh_installdocs
- #Delete links to fetch web based icon (privacy violation, thanks lintian)
- ## sed -i '/favicon\.png/d' debian/arduino-core/usr/share/doc/arduino-core/reference/*.html
-now here as a reminder for checking favicon.png as tracking pixel in the documentation
Using of Debian packaged Java libraries, linking to packaged libraries
----------------------------------------------------------------------
diff -Nru arduino-1.8.13+dfsg1/debian/upstream/metadata arduino-1.8.13+dfsg1/debian/upstream/metadata
--- arduino-1.8.13+dfsg1/debian/upstream/metadata 1970-01-01 01:00:00.000000000 +0100
+++ arduino-1.8.13+dfsg1/debian/upstream/metadata 2021-03-20 15:42:41.000000000 +0100
@@ -0,0 +1,3 @@
+Repository-Browse: https://github.com/arduino/Arduino
+Bug-Submit: https://github.com/arduino/Arduino/issues
+Other-References: https://www.arduino.cc
diff -Nru arduino-1.8.13+dfsg1/debian/watch arduino-1.8.13+dfsg1/debian/watch
--- arduino-1.8.13+dfsg1/debian/watch 2021-01-08 12:42:36.000000000 +0100
+++ arduino-1.8.13+dfsg1/debian/watch 2021-03-20 16:47:01.000000000 +0100
@@ -5,6 +5,7 @@
uversionmangle=s/-(beta|rc|dev)/~$1/; \
s/\.-(beta|rc|dev)\.\d.*//; \
s/\.\.//,\
+ pgpsigurlmangle=s%$%.asc%,\
dversionmangle=s/\+dfsg(\.?\d+)?$//" \
https://github.com/arduino/Arduino \
refs/tags/(\d+\.\d+\.\d+(?:\.?beta[1-9])?)
unblock arduino/2:1.8.13+dfsg1-2
--- End Message ---