r48991 - in /desktop/unstable/clutter-1.0/debian: changelog copyright libclutter-1.0-doc.install patches/01_do-not-build-cookbook.patch patches/series rules watch
jbicha-guest at users.alioth.debian.org
jbicha-guest at users.alioth.debian.org
Fri Jun 3 12:49:29 UTC 2016
Author: jbicha-guest
Date: Fri Jun 3 12:49:29 2016
New Revision: 48991
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=48991
Log:
* The cookbook is licensed under CC-BY-NC-SA 2.5 which is not DFSG-free
* Use copyright format 1.0 with Files-Excluded field
* Update debian/watch to repack with cookbook/ removed (Closes: #821095)
* Add 01_do-not-build-cookbook.patch to deal with cookbook/ removal
Added:
desktop/unstable/clutter-1.0/debian/patches/01_do-not-build-cookbook.patch
Modified:
desktop/unstable/clutter-1.0/debian/changelog
desktop/unstable/clutter-1.0/debian/copyright
desktop/unstable/clutter-1.0/debian/libclutter-1.0-doc.install
desktop/unstable/clutter-1.0/debian/patches/series
desktop/unstable/clutter-1.0/debian/rules
desktop/unstable/clutter-1.0/debian/watch
Modified: desktop/unstable/clutter-1.0/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/clutter-1.0/debian/changelog?rev=48991&op=diff
==============================================================================
--- desktop/unstable/clutter-1.0/debian/changelog [utf-8] (original)
+++ desktop/unstable/clutter-1.0/debian/changelog [utf-8] Fri Jun 3 12:49:29 2016
@@ -1,3 +1,13 @@
+clutter-1.0 (1.26.0+dfsg-1) UNRELEASED; urgency=medium
+
+ * Team upload.
+ * The cookbook is licensed under CC-BY-NC-SA 2.5 which is not DFSG-free
+ * Use copyright format 1.0 with Files-Excluded field
+ * Update debian/watch to repack with cookbook/ removed (Closes: #821095)
+ * Add 01_do-not-build-cookbook.patch to deal with cookbook/ removal
+
+ -- Jeremy Bicha <jbicha at linux.com> Fri, 03 Jun 2016 01:00:24 -0400
+
clutter-1.0 (1.26.0-2) unstable; urgency=medium
[ Pino Toscano ]
Modified: desktop/unstable/clutter-1.0/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/clutter-1.0/debian/copyright?rev=48991&op=diff
==============================================================================
--- desktop/unstable/clutter-1.0/debian/copyright [utf-8] (original)
+++ desktop/unstable/clutter-1.0/debian/copyright [utf-8] Fri Jun 3 12:49:29 2016
@@ -1,31 +1,42 @@
-This package was debianized by Ross Burton <ross at debian.org> on Wed, 21 Jun 2006
-17:40:36 +0100.
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: clutter
+Source: https://download.gnome.org/sources/clutter/
+Files-Excluded: doc/cookbook
+Comment: The cookbook is licensed under CC-BY-NC-SA 2.5 and has therefore
+ been removed from this package. https://bugs.debian.org/821095
-It was downloaded from https://download.gnome.org/sources/clutter/
+Files: *
+Copyright: Matthew Allum <mallum at o-hand.com>
+ Emmanuele Bassi <ebassi at o-hand.com>
+ Iain Holmes <iain at o-hand.com>
+ Jorn Baayen <jorn at o-hand.com>
+ 2006-2008 OpenedHand Ltd.
+ 2009-2013 Intel Corp.
+License: LGPL-2.1
-Upstream Authors:
-Matthew Allum <mallum at o-hand.com>
-Emmanuele Bassi <ebassi at o-hand.com>
-Iain Holmes <iain at o-hand.com>
-Jorn Baayen <jorn at o-hand.com>
+Files: clutter/mir/*
+Copyright: 2014 Canonical Ltd.
+License: LGPL-2.1
-Copyright (C) 2006-2008 OpenedHand Ltd.
-Copyright (C) 2009 Intel Corp.
+Files: tests/accessibility/*
+Copyright: 2009 Igalia, S.L.
+ Alejandro Piñeiro Iglesias <apinheiro at igalia.com>
+License: LGPL-2.1
-License:
-
- This library is free software; you can redistribute it and/or modify it under
- the terms of the GNU Lesser General Public License as published by the Free
- Software Foundation; either version 2 of the License, or (at your option) any
- later version.
-
- This library is distributed in the hope that it will be useful, but WITHOUT
- ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public License along
- with this library; if not, write to the Free Software Foundation, Inc., 51
- Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-
-On Debian systems, the complete text of the GNU General
-Public License can be found in `/usr/share/common-licenses/LGPL-2'.
+License: LGPL-2.1
+ This library is free software; you can redistribute it and/or modify it under
+ the terms of the GNU Lesser General Public License as published by the Free
+ Software Foundation; either version 2.1 of the License, or (at your option) any
+ later version.
+ .
+ This library is distributed in the hope that it will be useful, but WITHOUT
+ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
+ details.
+ .
+ You should have received a copy of the GNU Lesser General Public License along
+ with this library; if not, write to the Free Software Foundation, Inc., 51
+ Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ .
+ On Debian systems, the complete text of the GNU General
+ Public License can be found in `/usr/share/common-licenses/LGPL-2.1'.
Modified: desktop/unstable/clutter-1.0/debian/libclutter-1.0-doc.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/clutter-1.0/debian/libclutter-1.0-doc.install?rev=48991&op=diff
==============================================================================
--- desktop/unstable/clutter-1.0/debian/libclutter-1.0-doc.install [utf-8] (original)
+++ desktop/unstable/clutter-1.0/debian/libclutter-1.0-doc.install [utf-8] Fri Jun 3 12:49:29 2016
@@ -1,3 +1 @@
usr/share/gtk-doc/html/clutter
-usr/share/gtk-doc/html/clutter-cookbook
-usr/share/clutter-1.0/cookbook
Added: desktop/unstable/clutter-1.0/debian/patches/01_do-not-build-cookbook.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/clutter-1.0/debian/patches/01_do-not-build-cookbook.patch?rev=48991&op=file
==============================================================================
--- desktop/unstable/clutter-1.0/debian/patches/01_do-not-build-cookbook.patch (added)
+++ desktop/unstable/clutter-1.0/debian/patches/01_do-not-build-cookbook.patch [utf-8] Fri Jun 3 12:49:29 2016
@@ -0,0 +1,35 @@
+Description: Build without the cookbook directory
+Author: Jeremy Bicha <jbicha at linux.com>
+Forwarded: no
+
+Index: clutter-1.0-1.26.0+dfsg1/doc/Makefile.am
+===================================================================
+--- clutter-1.0-1.26.0+dfsg1.orig/doc/Makefile.am
++++ clutter-1.0-1.26.0+dfsg1/doc/Makefile.am
+@@ -5,10 +5,10 @@ SUBDIRS += reference
+ endif
+
+ if ENABLE_DOCS
+-SUBDIRS += common cookbook
++SUBDIRS += common
+ endif
+
+-DIST_SUBDIRS = reference common cookbook
++DIST_SUBDIRS = reference common
+
+ EXTRA_DIST = \
+ CODING_STYLE \
+Index: clutter-1.0-1.26.0+dfsg1/configure.ac
+===================================================================
+--- clutter-1.0-1.26.0+dfsg1.orig/configure.ac
++++ clutter-1.0-1.26.0+dfsg1/configure.ac
+@@ -1224,9 +1224,6 @@ AC_CONFIG_FILES([
+ doc/reference/Makefile
+ doc/reference/clutter-docs.xml
+ doc/common/Makefile
+- doc/cookbook/Makefile
+- doc/cookbook/clutter-cookbook.xml
+- doc/cookbook/examples/Makefile
+
+ po/Makefile.in
+ ])
Modified: desktop/unstable/clutter-1.0/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/clutter-1.0/debian/patches/series?rev=48991&op=diff
==============================================================================
--- desktop/unstable/clutter-1.0/debian/patches/series [utf-8] (original)
+++ desktop/unstable/clutter-1.0/debian/patches/series [utf-8] Fri Jun 3 12:49:29 2016
@@ -0,0 +1 @@
+01_do-not-build-cookbook.patch
Modified: desktop/unstable/clutter-1.0/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/clutter-1.0/debian/rules?rev=48991&op=diff
==============================================================================
--- desktop/unstable/clutter-1.0/debian/rules [utf-8] (original)
+++ desktop/unstable/clutter-1.0/debian/rules [utf-8] Fri Jun 3 12:49:29 2016
@@ -18,7 +18,7 @@
--enable-gdk-backend=yes \
--enable-egl-backend=yes \
--enable-gtk-doc \
- --enable-docs \
+ --disable-docs \
--enable-installed-tests \
--enable-introspection=yes
DEB_DBG_PACKAGE_libclutter-1.0-0 := libclutter-1.0-dbg
@@ -31,3 +31,6 @@
endif
common-binary-predeb-arch:: list-missing
+
+get-orig-source get-packaged-orig-source:
+ uscan --verbose --force-download --repack --compression xz
Modified: desktop/unstable/clutter-1.0/debian/watch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/clutter-1.0/debian/watch?rev=48991&op=diff
==============================================================================
--- desktop/unstable/clutter-1.0/debian/watch [utf-8] (original)
+++ desktop/unstable/clutter-1.0/debian/watch [utf-8] Fri Jun 3 12:49:29 2016
@@ -1,3 +1,4 @@
version=4
+opts="dversionmangle=s/\+dfsg$//,repacksuffix=+dfsg" \
https://download.gnome.org/sources/clutter/([\d\.]+[02468])/ \
clutter at ANY_VERSION@\.tar\.xz
More information about the pkg-gnome-commits
mailing list