Merge lp:~bregma/compiz/fix-lintian-warnings into lp:compiz/0.9.12

Proposed by Stephen M. Webb
Status: Merged
Approved by: Christopher Townsend
Approved revision: 3902
Merged at revision: 3902
Proposed branch: lp:~bregma/compiz/fix-lintian-warnings
Merge into: lp:compiz/0.9.12
Diff against target: 517 lines (+134/-158)
10 files modified
compizconfig/ccsm/ccsm.desktop.in (+1/-2)
debian/changelog (+16/-0)
debian/compiz-core.lintian-overrides (+1/-1)
debian/control (+12/-10)
debian/copyright (+99/-122)
debian/patches/99_valid_ccsm_desktop_file.patch (+0/-16)
debian/patches/series (+0/-1)
debian/rules (+4/-5)
debian/source/format (+1/-0)
gtk/gnome/compiz.desktop.in (+0/-1)
To merge this branch: bzr merge lp:~bregma/compiz/fix-lintian-warnings
Reviewer Review Type Date Requested Status
Christopher Townsend (community) Approve
PS Jenkins bot (community) continuous-integration Approve
Review via email: mp+240298@code.launchpad.net

Commit message

fixed numerous minor Lintian warnings in the Ubuntu packaging

Description of the change

Fixed a slew of minor Lintian warnings coming from the Ubuntu packaging.

There are still a number of warnings that need to be addressed separately, mostly to do with shared libraries, but fixing those might affect linkage so I deferred them to the next ABI change.

These change should result in no functional changes to the software.

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
3900. By Stephen M. Webb

ccsm.desktop: removed deprecated attributes (moved patch inline)

3901. By Stephen M. Webb

synched with trunk

3902. By Stephen M. Webb

debian/changelog: repaired after trunk synch

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
Revision history for this message
Christopher Townsend (townsend) wrote :

LGTM

review: Approve
3903. By Stephen M. Webb

