Merge lp:~mc-return/compiz/compiz.merge-fix-URLs into lp:compiz/0.9.8

[MC Return]

Fixed URL references (now "https://launchpad.net/compiz")
"http://www.compiz-fusion.org" is not existent anymore and leads one to the "Web Design Manchester" web design business page (used in the About dialogue of CCSM for example) and
"http://www.compiz.org" is outdated and does not reflect actual development of Compiz anymore

Fixes URL references (now "https://launchpad.net/compiz")
"http://www.compiz-fusion.org" is not existent anymore and leads one to the "Web Design Manchester" web design business page (used in the About dialogue of CCSM for example) and
"http://www.compiz.org" is outdated and does not reflect actual development of Compiz anymore

[Sam Spilsbury (smspillaz)]

review: Approve

[Unity Merger (unity-merger)]

The Jenkins job https://jenkins.qa.ubuntu.com/job/automerge-compiz-core/82/console reported an error when processing this lp:~mc-return/compiz/compiz.merge-fix-URLs branch.
Not merging it.

[Sam Spilsbury (smspillaz)]

review: Approve

[Unity Merger (unity-merger)]

The Jenkins job https://jenkins.qa.ubuntu.com/job/automerge-compiz-core/120/console reported an error when processing this lp:~mc-return/compiz/compiz.merge-fix-URLs branch.
Not merging it.

[MC Return (mc-return)]

Seems that Jenkins complains about missing drive space and fails to even create directories...

[Sam Spilsbury (smspillaz)]

The space issue has apparently been fixed.

[Unity Merger (unity-merger)]

The Jenkins job https://jenkins.qa.ubuntu.com/job/automerge-compiz-core/157/console reported an error when processing this lp:~mc-return/compiz/compiz.merge-fix-URLs branch.
Not merging it.

[MC Return (mc-return)]

I could swear that it is Jenkins again...

[Unity Merger (unity-merger)]

The Jenkins job https://jenkins.qa.ubuntu.com/job/automerge-compiz-core/211/console reported an error when processing this lp:~mc-return/compiz/compiz.merge-fix-URLs branch.
Not merging it.

[Daniel van Vugt (vanvugt)]

Technically, www.compiz.org is still active and owned by us. But pointing to launchpad is better.

review: Approve

=== modified file 'cmake/FindCompiz.cmake'
--- cmake/FindCompiz.cmake	2012-08-21 10:11:51 +0000
+++ cmake/FindCompiz.cmake	2012-09-04 08:51:20 +0000
@@ -5,7 +5,7 @@
 #
 # FindCompiz
 #
-# This module finds Compiz (www.compiz.org). It uses the FindPkgConfig to
+# This module finds Compiz (https://launchpad.net/compiz). It uses the FindPkgConfig to
 # locate Compiz and adds the Compiz CMake module path to the CMake module path.
 # It also loads the CompizDefaults that sets all variables to compile Compiz
 # modules.

=== modified file 'compizconfig/ccsm/ccm/Widgets.py'
--- compizconfig/ccsm/ccm/Widgets.py	2011-02-12 18:24:14 +0000
+++ compizconfig/ccsm/ccm/Widgets.py	2012-09-04 08:51:20 +0000
@@ -1335,7 +1335,7 @@
         if IconTheme.lookup_icon("ccsm", 64, 0):
             icon = IconTheme.load_icon("ccsm", 64, 0)
             self.set_logo (icon)
-        self.set_website ("http://www.compiz-fusion.org")
+        self.set_website ("https://launchpad.net/compiz")
 
 # Error dialog
 #

=== modified file 'compizconfig/ccsm/setup.py'
--- compizconfig/ccsm/setup.py	2012-05-16 17:44:14 +0000
+++ compizconfig/ccsm/setup.py	2012-09-04 08:51:20 +0000
@@ -172,7 +172,7 @@
         description      = "CompizConfig Settings Manager",
         author           = "Patrick Niklaus",
         author_email     = "[e-mail]",
-        url              = "http://www.compiz.org/",
+        url              = "https://launchpad.net/compiz",
         license          = "GPL",
         data_files       = data_files,
         packages         = ["ccm"],

=== modified file 'compizconfig/compizconfig-python/setup.py'
--- compizconfig/compizconfig-python/setup.py	2012-08-16 09:11:10 +0000
+++ compizconfig/compizconfig-python/setup.py	2012-09-04 08:51:20 +0000
@@ -134,7 +134,7 @@
   name = "compizconfig-python",
   version = version,
   description      = "CompizConfig Python",
-  url              = "http://www.compiz.org/",
+  url              = "https://launchpad.net/compiz",
   license          = "GPL",
   maintainer	   = "Guillaume Seguin",
   maintainer_email = "[e-mail]",

=== modified file 'compizconfig/libcompizconfig/cmake/FindCompizConfig.cmake'
--- compizconfig/libcompizconfig/cmake/FindCompizConfig.cmake	2010-04-23 12:43:51 +0000
+++ compizconfig/libcompizconfig/cmake/FindCompizConfig.cmake	2012-09-04 08:51:20 +0000
@@ -2,7 +2,7 @@
 #
 # FindCompizConfig
 #
-# This module finds LibCompizConfig (www.compiz.org). It uses FindPkgConfig to
+# This module finds LibCompizConfig (https://launchpad.net/compiz). It uses FindPkgConfig to
 # locate CompizConfig and adds the CompizConfig CMake module path to the CMake
 # module path.  It also loads the LibCompizConfigDefaults that sets all variables
 # to compile Compiz modules. 

=== modified file 'kde/window-decorator-kde4/main.cpp'
--- kde/window-decorator-kde4/main.cpp	2010-08-20 15:29:13 +0000
+++ kde/window-decorator-kde4/main.cpp	2012-09-04 08:51:20 +0000
@@ -53,7 +53,7 @@
     options.add ("blur <type>", ki18n ("Blur type (none,titlebar,all)"), "none");
     KAboutData about("kde-window-decorator", "kwin", ki18n ("KDE Window Decorator"),
                      "0.0.1", KLocalizedString(), KAboutData::License_GPL,
-                     KLocalizedString(), KLocalizedString(), "http://www.compiz.org", 
+                     KLocalizedString(), KLocalizedString(), "https://launchpad.net/compiz", 
 		     "[e-mail]");
     KCmdLineArgs::init (argc, argv,
 			"kde-window-decorator",