[Git][java-team/sunflow][master] 13 commits: Switch to compat level 11.

Markus Koschany gitlab at salsa.debian.org
Tue Jul 3 16:27:54 BST 2018 

Markus Koschany pushed to branch master at Debian Java Maintainers / sunflow


Commits:
fbae52b5 by Markus Koschany at 2018-07-03T16:55:13+02:00
Switch to compat level 11.

- - - - -
1bb4489b by Markus Koschany at 2018-07-03T16:55:24+02:00
wrap-and-sort -sa.

- - - - -
3682872a by Markus Koschany at 2018-07-03T16:55:38+02:00
Declare compliance with Debian Policy 4.1.4.

- - - - -
29add77a by Markus Koschany at 2018-07-03T16:56:12+02:00
Use canonical VCS address.

- - - - -
3f571892 by Markus Koschany at 2018-07-03T16:57:03+02:00
sunflow: Depend on alternative java8-runtime as well.

- - - - -
35e2bfd7 by Markus Koschany at 2018-07-03T16:59:02+02:00
Drop B-D on libmagickcore-6.q16-2-extra.

- - - - -
6a6f465d by Markus Koschany at 2018-07-03T16:59:23+02:00
Use https for Format field.

- - - - -
426fabc7 by Markus Koschany at 2018-07-03T17:01:22+02:00
sunflow.desktop: Add a comment in German.

- - - - -
da606f84 by Markus Koschany at 2018-07-03T17:02:15+02:00
Update changelog

- - - - -
a714f09c by Markus Koschany at 2018-07-03T17:11:17+02:00
Don't convert svg icon into xpm or png format. Install the svg icon

into hicolor icon directory and use that as our preferred desktop icon.

Closes: #897533

- - - - -
2cb00434 by Markus Koschany at 2018-07-03T17:17:01+02:00
Revert switch to compat 11 because of buggy cdbs.

- - - - -
b41aa0b5 by Markus Koschany at 2018-07-03T17:20:39+02:00
Use priority optional.

- - - - -
25aa7450 by Markus Koschany at 2018-07-03T17:24:02+02:00
Remove trailing whitespace

- - - - -


5 changed files:

- debian/changelog
- debian/control
- debian/copyright
- debian/rules
- debian/sunflow.desktop


Changes:

=====================================
debian/changelog
=====================================
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,20 @@
+sunflow (0.07.2.svn396+dfsg-17) unstable; urgency=medium
+
+  * Team upload.
+  * debian/control: Use priority optional.
+  * wrap-and-sort -sa.
+  * Declare compliance with Debian Policy 4.1.4.
+  * Use canonical VCS address.
+  * sunflow: Depend on alternative java8-runtime as well.
+  * Drop B-D on libmagickcore-6.q16-2-extra.
+  * Use https for Format field.
+  * sunflow.desktop: Add a comment in German.
+  * Don't convert svg icon into xpm or png format. Install the svg icon
+    into hicolor icon directory and use that as our preferred desktop icon.
+    (Closes: #897533)
+
+ -- Markus Koschany <apo at debian.org>  Tue, 03 Jul 2018 17:01:58 +0200
+
 sunflow (0.07.2.svn396+dfsg-16) unstable; urgency=medium
 
   * Upload to unstable.
@@ -132,7 +149,7 @@ sunflow (0.07.2.svn396+dfsg-1) unstable; urgency=low
     - janino.jar removed from upstream tarball
   * d/compat to 7
   * d/copyright in DEP-5 format
-  * d/control: 
+  * d/control:
     - Section: from graphics to java
     - Depends: J(DK|RE)s replaced with default-j(dk|re)
     - Standards-Version: from 3.8.0 to 3.8.4


=====================================
debian/control
=====================================
--- a/debian/control
+++ b/debian/control
@@ -1,20 +1,32 @@
 Source: sunflow
 Section: graphics
-Priority: extra
+Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-Uploaders: tony mancill <tmancill at debian.org>
-Build-Depends: cdbs (>= 0.4.90~), debhelper (>= 10), ant, imagemagick,
- default-jdk, libmagickcore-6.q16-2-extra, python (>= 2.6.6-3~), dh-python
-Build-Depends-Indep: janino
-Standards-Version: 4.0.0
+Uploaders:
+ tony mancill <tmancill at debian.org>
+Build-Depends:
+ ant,
+ cdbs (>= 0.4.90~),
+ debhelper (>= 10),
+ default-jdk,
+ dh-python,
+ python (>= 2.6.6-3~)
+Build-Depends-Indep:
+ janino
+Standards-Version: 4.1.4
 Homepage: http://sunflow.sourceforge.net/
-Vcs-Git: git://anonscm.debian.org/pkg-java/sunflow.git
-Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-java/sunflow.git
+Vcs-Git: https://salsa.debian.org/java-team/sunflow.git
+Vcs-Browser: https://salsa.debian.org/java-team/sunflow
 
 Package: sunflow
 Architecture: all
-Depends: default-jre, libsunflow-java, ${python:Depends}, ${misc:Depends}
-Replaces: libsunflow-java (= 0.07.2.svn396+dfsg-2)
+Depends:
+ default-jre | java8-runtime,
+ libsunflow-java,
+ ${misc:Depends},
+ ${python:Depends}
+Replaces:
+ libsunflow-java (= 0.07.2.svn396+dfsg-2)
 Description: rendering system for photo-realistic image synthesis (GUI)
  Sunflow is an open source rendering system for photo-realistic image
  synthesis. It is written in Java and built around a flexible ray
@@ -27,8 +39,11 @@ Description: rendering system for photo-realistic image synthesis (GUI)
 Package: libsunflow-java
 Architecture: all
 Section: java
-Depends: janino, ${misc:Depends}
-Replaces: sunflow (<= 0.07.2.svn396+dfsg-2)
+Depends:
+ janino,
+ ${misc:Depends}
+Replaces:
+ sunflow (<= 0.07.2.svn396+dfsg-2)
 Description: rendering system for photo-realistic image synthesis
  Sunflow is an open source rendering system for photo-realistic image
  synthesis. It is written in Java and built around a flexible ray
@@ -39,8 +54,11 @@ Description: rendering system for photo-realistic image synthesis
 Package: libsunflow-java-doc
 Architecture: all
 Section: doc
-Depends: ${misc:Depends}
-Suggests: libsunflow-java, sunflow
+Depends:
+ ${misc:Depends}
+Suggests:
+ libsunflow-java,
+ sunflow
 Description: rendering system for photo-realistic image synthesis (javadoc)
  Sunflow is an open source rendering system for photo-realistic image
  synthesis. It is written in Java and built around a flexible ray


=====================================
debian/copyright
=====================================
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,4 +1,4 @@
-Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: Sunflow - rendering system for photo-realistic image synthesis
 Upstream-Contact: Christopher Kulla <ckulla at gmail.com>
 Source: http://sunflow.sourceforge.net/


=====================================
debian/rules
=====================================
--- a/debian/rules
+++ b/debian/rules
@@ -52,13 +52,9 @@ install/sunflow::
 	install -d debian/sunflow/usr/share/applications
 	install -m 644 debian/sunflow.desktop \
 		debian/sunflow/usr/share/applications
-	install -d debian/sunflow/usr/share/pixmaps
+	install -d debian/sunflow/usr/share/icons/hicolor/scalable/apps
 	install -m 644 debian/sunflow.svg \
-		debian/sunflow/usr/share/pixmaps
-	install -m 644 debian/sunflow.png \
-		debian/sunflow/usr/share/pixmaps
-	install -m 644 debian/sunflow.xpm \
-		debian/sunflow/usr/share/pixmaps
+		debian/sunflow/usr/share/icons/hicolor/scalable/apps
 
 	# Not using python-distutils.mk, calling manually
 	dh_python2 /usr/share/blender/scripts/sunflow
@@ -73,13 +69,8 @@ build/sunflow::
 		--release=$(UPSTREAM_VERSION) \
 		debian/sunflow.pod -o debian/sunflow.1
 
-	# Render icons
-	convert -background "rgba(255,255,255,0)" -geometry 48x48 debian/sunflow.svg +set date:create +set date:modify -define png:exclude-chunk=time debian/sunflow.png
-	convert -background "rgba(255,255,255,0)" -geometry 32x32 debian/sunflow.svg debian/sunflow.xpm
-
 clean::
 	rm -f debian/sunflow.1
-	rm -f debian/sunflow.png debian/sunflow.xpm
 
 get-orig-source:
 	mkdir $(TMPDIR)


=====================================
debian/sunflow.desktop
=====================================
--- a/debian/sunflow.desktop
+++ b/debian/sunflow.desktop
@@ -2,7 +2,8 @@
 Type=Application
 Name=Sunflow
 Comment=Photorealistic Rendering Engine
+Comment[de]=Photorealistische Render-Engine
 Exec=sunflow
-Icon=sunflow.png
+Icon=sunflow
 Categories=Graphics;3DGraphics
 Keywords=rendering,photo,realistic,image,synthesis,illumination,shading



View it on GitLab: https://salsa.debian.org/java-team/sunflow/compare/a9640e11116badb2a5fc0daa8754da2eaf8e1f8d...25aa7450a3c5a1fa1e3d18a94936be8fcd5c9730

-- 
View it on GitLab: https://salsa.debian.org/java-team/sunflow/compare/a9640e11116badb2a5fc0daa8754da2eaf8e1f8d...25aa7450a3c5a1fa1e3d18a94936be8fcd5c9730
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/20180703/9f55f724/attachment.html>

More information about the pkg-java-commits mailing list