debian/changelog: enfleshed change descriptions

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'compizconfig/ccsm/ccsm.desktop.in'
2--- compizconfig/ccsm/ccsm.desktop.in 2012-05-16 17:44:14 +0000
3+++ compizconfig/ccsm/ccsm.desktop.in 2014-11-05 13:11:39 +0000
4@@ -1,10 +1,9 @@
5 [Desktop Entry]
6-Encoding=UTF-8
7 _Name=CompizConfig Settings Manager
8 _Comment=Configure Compiz with CompizConfig
9 Icon=ccsm
10 Exec=ccsm
11 Terminal=false
12 Type=Application
13-Categories=Compiz;Settings;DesktopSettings;
14+Categories=Settings;DesktopSettings;
15 StartupNotify=true
16
17=== modified file 'debian/changelog'
18--- debian/changelog 2014-10-31 17:03:50 +0000
19+++ debian/changelog 2014-11-05 13:11:39 +0000
20@@ -1,3 +1,19 @@
21+compiz (1:0.9.12.0-0ubuntu1) UNRELEASED; urgency=low
22+
23+ * debian/compiz-core.lintian-overrides: updated libcompiz-coreABI soname
24+ * debian/control: updated Standards-Version to 3.9.6 (no changes)
25+ - added Homepage field
26+ - added python dependency to compiz-gnome package for upgrade scripts
27+ - fixed capitalization of "Python" in descriptions
28+ - turned package short descriptions into sentence fragments
29+ * debian/copyright: fixed formatting, updated dates
30+ * debian/patches/99_valid_ccsm_desktop_file.patch: merged changes upstream
31+ compizconfig/ccsm/ccsm_desktop.in: to here
32+ * debian/rules: used recommended way of stripping LDFLAGS
33+ * debian/source/format: new file (forces v1 instead of assuming default)
34+
35+ -- Stephen M. Webb <stephen.webb@canonical.com> Mon, 03 Nov 2014 21:56:22 -0400
36+
37 compiz (1:0.9.12+15.04.20141031-0ubuntu1) vivid; urgency=low
38
39 [ Stephen M. Webb ]
40
41=== modified file 'debian/compiz-core.lintian-overrides'
42--- debian/compiz-core.lintian-overrides 2012-07-12 11:08:19 +0000
43+++ debian/compiz-core.lintian-overrides 2014-11-05 13:11:39 +0000
44@@ -1,2 +1,2 @@
45-compiz-core: package-name-doesnt-match-sonames libcompiz-coreABI-20120603
46+compiz-core: package-name-doesnt-match-sonames libcompiz-coreABI-20140123
47 compiz-core: binary-without-manpage usr/bin/compiz-decorator
48
49=== modified file 'debian/control'
50--- debian/control 2014-08-26 13:06:20 +0000
51+++ debian/control 2014-11-05 13:11:39 +0000
52@@ -56,10 +56,11 @@
53 gnome-control-center-dev,
54 gsettings-desktop-schemas-dev,
55 xserver-xorg-dev (>= 0.7.0),
56-Standards-Version: 3.9.3
57+Standards-Version: 3.9.6
58 # If you aren't a member of ~compiz-team but need to upload packaging changes,
59 # just go ahead. ~compiz-team will notice and sync up the code again.
60 Vcs-Bzr: https://code.launchpad.net/~compiz-team/compiz/0.9.10
61+Homepage: https://launchpad.net/compiz
62
63 Package: compiz
64 Architecture: all
65@@ -140,9 +141,11 @@
66 Architecture: any
67 Depends: ${shlibs:Depends},
68 ${misc:Depends},
69+ ${python:Depends},
70 compiz-plugins-default (= ${binary:Version}),
71 gsettings-desktop-schemas,
72 gnome-settings-daemon-schemas (>= 3.4.2-0ubuntu9),
73+ python
74 Recommends: python-gconf,
75 gnome-system-monitor,
76 Replaces: compiz-plugins-main (<= 1:0.9.8),
77@@ -175,8 +178,7 @@
78 easier to use, more powerful and intuitive, and more accessible for users
79 with special needs.
80 .
81- This package contains the default compiz plugins we activate in ubuntu coming
82- with core compiz.
83+ This package contains the default set of core Compiz plugins.
84
85 Package: compiz-plugins
86 Architecture: any
87@@ -256,14 +258,14 @@
88 Section: python
89 Depends: ${misc:Depends}, ${python:Depends}, ${shlibs:Depends}
90 Provides: ${python:Provides}
91-Description: Compizconfig bindings for python
92+Description: Compizconfig bindings for Python
93 Compiz Fusion is the result of the re-unification of the Beryl-project
94 and the community around the Compiz Window Manager. It seeks to provide
95 an easy and fun-to-use windowing environment, allowing use of the
96 graphics hardware to provide impressive effects, amazing speed and
97 unrivalled usefulness
98 .
99- This package provides python bindings for the compizconfig system.
100+ This package provides Python bindings for the compizconfig system.
101
102 Package: compizconfig-settings-manager
103 Architecture: all
104@@ -284,7 +286,7 @@
105 Depends: compiz-plugins, ${misc:Depends}
106 Architecture: all
107 Section: oldlibs
108-Description: transitional dummy package.
109+Description: transitional dummy package
110 This package ensures a clean upgrade path, and can be safely removed
111 after the upgrade.
112
113@@ -292,7 +294,7 @@
114 Depends: compiz-plugins-default, ${misc:Depends}
115 Architecture: all
116 Section: oldlibs
117-Description: transitional dummy package.
118+Description: transitional dummy package
119 This package ensures a clean upgrade path, and can be safely removed
120 after the upgrade.
121
122@@ -300,7 +302,7 @@
123 Depends: compiz-dev, ${misc:Depends}
124 Architecture: all
125 Section: oldlibs
126-Description: transitional dummy package.
127+Description: transitional dummy package
128 This package ensures a clean upgrade path, and can be safely removed
129 after the upgrade.
130
131@@ -308,7 +310,7 @@
132 Depends: compiz-plugins, ${misc:Depends}
133 Architecture: all
134 Section: oldlibs
135-Description: transitional dummy package.
136+Description: transitional dummy package
137 This package ensures a clean upgrade path, and can be safely removed
138 after the upgrade.
139
140@@ -316,7 +318,7 @@
141 Depends: compiz-gnome, gconf2, ${misc:Depends}
142 Architecture: all
143 Section: oldlibs
144-Description: transitional dummy package.
145+Description: transitional dummy package
146 This package ensures a clean upgrade path, and can be safely removed
147 after the upgrade.
148
149
150=== modified file 'debian/copyright'
151--- debian/copyright 2012-06-19 11:47:43 +0000
152+++ debian/copyright 2014-11-05 13:11:39 +0000
153@@ -1,10 +1,10 @@
154 Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
155 Upstream-Name: Compiz
156-Upstream-Contact: Sam Spilsbury <sam.spilsbury@canonical.com>
157+Upstream-Contact: Stephen M. Webb <stephen.webb@canonical.com>
158 Source: https://launchpad.net/compiz
159
160 Files: *
161-Copyright: 2010-2011, Canonical Ltd
162+Copyright: 2010-2014 Canonical Ltd
163 2007-2008, Quinn Storm <quinn@beryl-project.org>
164 2007-2008, Patrick Niklaus
165 2007-2008, Christopher Williams
166@@ -19,26 +19,6 @@
167 2006, Volker Krause <vkrause@kde.org>
168 1999-2000, Daniel M. Duley <mosfet@kde.org>
169 License: GPL-2+
170- This program is free software; you can redistribute it
171- and/or modify it under the terms of the GNU General Public
172- License as published by the Free Software Foundation; either
173- version 2 of the License, or (at your option) any later
174- version.
175- .
176- This program is distributed in the hope that it will be
177- useful, but WITHOUT ANY WARRANTY; without even the implied
178- warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
179- PURPOSE. See the GNU General Public License for more
180- details.
181- .
182- You should have received a copy of the GNU General Public
183- License along with this package; if not, write to the Free
184- Software Foundation, Inc., 51 Franklin St, Fifth Floor,
185- Boston, MA 02110-1301 USA
186- .
187- On Debian systems, the full text of the GNU General Public
188- License version 2 can be found in the file
189- `/usr/share/common-licenses/GPL-2'.
190
191 Files: compizconfig/libcompizconfig/* compizconfig/compizconfig-python/*
192 Copyright: 2010, Sam Spilsbury
193@@ -48,24 +28,6 @@
194 2005-2006, Novell, Inc.
195 2000, Nicolas Devillard <ndevilla AT free DOT fr>
196 License: LGPL-2.1+
197- This library is free software; you can redistribute it and/or
198- modify it under the terms of the GNU Lesser General Public
199- License as published by the Free Software Foundation; either
200- version 2.1 of the License, or (at your option) any later version.
201- .
202- This library is distributed in the hope that it will be useful,
203- but WITHOUT ANY WARRANTY; without even the implied warranty of
204- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
205- Lesser General Public License for more details.
206- .
207- You should have received a copy of the GNU Lesser General Public
208- License along with this library; if not, write to the Free Software
209- Foundation, Inc., 51 Franklin Street, Fifth Floor,
210- Boston, MA 02110-1301 USA
211- .
212- On Debian systems, the full text of the GNU Lesser General Public
213- License version 2.1 can be found in the file
214- `/usr/share/common-licenses/LGPL-2.1'.
215
216 Files: gtk/*
217 Copyright: 2010-2011, Canonical Ltd.
218@@ -73,27 +35,11 @@
219 2008-2009, Dennis Kasprzyk <onestone@compiz-fusion.org
220 2005-2007, Novell, Inc.
221 License: LGPL-2+
222- This library is free software; you can redistribute it and/or
223- modify it under the terms of the GNU Lesser General Public
224- License as published by the Free Software Foundation; either
225- version 2 of the License, or (at your option) any later version.
226- .
227- This library is distributed in the hope that it will be useful,
228- but WITHOUT ANY WARRANTY; without even the implied warranty of
229- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
230- Lesser General Public License for more details.
231- .
232- You should have received a copy of the GNU Lesser General Public
233- License along with this library; if not, write to the Free Software
234- Foundation, Inc., 51 Franklin Street, Fifth Floor,
235- Boston, MA 02110-1301 USA
236- .
237- On Debian systems, the full text of the GNU Lesser General Public
238- License version 2 can be found in the file
239- `/usr/share/common-licenses/LGPL-2'.
240
241-Files: include/* kde/window-decorator-kde4/{kdecoration_plugins.{cpp,h},
242- paintredirector.{cpp,h}, src/*}
243+Files: include/*
244+ kde/window-decorator-kde4/kdecorationbridge.h
245+ kde/window-decorator-kde4/kdecoration_plugins.*
246+ kde/window-decorator-kde4/paintredirector.*
247 Copyright: 2010-2012, Canonical Ltd
248 2010, Sam Spilsbury <smspillaz@gmail.com>
249 2008, Dennis Kasprzyk <onestone@opencompositing.org>
250@@ -101,27 +47,9 @@
251 2003-2009, Lubos Lunak <l.lunak@kde.org>
252 1999-2000, Daniel M. Duley <mosfet@kde.org>
253 License: MIT/X11
254- Permission is hereby granted, free of charge, to any person obtaining a
255- copy of this software and associated documentation files (the "Software"),
256- to deal in the Software without restriction, including without limitation
257- the rights to use, copy, modify, merge, publish, distribute, sublicense,
258- and/or sell copies of the Software, and to permit persons to whom the
259- Software is furnished to do so, subject to the following conditions:
260- .
261- The above copyright notice and this permission notice shall be included in
262- all copies or substantial portions of the Software.
263- .
264- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
265- IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
266- FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
267- THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
268- LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
269- FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
270- DEALINGS IN THE SOFTWARE.
271
272 Files: plugins/* plugins/decor/src/clip-groups/include/clip-groups.*
273-Copyright:
274- 2011, Daniel van Vugt <vanvugt@gmail.com>
275+Copyright: 2011, Daniel van Vugt <vanvugt@gmail.com>
276 2010, Jay Catherwood <jay.catherwood@gmail.com>
277 2010, Scott Moreau <oreaus@gmail.com>
278 2008-2009, Sam Spilsbury <smspillaz@gmail.com>
279@@ -155,33 +83,36 @@
280 2002-2003 Red Hat, Inc
281 2001, Havoc Pennington
282 License: GPL-2+
283- This program is free software; you can redistribute it
284- and/or modify it under the terms of the GNU General Public
285- License as published by the Free Software Foundation; either
286- version 2 of the License, or (at your option) any later
287- version.
288- .
289- This program is distributed in the hope that it will be
290- useful, but WITHOUT ANY WARRANTY; without even the implied
291- warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
292- PURPOSE. See the GNU General Public License for more
293- details.
294- .
295- You should have received a copy of the GNU General Public
296- License along with this package; if not, write to the Free
297- Software Foundation, Inc., 51 Franklin St, Fifth Floor,
298- Boston, MA 02110-1301 USA
299- .
300- On Debian systems, the full text of the GNU General Public
301- License version 2 can be found in the file
302- `/usr/share/common-licenses/GPL-2'.
303
304-Files: plugins/{annotate,blur,clone,commands,compiztoolbox,composite,dbus,
305- decor,ezoom,fade,gnomecompat,imgpng,imgsvg,inotify,move,obs,
306- opengl,regex,resize,rotate,scale,showdesktop,screenshot,
307- switcher,water,woobly}/*
308- plugins/{place,wall}/src/*/tests/*
309-Copyright: 2011-2012, Canonical Ltd
310+Files: plugins/annotate/*
311+ plugins/blur/*
312+ plugins/clone/*
313+ plugins/commands/*
314+ plugins/compiztoolbox/*
315+ plugins/composite/*
316+ plugins/dbus/*
317+ plugins/decor/*
318+ plugins/ezoom/*
319+ plugins/fade/*
320+ plugins/gnomecompat/*
321+ plugins/imgpng/*
322+ plugins/imgsvg/*
323+ plugins/inotify/*
324+ plugins/move/*
325+ plugins/obs/*
326+ plugins/opengl/*
327+ plugins/regex/*
328+ plugins/resize/*
329+ plugins/rotate/*
330+ plugins/scale/*
331+ plugins/showdesktop/*
332+ plugins/screenshot/*
333+ plugins/switcher/*
334+ plugins/water/*
335+ plugins/wobbly/*
336+ plugins/place/src/*/tests/*
337+ plugins/wall/src/*/tests/*
338+Copyright: 2011-2014 Canonical Ltd
339 2009, Sam Spilsbury <smspillaz@gmail.com>
340 2008-2010, Kristian Lyngstøl <kristian@bohemians.org>
341 2008-2009, Danny Baumanan <maniac@opencompositing.org>
342@@ -190,27 +121,54 @@
343 2005-2007, Novell, Inc
344 1999-2005, Brian Paul
345 License: MIT/X11
346- Permission is hereby granted, free of charge, to any person obtaining a
347- copy of this software and associated documentation files (the "Software"),
348- to deal in the Software without restriction, including without limitation
349- the rights to use, copy, modify, merge, publish, distribute, sublicense,
350- and/or sell copies of the Software, and to permit persons to whom the
351- Software is furnished to do so, subject to the following conditions:
352- .
353- The above copyright notice and this permission notice shall be included in
354- all copies or substantial portions of the Software.
355- .
356- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
357- IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
358- FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
359- THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
360- LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
361- FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
362- DEALINGS IN THE SOFTWARE.
363
364 Files: plugins/ccp/*
365 Copyright: 2007, Dennis Kasprzyk <onestone@opencompositing.org>
366 License: LGPL-2.1+
367+
368+License: GPL-2+
369+ This program is free software; you can redistribute it
370+ and/or modify it under the terms of the GNU General Public
371+ License as published by the Free Software Foundation; either
372+ version 2 of the License, or (at your option) any later
373+ version.
374+ .
375+ This program is distributed in the hope that it will be
376+ useful, but WITHOUT ANY WARRANTY; without even the implied
377+ warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
378+ PURPOSE. See the GNU General Public License for more
379+ details.
380+ .
381+ You should have received a copy of the GNU General Public
382+ License along with this package; if not, write to the Free
383+ Software Foundation, Inc., 51 Franklin St, Fifth Floor,
384+ Boston, MA 02110-1301 USA
385+ .
386+ On Debian systems, the full text of the GNU General Public
387+ License version 2 can be found in the file
388+ `/usr/share/common-licenses/GPL-2'.
389+
390+License: LGPL-2+
391+ This library is free software; you can redistribute it and/or
392+ modify it under the terms of the GNU Lesser General Public
393+ License as published by the Free Software Foundation; either
394+ version 2 of the License, or (at your option) any later version.
395+ .
396+ This library is distributed in the hope that it will be useful,
397+ but WITHOUT ANY WARRANTY; without even the implied warranty of
398+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
399+ Lesser General Public License for more details.
400+ .
401+ You should have received a copy of the GNU Lesser General Public
402+ License along with this library; if not, write to the Free Software
403+ Foundation, Inc., 51 Franklin Street, Fifth Floor,
404+ Boston, MA 02110-1301 USA
405+ .
406+ On Debian systems, the full text of the GNU Lesser General Public
407+ License version 2 can be found in the file
408+ `/usr/share/common-licenses/LGPL-2'.
409+
410+License: LGPL-2.1+
411 This library is free software; you can redistribute it and/or
412 modify it under the terms of the GNU Lesser General Public
413 License as published by the Free Software Foundation; either
414@@ -230,3 +188,22 @@
415 License version 2.1 can be found in the file
416 `/usr/share/common-licenses/LGPL-2.1'.
417
418+License: MIT/X11
419+ Permission is hereby granted, free of charge, to any person obtaining a
420+ copy of this software and associated documentation files (the "Software"),
421+ to deal in the Software without restriction, including without limitation
422+ the rights to use, copy, modify, merge, publish, distribute, sublicense,
423+ and/or sell copies of the Software, and to permit persons to whom the
424+ Software is furnished to do so, subject to the following conditions:
425+ .
426+ The above copyright notice and this permission notice shall be included in
427+ all copies or substantial portions of the Software.
428+ .
429+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
430+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
431+ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
432+ THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
433+ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
434+ FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
435+ DEALINGS IN THE SOFTWARE.
436+
437
438=== removed file 'debian/patches/99_valid_ccsm_desktop_file.patch'
439--- debian/patches/99_valid_ccsm_desktop_file.patch 2012-06-19 11:22:48 +0000
440+++ debian/patches/99_valid_ccsm_desktop_file.patch 1970-01-01 00:00:00 +0000
441@@ -1,16 +0,0 @@
442-Index: compiz-0.9.8/compizconfig/ccsm/ccsm.desktop.in
443-===================================================================
444---- compiz-0.9.8.orig/compizconfig/ccsm/ccsm.desktop.in 2012-05-29 12:09:56.000000000 +0200
445-+++ compiz-0.9.8/compizconfig/ccsm/ccsm.desktop.in 2012-05-29 14:54:50.181992801 +0200
446-@@ -1,10 +1,9 @@
447- [Desktop Entry]
448--Encoding=UTF-8
449- _Name=CompizConfig Settings Manager
450- _Comment=Configure Compiz with CompizConfig
451- Icon=ccsm
452- Exec=ccsm
453- Terminal=false
454- Type=Application
455--Categories=Compiz;Settings;DesktopSettings;
456-+Categories=Settings;DesktopSettings;
457- StartupNotify=true
458
459=== modified file 'debian/patches/series'
460--- debian/patches/series 2014-03-10 14:54:39 +0000
461+++ debian/patches/series 2014-11-05 13:11:39 +0000
462@@ -4,6 +4,5 @@
463 ccsm_remove_redundant_sliders.patch
464 ccsm_add_first_run_warning.patch
465 ccsm_disable_unity_checkbox.patch
466-99_valid_ccsm_desktop_file.patch
467 unity_support_test.patch
468 100_workaround_virtualbox_hang.patch
469
470=== modified file 'debian/rules'
471--- debian/rules 2014-10-30 17:49:34 +0000
472+++ debian/rules 2014-11-05 13:11:39 +0000
473@@ -1,12 +1,14 @@
474 #!/usr/bin/make -f
475 # -*- makefile -*-
476
477-# Uncomment this to turn on verbose mode.
478-#export DH_VERBOSE=1
479 export COMPIZ_DEB_BUILD=1
480+
481 DEB_HOST_ARCH := $(shell dpkg-architecture -qDEB_HOST_ARCH)
482 gles2_architectures := armel armhf
483
484+# currently, segfault if CMAKE_BUILD_TYPE=Release
485+export DEB_LDFLAGS_MAINT_STRIP=-Wl,-Bsymbolic-functions
486+
487 CORE_ABIVERSION := $(shell sed -rn 's/^\#define[[:space:]]+CORE_ABIVERSION[[:space:]]+//p' include/core/abiversion.h )
488
489 override_dh_quilt_patch:
490@@ -29,9 +31,6 @@
491 dh_quilt_unpatch
492
493 override_dh_auto_configure:
494- # currently, segfault if CMAKE_BUILD_TYPE=Release
495- LDFLAGS=$(shell echo $$LDFLAGS | sed -e 's/\-Wl,-Bsymbolic-functions //')
496-
497 # right now, xorg-gtest won't compile on arm.
498 ifeq ($(DEB_HOST_ARCH),$(findstring $(DEB_HOST_ARCH), $(gles2_architectures)))
499 dh_auto_configure -- -DCOMPIZ_BUILD_WITH_RPATH=FALSE -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCOMPIZ_PACKAGING_ENABLED=TRUE -DUSE_GSETTINGS=ON -DCOMPIZ_DISABLE_GS_SCHEMAS_INSTALL=OFF -DCOMPIZ_DISABLE_PLUGIN_KDE=ON -DCOMPIZ_BUILD_TESTING=OFF -DUSE_KDE4=OFF -DUSE_GCONF=OFF -DBUILD_GLES=ON -DBUILD_XORG_GTEST=OFF
500
501=== added directory 'debian/source'
502=== added file 'debian/source/format'
503--- debian/source/format 1970-01-01 00:00:00 +0000
504+++ debian/source/format 2014-11-05 13:11:39 +0000
505@@ -0,0 +1,1 @@
506+1.0
507
508=== modified file 'gtk/gnome/compiz.desktop.in'
509--- gtk/gnome/compiz.desktop.in 2009-03-08 12:21:32 +0000
510+++ gtk/gnome/compiz.desktop.in 2014-11-05 13:11:39 +0000
511@@ -1,6 +1,5 @@
512 [Desktop Entry]
513 Type=Application
514-Encoding=UTF-8
515 _Name=Compiz
516 Exec=compiz
517 NoDisplay=true

Subscribers

People subscribed via source and target branches