Dmitry Shachnev has proposed merging lp:~mitya57/compizconfig-settings-manager/sync-with-debian into lp:~compiz/compizconfig-settings-manager/ubuntu.
Requested reviews: compiz packagers (compiz) For more details, see: https://code.launchpad.net/~mitya57/compizconfig-settings-manager/sync-with-debian/+merge/107786 Synchronized the packaging with Debian git (http://anonscm.debian.org/gitweb/?p=pkg-xorg/bling/ccsm.git). The most important change — switch to dh_python2 from dh_pycentral (which is deprecated). Also: - the new debhelper (>= 7) and the new Standards-Version (3.9.3) are used, instead of the ancient ones. - the docs are properly installed - the watch file is working - the manual page now exists - the package is lintian clean (with default options) The debian/changelog entry: compizconfig-settings-manager (0.9.5.92-0ubuntu4) quantal; urgency=low * Synchronize with Debian packaging git, remaining changes: - Use a different source package name - Use a newer upstream release - Set Maintainer to Ubuntu Developers - Recommend compiz plugins - debian/patches/01_remove_redundant_sliders.patch: Remove redundant sliders - debian/patches/02_add_first_run_warning.patch: Add a first run dialog providing a user warning - debian/patches/03_disable_unity_checkbox.patch: If in a Unity session, don't allow the user to disable Unity from main view. * debian/control: - Use X-Python-Version instead of XS-Python-Version - Bump Standards-Version to 3.9.3 - Update Vcs fields - Update debian/watch -- Dmitry Shachnev <[email protected]> Tue, 29 May 2012 17:47:28 +0400 -- https://code.launchpad.net/~mitya57/compizconfig-settings-manager/sync-with-debian/+merge/107786 Your team compiz packagers is requested to review the proposed merge of lp:~mitya57/compizconfig-settings-manager/sync-with-debian into lp:~compiz/compizconfig-settings-manager/ubuntu.
=== added file 'debian/ccsm.1' --- debian/ccsm.1 1970-01-01 00:00:00 +0000 +++ debian/ccsm.1 2012-05-29 13:50:26 +0000 @@ -0,0 +1,20 @@ +.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.36. +.TH CCSM "1" "July 2008" "ccsm" "User Commands" +.SH NAME +CCSM \- compizconfig-settings-manager +.SH SYNOPSIS +.B ccsm +[\fIoptions\fR] +.SH OPTIONS +.TP +\fB\-h\fR, \fB\-\-help\fR +show this help message and exit +.TP +\fB\-p\fR PLUGIN, \fB\-\-plugin\fR=\fIPLUGIN\fR +Directly jump to the page of PLUGIN +.TP +\fB\-c\fR CATEGORY, \fB\-\-category\fR=\fICATEGORY\fR +Directly jump to CATEGORY +.TP +\fB\-v\fR, \fB\-\-version\fR +Version === modified file 'debian/changelog' --- debian/changelog 2012-02-15 11:25:08 +0000 +++ debian/changelog 2012-05-29 13:50:26 +0000 @@ -1,274 +1,176 @@ -compizconfig-settings-manager (0.9.5.92-0ubuntu3) precise; urgency=low - - [ Andrew Starr-Bochicchio ] - * debian/patches/02_add_first_run_warning.patch: - - Add a first run dialog providing a user warning. - * debian/patches/03_disable_unity_checkbox.patch: - - If in a Unity session, don't allow the user to disable - Unity from main view. - - -- Didier Roche <[email protected]> Wed, 15 Feb 2012 12:25:07 +0100 - -compizconfig-settings-manager (0.9.5.92-0ubuntu2) precise; urgency=low - - [Alan Bell] - * debian/patches/01_remove_redundant_sliders.patch: - - remove sliders which are redundant and potentially dangerous - combination when using the mousewheel to scroll the page - - -- Didier Roche <[email protected]> Wed, 01 Feb 2012 12:50:42 +0100 - -compizconfig-settings-manager (0.9.5.92-0ubuntu1) oneiric; urgency=low - - * New upstream version - - -- Sebastien Bacher <[email protected]> Tue, 23 Aug 2011 20:20:40 +0200 - -compizconfig-settings-manager (0.9.5.0-0ubuntu1) oneiric; urgency=low - - * New upstream release - * debian/control: - - buid-dep on latest python-compizconfig - * remove debian/patches/02_fix_crash_with_p_option.patch: - - upstreamed - * remove debian/patches/01_remove_prefix_mangling.diff. Not necessary with - current setup.py - - -- Didier Roche <[email protected]> Tue, 19 Jul 2011 08:04:55 +0200 - -compizconfig-settings-manager (0.9.4-0ubuntu3) oneiric; urgency=low - - * debian/control: - - recommends compiz-plugins and compiz-plugins-main as they contains - additional plugins that aren't installed by default - * debian/rules: - - remove langpack.mk - - -- Didier Roche <[email protected]> Tue, 07 Jun 2011 14:05:49 +0200 - -compizconfig-settings-manager (0.9.4-0ubuntu2) natty; urgency=low - - * 02_fix_crash_with_p_option.patch: (LP: #736765) - - fix a crash when using the -p option - - -- Didier Roche <[email protected]> Thu, 17 Mar 2011 12:08:57 +0100 - -compizconfig-settings-manager (0.9.4-0ubuntu1) natty; urgency=low - - * New upstream release - * debian/control: - - build-dep on latest python-compizconfig - - -- Didier Roche <[email protected]> Thu, 24 Feb 2011 17:39:03 +0100 - -compizconfig-settings-manager (0.9.2.1-0ubuntu1) natty; urgency=low - - * New upstream release - * debian/control: - - bump compiz dep to 0.9 - - -- Didier Roche <[email protected]> Tue, 19 Oct 2010 13:55:32 -0400 - -compizconfig-settings-manager (0.8.2-0ubuntu1) jaunty; urgency=low - - * new upstream release - - -- Michael Vogt <[email protected]> Mon, 09 Mar 2009 11:23:24 +0100 - -compizconfig-settings-manager (0.7.8-0ubuntu3) intrepid; urgency=low - - * tighten dependency on python-compizconfig - - -- Michael Vogt <[email protected]> Mon, 22 Sep 2008 23:26:07 +0200 - -compizconfig-settings-manager (0.7.8-0ubuntu2) intrepid; urgency=low - - * build only for python 2.5 - - -- Michael Vogt <[email protected]> Fri, 19 Sep 2008 10:26:48 +0200 - -compizconfig-settings-manager (0.7.8-0ubuntu1) intrepid; urgency=low - - * New upstream release - - -- Michael Vogt <[email protected]> Fri, 19 Sep 2008 09:15:06 +0200 - -compizconfig-settings-manager (0.7.7+git20080630-0ubuntu1) intrepid; urgency=low - - * New git snpashot - - -- Michael Vogt <[email protected]> Mon, 30 Jun 2008 10:28:58 +0200 - -compizconfig-settings-manager (0.7.7+git20080618-0ubuntu1) intrepid; urgency=low - - * New git snpashot - - -- Michael Vogt <[email protected]> Wed, 18 Jun 2008 12:28:25 +0200 - -compizconfig-settings-manager (0.7.6-0ubuntu1) intrepid; urgency=low - - * new upstream release - - -- Michael Vogt <[email protected]> Mon, 02 Jun 2008 11:49:33 +0200 - -compizconfig-settings-manager (0.7.4-0ubuntu2) hardy; urgency=low - - * Add 03_fix_finnish_translation.patch since upstream again broken. - - -- Timo Jyrinki <[email protected]> Sat, 12 Apr 2008 11:53:15 +0300 - -compizconfig-settings-manager (0.7.4-0ubuntu1) hardy; urgency=low - - * new upstream release: - + Improved look of edge and button selector widgets - + Fixed automatically resolving conflicts - + Fixed a few bugs in the Profiles page - + Unified list settings with regular settings - + Fixed resolution of svg icons => sharp plugin icons - + Lots of smaller code cleanups - + Advanced Search rewrite - * 03_update_finish_translation.patch: - - dropped, does not apply anymore - * added Vcs-Bzr header - - -- Michael Vogt <[email protected]> Sat, 05 Apr 2008 13:36:23 +0200 - -compizconfig-settings-manager (0.7.2-0ubuntu2) hardy; urgency=low - - [ Timo Jyrinki ] - * Add 03_update_finish_translation.patch: - - Fix Finnish (fi) translation (LP: #204208). - * Add 04_desktop_file_add_translations.patch: - - Include Finnish .desktop item translation. - - [ Siegfried-Angel Gevatter Pujals (RainCT) ] - * 04_desktop_file_add_translations.patch: - - Remove deprecated Encoding entry. - - Add Catalan and Spanish translations. - - Add German translation thanks to Christian Ortner. - - -- Timo Jyrinki <[email protected]> Sun, 30 Mar 2008 18:12:13 +0200 - -compizconfig-settings-manager (0.7.2-0ubuntu1) hardy; urgency=low - - * new upstream release - * update depends - * update standards version - - -- Michael Vogt <[email protected]> Fri, 07 Mar 2008 15:17:32 +0100 - -compizconfig-settings-manager (0.6.99+git20080228-0ubuntu1) hardy; urgency=low - - * new git snapshot, includes upstream fixes for numerous ccm.* symbols needed by - e.g. recent simple-ccsm - - -- Mirco Müller (MacSlow) <[email protected]> Thu, 28 Feb 2008 14:49:57 +0000 - -compizconfig-settings-manager (0.6.99+git20080213-0ubuntu1) hardy; urgency=low - - * new git snapshot - - -- Michael Vogt <[email protected]> Thu, 14 Feb 2008 17:12:55 +0100 - -compizconfig-settings-manager (0.6.99+git20071201-0ubuntu1) hardy; urgency=low - - * new git HEAD snpashot - * fix missing dh_icons in postinst (thanks to Patrick Niklaus) - - -- Michael Vogt <[email protected]> Wed, 05 Dec 2007 22:05:46 +0100 - -compizconfig-settings-manager (0.5.2+git20070912-0ubuntu1) gutsy; urgency=low - - * new 0.6 snapshot - * fixes focus events and keyboard navigation - * debian/patches/02_rename_ccsm.patch: - - set name to "Advanced Desktop Effects Settings" - - -- Michael Vogt <[email protected]> Wed, 12 Sep 2007 19:45:56 +0200 - -compizconfig-settings-manager (0.5.2+git20070829-0ubuntu1) gutsy; urgency=low - - * upated to current 0.6.0 git branch - - -- Michael Vogt <[email protected]> Wed, 29 Aug 2007 10:49:43 +0200 - -compizconfig-settings-manager (0.5.2+git20070814-0ubuntu1) gutsy; urgency=low - - * updated to current git to get global-profile-reset feature - - -- Michael Vogt <[email protected]> Tue, 14 Aug 2007 20:25:36 +0200 - -compizconfig-settings-manager (0.5.2-0ubuntu1) gutsy; urgency=low - - * debian/rules: - - added langpack.mk to make the translation show up in LP - * new 0.5.2 release - - -- Michael Vogt <[email protected]> Tue, 14 Aug 2007 12:13:38 +0200 - -compizconfig-settings-manager (0.0+git20070810-0ubuntu1) gutsy; urgency=low - - * new git snapshot - - -- Michael Vogt <[email protected]> Fri, 10 Aug 2007 17:01:48 +0200 - -compizconfig-settings-manager (0.0+git20070803-0ubuntu1) gutsy; urgency=low - - * debian/patches/01_remove_prefix_mangling.diff: - - do not mess about with the prefix in setup.py so that it honors - it and not install into /usr/local - * debian/control: - - added missing python-gtk2 dependency (LP: #123131) - * new git snapshot that restores the i18n files - - -- Michael Vogt <[email protected]> Mon, 06 Aug 2007 19:30:51 +0200 - -compizconfig-settings-manager (0.0+git20070802-0ubuntu1) gutsy; urgency=low - - * new git snapshot - * switched to python-distutils.mk - - -- Michael Vogt <[email protected]> Thu, 02 Aug 2007 10:18:39 +0200 - -compizconfig-settings-manager (0.0+git20070712-0ubuntu1) gutsy; urgency=low - - * new git snapshot - - -- Michael Vogt <[email protected]> Thu, 12 Jul 2007 10:13:11 +0100 - -compizconfig-settings-manager (0.0+git20070703-0ubuntu2) gutsy; urgency=low - - * fix FTBFS (adding missing intltool build depends) - - -- Michael Vogt <[email protected]> Tue, 03 Jul 2007 19:40:28 +0200 - -compizconfig-settings-manager (0.0+git20070703-0ubuntu1) gutsy; urgency=low - - * new git snapshot (i18n support, tooltips and other goodies) - - -- Michael Vogt <[email protected]> Tue, 03 Jul 2007 16:55:45 +0200 - -compizconfig-settings-manager (0.0+git20070625-0ubuntu1) gutsy; urgency=low - - * new git snapshot (fixes animations settings) - - -- Michael Vogt <[email protected]> Mon, 25 Jun 2007 17:13:26 +0200 - -compizconfig-settings-manager (0.0+git20070622-0ubuntu1) gutsy; urgency=low - - * new git snapshot - - -- Michael Vogt <[email protected]> Fri, 22 Jun 2007 09:06:42 +0200 - -compizconfig-settings-manager (0.0+git20070620-0ubuntu1) gutsy; urgency=low - - * new git snapshot - * fix FTBFS - - -- Michael Vogt <[email protected]> Wed, 20 Jun 2007 15:08:11 +0200 - -compizconfig-settings-manager (0.0+git20070614-0ubuntu1) gutsy; urgency=low - - * initial ubuntu upload - - -- Michael Vogt <[email protected]> Thu, 14 Jun 2007 13:15:02 +0200 +compizconfig-settings-manager (0.9.5.92-0ubuntu4) quantal; urgency=low + + * Synchronize with Debian packaging git, remaining changes: + - Use a different source package name + - Use a newer upstream release + - Set Maintainer to Ubuntu Developers + - Recommend compiz plugins + - debian/patches/01_remove_redundant_sliders.patch: + Remove redundant sliders + - debian/patches/02_add_first_run_warning.patch: + Add a first run dialog providing a user warning + - debian/patches/03_disable_unity_checkbox.patch: + If in a Unity session, don't allow the user to disable Unity + from main view. + * debian/control: + - Use X-Python-Version instead of XS-Python-Version + - Bump Standards-Version to 3.9.3 + - Update Vcs fields + - Update debian/watch + + -- Dmitry Shachnev <[email protected]> Tue, 29 May 2012 17:47:28 +0400 + +ccsm (0.9.5.0-0.1) experimental; urgency=low + + * Non-maintainer upload. + * New upstream release. + * Remove 0001-Fix-a-crash-with-the-p-and-C-options.patch as applied upstream. + + -- Janos Guljas <[email protected]> Tue, 02 Aug 2011 04:06:29 +0200 + +ccsm (0.9.4-1) experimental; urgency=low + + * New upstream release. + * Add upstream patch to fix crash with the -p and -C options. + + -- Janos Guljas <[email protected]> Sat, 30 Apr 2011 20:37:43 +0200 + +ccsm (0.9.2.1+git20110224.cb1268cb-1) experimental; urgency=low + + + [ Janos Guljas ] + * New upstream release. + * Bump standards to 3.9.1. + * Switch to dpkg format 3.0 (quilt) + * Changed compizconfig-settings-manager architecture to "all". + * Rewrite debian/rules to use debhelper 7. + * Removed debian/install file. + * Updated debian/watch file. + * Add patch + * 01-fix-extension-dir.patch + - Remove Makefile so dh_python2 can install extension in a right place + + [ Sean Finney ] + * Add common 3.0 source format options + * Remove "local changes" snuck into packaging by dpkg-source 3.0 + * Explicitly remove ccsm.desktop during clean + * New patch to remove invalid "Compiz" category from ccsm.desktop + * Fix mis-named md.po -> mnk.po + * Remove leftover "installed_files" file during clean + + -- Sean Finney <[email protected]> Sun, 06 Mar 2011 00:36:36 +0000 + +ccsm (0.8.4-2) unstable; urgency=high + + * Fix FTBFS with python 2.6 and up, thanks to Jonathan Wiltshire and + Stefano Zacchiroli (Closes: #547810): + - Version the B-D on python-support. + - Install stuff from *-packages rather than site-packages. + * Stop recommending python-sexy, which was removed; most things should + be available in Gtk+ directly (Closes: #569919). + * Add Homepage field. + * Add watch file. + * Set urgency to “high” due to RC bugfix. + + -- Cyril Brulebois <[email protected]> Wed, 03 Mar 2010 18:23:41 +0100 + +ccsm (0.8.4-1) unstable; urgency=low + + * New upstream release. + * Make the package ready for Python 2.6; thanks to Josselin Mouette + for the report and Sandro Tosi for the patch (Closes: #547810). + + -- Sean Finney <[email protected]> Thu, 04 Feb 2010 17:46:32 +0100 + +ccsm (0.8.2-2) unstable; urgency=high + + * tighten dependency on python-compizconfig (Closes: #524273) + * RC bugfix for a package that has migrated to testing, urgency bumped. + + -- Sean Finney <[email protected]> Tue, 28 Apr 2009 19:29:33 +0200 + +ccsm (0.8.2-1) unstable; urgency=low + + * New upstream release. + * add gbp.conf for use with git-buildpackage + * update/massage local patches which are still needed + + -- Sean Finney <[email protected]> Tue, 07 Apr 2009 10:27:35 +0200 + +ccsm (0.7.6-3) unstable; urgency=low + + * Add explicit dependency on python-gtk2. Thanks to Sheridan Hutchinson + for reporting this (closes: #470541). + * Likewise for librsvg2-common (closes: #475745). + * Misc. lintian fixes: + - include full copyright stanza in debian/copyright + - include (an autogenerated) manpage for ccsm + - update Standards-Version to 3.8.0 (no changes needed) + + -- Sean Finney <[email protected]> Fri, 04 Jul 2008 18:55:07 +0200 + +ccsm (0.7.6-2) unstable; urgency=high + + [Julien Cristau] + * Add build-dep on intltool (closes: #484363). Thanks, Riku Voipio and + Michel Dänzer! + + -- Sean Finney <[email protected]> Mon, 09 Jun 2008 18:31:16 +0200 + +ccsm (0.7.6-1) unstable; urgency=low + + * New upstream release. + * Add/Remove extra cruft handling for build/clean cycle + + -- Sean Finney <[email protected]> Tue, 03 Jun 2008 01:08:21 +0200 + +ccsm (0.7.4-1) unstable; urgency=low + + * New upstream release. + * No longer need the pt_BR fixes, upstream has changed their translation. + * Update list of install files to reflect upstream changes. + * Temporary workaround for what seems to be breakage in python2.5 or + pygtk (see #481480, #481837, #481977), by closing stdin explicitly. + + -- Sean Finney <[email protected]> Mon, 19 May 2008 20:37:15 +0200 + +ccsm (0.6.1~git20071020.27380acc-1) unstable; urgency=low + + * New upstream (git snapshot) release. + * Fix pt_br translation of "reinicialização" Thanks to + Saulo Soares de Toledo (closes: #470920). + + -- Sean Finney <[email protected]> Sat, 15 Mar 2008 00:05:02 +0100 + +ccsm (0.6.0-4) unstable; urgency=low + + * Add --prefix to build target of setup.py as well as the existing install + target. Should fix remaining /usr/local references (closes: #460472). + + -- Sean Finney <[email protected]> Tue, 29 Jan 2008 08:18:49 +0100 + +ccsm (0.6.0-3) unstable; urgency=low + + [Sean Finney] + * Add Vcs-Git/Vcs-Browser fields. + * Remove versioned depends on python-support, since we don't use + any features that require >= 0.6, and this allows backporting to etch. + * change python file glob in debian/install to be more flexible. + + [Emilio Scalise] + * Specify supported python versions in debian/pyversions + (closes: #455418, #455750). + + -- Sean Finney <[email protected]> Fri, 21 Dec 2007 19:56:26 +0100 + +ccsm (0.6.0-2) unstable; urgency=low + + * Add explicit depends on python-compizconfig (closes: #455421). + + -- Sean Finney <[email protected]> Mon, 17 Dec 2007 08:39:34 +0100 + +ccsm (0.6.0-1) unstable; urgency=low + + * Initial Release (closes: #431750). + + -- Sean Finney <[email protected]> Sun, 02 Dec 2007 21:03:33 +0100 === modified file 'debian/compat' --- debian/compat 2007-06-14 11:16:10 +0000 +++ debian/compat 2012-05-29 13:50:26 +0000 @@ -1,1 +1,1 @@ -5 +7 === modified file 'debian/control' --- debian/control 2011-07-19 06:08:15 +0000 +++ debian/control 2012-05-29 13:50:26 +0000 @@ -1,20 +1,26 @@ Source: compizconfig-settings-manager -Section: x11 Priority: extra Maintainer: Ubuntu Developers <[email protected]> -XS-Python-Version: current -Build-Depends: cdbs, debhelper (>= 5), pkg-config, libcompizconfig0-dev, python-compizconfig (>= 0.9.5), python-central, libxml2-dev, libxslt1-dev, libglib2.0-dev, intltool -Standards-Version: 3.7.3 -Vcs-Bzr: http://code.launchpad.net/~compiz/compizconfig-settings-manager/ubuntu/ +XSBC-Original-Maintainer: Debian X Strike Force <[email protected]> +Build-Depends: debhelper (>= 7.0.50~), intltool, python (>= 2.6) +Standards-Version: 3.9.3 +X-Python-Version: >= 2.6 +Section: x11 +Vcs-Bzr: lp:~compiz/compizconfig-settings-manager/ubuntu +Vcs-Browser: http://code.launchpad.net/~compiz/compizconfig-settings-manager/ubuntu/ +Homepage: http://wiki.compiz.org/CCSM Package: compizconfig-settings-manager Architecture: all +Depends: ${misc:Depends}, ${python:Depends}, librsvg2-common, python-compizconfig (>= 0.9.0), python-gtk2 +Recommends: compiz-plugins, compiz-plugins-main XB-Python-Version: ${python:Versions} -Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, python-compizconfig (>= 0.9.0), python-gtk2 -Recommends: compiz-plugins, - compiz-plugins-main -Description: Compiz configuration settings manager - The OpenCompositing Project brings 3D desktop visual effects that improve - usability of the X Window System and provide increased productivity. +Description: Compizconfig Settings Manager + Compiz Fusion is the result of the re-unification of the Beryl-project + and the community around the Compiz Window Manager. It seeks to provide + an easy and fun-to-use windowing environment, allowing use of the + graphics hardware to provide impressive effects, amazing speed and + unrivalled usefulness. . - This package contains the compizconfig settings manager. + This package provides python-based "settings manager", a graphical interface + used to administer the various options for the compiz-fusion system. === modified file 'debian/copyright' --- debian/copyright 2007-06-19 15:07:45 +0000 +++ debian/copyright 2012-05-29 13:50:26 +0000 @@ -1,30 +1,27 @@ -This package was debianized by Michael Vogt <[email protected]> -Wed, 13 Jun 2007 15:59:31 +0200. - -It was downloaded from git://anongit.opencompositing.org/compcomm/compiz-configuration-system/tools/ccsm - -Upstream Author: Quinn Storm ([email protected]) - -Copyright: Copyright (C) 2007 Quinn Storm - -License: - - This package is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This package 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 General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this package; 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/GPL'. - -The Debian packaging is (C) 2007, Michael Vogt <[email protected]> and -is licensed under the GPL, see above. +This package was debianized by Sean Finney <[email protected]>. + +It was downloaded from git://anongit.compiz-fusion.org/fusion/plugins-main + +Upstream Authors (Lead Developers, see AUTHORS for full list): + + Patrick Niklaus <[email protected]> + Quinnstorm <[email protected]> + +Copyright (C) 2007 Quinn Storm + + This program and all files included in this package are free software; + you can redistribute it and/or modify it under the terms + of the GNU General Public License as published by the Free + Software Foundation; either version 2 of the License, + or (at your option) any later version. + + This program 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 General Public License for more details. + +On Debian systems, the complete text of the GNU General Public +License, version 2, can be found in /usr/share/common-licenses/GPL-2 + +The Debian packaging is (C) 2007, sean finney <[email protected]> and +is licensed under the GPL. === added file 'debian/docs' --- debian/docs 1970-01-01 00:00:00 +0000 +++ debian/docs 2012-05-29 13:50:26 +0000 @@ -0,0 +1,3 @@ +NEWS +AUTHORS +TODO === added file 'debian/gbp.conf' --- debian/gbp.conf 1970-01-01 00:00:00 +0000 +++ debian/gbp.conf 2012-05-29 13:50:26 +0000 @@ -0,0 +1,8 @@ +[DEFAULT] +debian-branch = debian-unstable +debian-tag = ccsm-%(version)s +upstream-branch = upstream-unstable +upstream-tag = %(version)s + +[git-dch] +meta = 1 === added file 'debian/manpages' --- debian/manpages 1970-01-01 00:00:00 +0000 +++ debian/manpages 2012-05-29 13:50:26 +0000 @@ -0,0 +1,1 @@ +debian/ccsm.1 === added file 'debian/patches/01-fix-extension-dir.patch' --- debian/patches/01-fix-extension-dir.patch 1970-01-01 00:00:00 +0000 +++ debian/patches/01-fix-extension-dir.patch 2012-05-29 13:50:26 +0000 @@ -0,0 +1,18 @@ +Description: Remove Makefile so dh_python2 can install extension in a right place +Author: Janos Guljas <[email protected]> +Last-Update: 2010-11-15 + +--- a/Makefile ++++ /dev/null +@@ -1,11 +0,0 @@ +-all: +- @python setup.py build --prefix=${PREFIX} +- +-install: all +- @python setup.py install --prefix=${PREFIX} +- +-uninstall: +- @python setup.py uninstall --prefix=${PREFIX} +- +-clean: +- rm -rf build/ === added file 'debian/patches/invalid_desktop_category.patch' --- debian/patches/invalid_desktop_category.patch 1970-01-01 00:00:00 +0000 +++ debian/patches/invalid_desktop_category.patch 2012-05-29 13:50:26 +0000 @@ -0,0 +1,9 @@ +--- ccsm.orig/ccsm.desktop.in ++++ ccsm/ccsm.desktop.in +@@ -6,5 +6,5 @@ Icon=ccsm + Exec=ccsm + Terminal=false + Type=Application +-Categories=Compiz;Settings;DesktopSettings; ++Categories=Settings;DesktopSettings; + StartupNotify=true === added file 'debian/patches/series' --- debian/patches/series 1970-01-01 00:00:00 +0000 +++ debian/patches/series 2012-05-29 13:50:26 +0000 @@ -0,0 +1,5 @@ +01-fix-extension-dir.patch +01_remove_redundant_sliders.patch +02_add_first_run_warning.patch +03_disable_unity_checkbox.patch +invalid_desktop_category.patch === modified file 'debian/rules' --- debian/rules 2011-07-19 06:07:30 +0000 +++ debian/rules 2012-05-29 13:50:26 +0000 @@ -1,10 +1,18 @@ #!/usr/bin/make -f -DEB_PYTHON_SYSTEM=pycentral - -include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/python-distutils.mk -include /usr/share/cdbs/1/rules/simple-patchsys.mk - -binary-install/compizconfig-settings-manager:: - dh_icons +%: + dh $@ --with python2 + +clean: + dh $@ + # setup.py seems to unconditionally generate this guy, even on clean + rm -f ccsm.desktop + # misnamed translation + if [ -f po/mnk.po ]; then mv po/mnk.po po/md.po; fi + # other misc junk + rm -f installed_files + +override_dh_auto_install: + # misnamed translation + if [ -f po/md.po ]; then mv po/md.po po/mnk.po; fi + python setup.py install --root=$(CURDIR)/debian/compizconfig-settings-manager --prefix=/usr --install-layout=deb === added directory 'debian/source' === added file 'debian/source/format' --- debian/source/format 1970-01-01 00:00:00 +0000 +++ debian/source/format 2012-05-29 13:50:26 +0000 @@ -0,0 +1,1 @@ +3.0 (quilt) === added file 'debian/source/local-options' --- debian/source/local-options 1970-01-01 00:00:00 +0000 +++ debian/source/local-options 2012-05-29 13:50:26 +0000 @@ -0,0 +1,2 @@ +unapply-patches +abort-on-upstream-changes === added file 'debian/watch' --- debian/watch 1970-01-01 00:00:00 +0000 +++ debian/watch 2012-05-29 13:50:26 +0000 @@ -0,0 +1,2 @@ +version=3 +http://releases.compiz.org/(\d)(.+)/ ccsm-([\d\.]+)\.tar\.bz2
_______________________________________________ Mailing list: https://launchpad.net/~compiz Post to : [email protected] Unsubscribe : https://launchpad.net/~compiz More help : https://help.launchpad.net/ListHelp

