--- Begin Message ---
Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256
Please unblock package lazarus
In order to fix bug 777622, I prepared a repacked tar ball and the attached
changes to the packaging of Lazarus. I completely stripped the
lcl/interfaces/carbon directory from the tar ball, which could be done
safely because it is not used in Debian anyways.
I created the debdiff with "--exclude carbon" as without that the debdiff would
mainly show the content of the removed files. I have verified that my other changes
all show up in the debdiff.
Do you want me to go ahead and upload this to sid? I am asking just in case
you consider the Apple license non-DFSG-ness to be severe" enough for RC.
unblock lazarus/1.2.4+dfsg2-1
- -- System Information:
Debian Release: 8.0
APT prefers testing
APT policy: (500, 'testing')
Architecture: amd64 (x86_64)
Foreign Architectures: i386
Kernel: Linux 3.16.0-4-amd64 (SMP w/1 CPU core)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1
iQEcBAEBCAAGBQJU3fKwAAoJEJxcmesFvXUKfbgH+QEPx/+ZwtSNEm8/ZoBaPytP
lpTyevxbcV5y7T1yj3JVt9IyoFE0FLEOF1JMd+9+9P5jJSFEK5LnWdMazFCEU/It
/xUCXOvRhbvsz2FZ2iQ3xXGL1lu1ZtHsdwtiHjgbQ7qrAdfO266+LslvKRUttVVd
bi+WWieTayIly/ybiZ94fvELlsLg0RnTvNYip/5UFKJgGyIMVOhWRsLhB/S3FabG
SLR6lJzosnz7J9etWxptcqsBSbXfY/f/usoMJHKFDdDcjaRDvVGJIsPCvg2ySges
MFt885HRHwSOBYxpyCXQDk+3XBgvKffV9I8WvB12HuquAqbd5pg/rAdjwMcZL78=
=M9ry
-----END PGP SIGNATURE-----
diff -Nru --exclude carbon lazarus-1.2.4+dfsg/debian/changelog lazarus-1.2.4+dfsg2/debian/changelog
--- lazarus-1.2.4+dfsg/debian/changelog 2014-09-30 22:09:25.000000000 +0200
+++ lazarus-1.2.4+dfsg2/debian/changelog 2015-02-12 21:15:13.000000000 +0100
@@ -1,3 +1,13 @@
+lazarus (1.2.4+dfsg2-1) unstable; urgency=medium
+
+ * Strip lcl/interfaces/carbon from the tar ball as the files in
+ that directory are licensed under the Apple Public Source License
+ which is considered non-DFSG (Closes: #777622)
+ * Add patch to also not clean the carbon dir in the relevant Makefiles
+ * Add note to d/copyright that we also strip carbon
+
+ -- Paul Gevers <elbrus@debian.org> Thu, 12 Feb 2015 21:14:23 +0100
+
lazarus (1.2.4+dfsg-2) unstable; urgency=medium
* Work around a recent change (bug 761918) in imagemagick that causes
diff -Nru --exclude carbon lazarus-1.2.4+dfsg/debian/copyright lazarus-1.2.4+dfsg2/debian/copyright
--- lazarus-1.2.4+dfsg/debian/copyright 2014-07-15 11:53:59.000000000 +0200
+++ lazarus-1.2.4+dfsg2/debian/copyright 2015-02-12 21:11:51.000000000 +0100
@@ -8,8 +8,8 @@
http://sourceforge.net/projects/lazarus/files/Lazarus%20Zip%20_%20GZip/
The Debian sources were repacked from orginial upstream sources in
-order to remove non DFSG compliant code such as aggpas (gpc) and mpaslex
-using the debian/orig-tar.sh script.
+order to remove non DFSG compliant code such as aggpas (gpc), mpaslex
+and the Carbon interface using the debian/orig-tar.sh script.
Upstream Authors: Andreas Hausladen, Andrew Haines, Andrew Johnson, Bob
Wingard, Christian Iversen, Cliff Baeseman, Colin Western, Curtis White,
diff -Nru --exclude carbon lazarus-1.2.4+dfsg/debian/orig-tar.sh lazarus-1.2.4+dfsg2/debian/orig-tar.sh
--- lazarus-1.2.4+dfsg/debian/orig-tar.sh 2014-07-15 11:53:59.000000000 +0200
+++ lazarus-1.2.4+dfsg2/debian/orig-tar.sh 2015-02-12 21:11:51.000000000 +0100
@@ -29,6 +29,7 @@
rm -rf components/aggpas
rm -rf packager/globallinks/aggpas*.lpl
rm -rf components/mpaslex
+rm -rf lcl/interfaces/carbon
rm -rf debian
find -name Makefile.fpc -execdir sh -c 'rm $(basename {} .fpc)' ';'
find '(' -name '*.icns' -or -name '*.java' ')' -exec chmod a-x {} ';'
diff -Nru --exclude carbon lazarus-1.2.4+dfsg/debian/patches/drop_carbon_from_Makefiles.patch lazarus-1.2.4+dfsg2/debian/patches/drop_carbon_from_Makefiles.patch
--- lazarus-1.2.4+dfsg/debian/patches/drop_carbon_from_Makefiles.patch 1970-01-01 01:00:00.000000000 +0100
+++ lazarus-1.2.4+dfsg2/debian/patches/drop_carbon_from_Makefiles.patch 2015-02-12 21:03:42.000000000 +0100
@@ -0,0 +1,25 @@
+Description: With carbon stripped from the source tree, we need to strip
+ the carbon dir from the clean targets
+Author: Paul Gevers <elbrus@debian.org>
+
+--- a/lcl/Makefile.fpc
++++ b/lcl/Makefile.fpc
+@@ -157,7 +157,6 @@
+ cleanlaz: cleanall
+ cleanall: clean
+ $(MAKE) -C interfaces clean
+- $(MAKE) -C interfaces/carbon clean
+ $(MAKE) -C interfaces/cocoa clean
+ $(MAKE) -C interfaces/customdrawn clean
+ $(MAKE) -C interfaces/fpgui clean
+--- a/lcl/interfaces/Makefile.fpc
++++ b/lcl/interfaces/Makefile.fpc
+@@ -2,7 +2,7 @@
+ main=lcl
+
+ [target]
+-dirs=gtk gtk2 gtk3 win32 wince qt carbon fpgui nogui cocoa customdrawn
++dirs=gtk gtk2 gtk3 win32 wince qt fpgui nogui cocoa customdrawn
+
+ [default]
+ dir=$(LCL_PLATFORM)
diff -Nru --exclude carbon lazarus-1.2.4+dfsg/debian/patches/series lazarus-1.2.4+dfsg2/debian/patches/series
--- lazarus-1.2.4+dfsg/debian/patches/series 2014-07-15 11:53:59.000000000 +0200
+++ lazarus-1.2.4+dfsg2/debian/patches/series 2015-02-12 21:11:51.000000000 +0100
@@ -3,3 +3,4 @@
spell_errors.diff
add-revision-inc.diff
add_keyword_to_desktop_file.patch
+drop_carbon_from_Makefiles.patch
--- End Message ---