Merge lp:~flimm/mct/packaging into lp:mct

Proposed by David D Lowe
Status: Needs review
Proposed branch: lp:~flimm/mct/packaging
Merge into: lp:mct
Diff against target: None lines
To merge this branch: bzr merge lp:~flimm/mct/packaging
Reviewer Review Type Date Requested Status
Isaiah Heyer Pending
Review via email: mp+4205@code.launchpad.net
To post a comment you must log in.
Revision history for this message
David D Lowe (flimm) wrote :

Packaged Metacity Themer for Ubuntu. I added directory named debian and a file called setup.py. Now you can package Metacity Themer by running:
dpkg-buildpackage
or
dpkg-buildpackage -S # if you want just the source package
You can upload source packages to launchpad PPAs.
I had to change some things in mct's code: I moved share/metacity_themer/lib/metacity_themer to the root of the branch, as it's a python package. It will be installed to /usr/lib/python2.5/site-packages and be in sys.path.
I also made the program to expect data files to be in /usr/share/metacity_theme/ , but only if it can't find them in its local directory, as would be expected if you're running it from source.
I recommend you merge this into the trunk, so that you can keep the changelog up to date (dch -e) and so on.

Revision history for this message
Isaiah Heyer (freshapplepy) wrote :

On Thu, 2009-03-05 at 16:30 +0000, David D Lowe wrote:
> David D Lowe has proposed merging lp:~flimm/mct/packaging into lp:mct.
>
> Requested reviews:
> Isaiah Heyer (freshapplepy)
>
> Packaged Metacity Themer for Ubuntu. I added directory named debian and a file called setup.py. Now you can package Metacity Themer by running:
> dpkg-buildpackage
> or
> dpkg-buildpackage -S # if you want just the source package
> You can upload source packages to launchpad PPAs.
> I had to change some things in mct's code: I moved share/metacity_themer/lib/metacity_themer to the root of the branch, as it's a python package. It will be installed to /usr/lib/python2.5/site-packages and be in sys.path.
> I also made the program to expect data files to be in /usr/share/metacity_theme/ , but only if it can't find them in its local directory, as would be expected if you're running it from source.
> I recommend you merge this into the trunk, so that you can keep the changelog up to date (dch -e) and so on.
>

I already had a debian directory, I just hadn't added it to the branch
yet. I didn't really want the metacity_themer python package in the
python package directory because nothing is going to use it except the
program.

Since you moved everything around does it still run?Can it still find
all the glade files and translation stuff and images?

Revision history for this message
David D Lowe (flimm) wrote :

Yes, it does still run. I had to change the "upstream" code a bit to make it run though. It looks in the local directories first for files, and then looks in their public locations (/usr/share and so on).
If you don't want a debian/ directory in the main branch, I could research bzr builddeb which lets you keep maintainer files in a separate branch. You'd still need to keep the setup.py script in the main branch, though, which is pretty common for python applications.

Unmerged revisions

56. By David D Lowe on 2009-03-05

Added a man page and .desktop file, and installed the icon in its correct place.
Corrected the version of the program to 0.9alpha1

55. By David D Lowe on 2009-03-05

Added debian directory and prepared program for packaging into a .deb
Added distutils script setup.py
Some changes were made to the code to make it aware of the location of installed files.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== added file 'MANIFEST.in'
2--- MANIFEST.in 1970-01-01 00:00:00 +0000
3+++ MANIFEST.in 2009-03-05 15:03:56 +0000
4@@ -0,0 +1,2 @@
5+recursive-include share *
6+include bin/metacity_themer
7
8=== renamed file 'bin/metacity_themer.py' => 'bin/metacity_themer'
9--- bin/metacity_themer.py 2009-02-25 20:02:06 +0000
10+++ bin/metacity_themer 2009-03-05 15:03:56 +0000
11@@ -1,9 +1,9 @@
12 #!/usr/bin/env python
13
14 import sys
15-from os.path import dirname, join, pardir
16-sys.path.insert(0, join(dirname(__file__), pardir,'share',
17- 'metacity_themer','lib'))
18+from os.path import dirname, join, pardir, exists
19+if exists(join(dirname(__file__), pardir, 'metacity_themer')):
20+ sys.path.insert(0, join(dirname(__file__), pardir))
21
22 from metacity_themer import main
23
24
25=== added directory 'debian'
26=== added file 'debian/changelog'
27--- debian/changelog 1970-01-01 00:00:00 +0000
28+++ debian/changelog 2009-03-05 16:16:47 +0000
29@@ -0,0 +1,7 @@
30+metacity-themer (0.9~alpha1-0~ppa1) intrepid; urgency=low
31+
32+ * Packaged Metacity Themer, with an icon, a man page and .desktop file.
33+
34+ -- David D Lowe <daviddlowe.flimm@gmail.com> Thu, 05 Mar 2009 17:01:36 +0100
35+
36+
37
38=== added file 'debian/compat'
39--- debian/compat 1970-01-01 00:00:00 +0000
40+++ debian/compat 2009-03-05 15:03:56 +0000
41@@ -0,0 +1,1 @@
42+7
43
44=== added file 'debian/control'
45--- debian/control 1970-01-01 00:00:00 +0000
46+++ debian/control 2009-03-05 15:03:56 +0000
47@@ -0,0 +1,17 @@
48+Source: metacity-themer
49+Section: misc
50+Priority: optional
51+Maintainer: David D Lowe <daviddlowe.flimm@gmail.com>
52+Build-Depends: cdbs (>= 0.4.49), debhelper (>= 7), python-central (>= 0.6)
53+Standards-Version: 3.7.3
54+XS-Python-Version: >= 2.5
55+Homepage: http://launchpad.net/mct
56+Vcs-browser: https://code.launchpad.net/~freshapplepy/mct/main
57+Vcs-Bzr: https://code.launchpad.net/~freshapplepy/mct/main
58+
59+Package: metacity-themer
60+Architecture: all
61+Depends: python-gtk2 (>= 2.4), python-gnome2, ${misc:Depends}, ${python:Depends}
62+XB-Python-Version: {python:Versions}
63+Description: metacity themer
64+ Edit Metacity window decoration themes (Ubuntu uses these) and see the changes in real time.
65
66=== added file 'debian/copyright'
67--- debian/copyright 1970-01-01 00:00:00 +0000
68+++ debian/copyright 2009-03-05 15:03:56 +0000
69@@ -0,0 +1,647 @@
70+This package was debianized by David D Lowe <daviddlowe.flimm@gmail.com> on
71+Thu, 05 Mar 2009 14:37:54 +0100.
72+
73+It was downloaded from https://launchpad.net/mct
74+
75+Upstream Author(s):
76+
77+ Isaiah Heyer <freshapplepy@gmail.com>
78+
79+Copyright:
80+
81+ <Copyright (C) 2008-2009 Isaiah Heyer>
82+
83+License:
84+
85+ GNU GENERAL PUBLIC LICENSE
86+ Version 3, 29 June 2007
87+
88+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
89+ Everyone is permitted to copy and distribute verbatim copies
90+ of this license document, but changing it is not allowed.
91+
92+ Preamble
93+
94+ The GNU General Public License is a free, copyleft license for
95+software and other kinds of works.
96+
97+ The licenses for most software and other practical works are designed
98+to take away your freedom to share and change the works. By contrast,
99+the GNU General Public License is intended to guarantee your freedom to
100+share and change all versions of a program--to make sure it remains free
101+software for all its users. We, the Free Software Foundation, use the
102+GNU General Public License for most of our software; it applies also to
103+any other work released this way by its authors. You can apply it to
104+your programs, too.
105+
106+ When we speak of free software, we are referring to freedom, not
107+price. Our General Public Licenses are designed to make sure that you
108+have the freedom to distribute copies of free software (and charge for
109+them if you wish), that you receive source code or can get it if you
110+want it, that you can change the software or use pieces of it in new
111+free programs, and that you know you can do these things.
112+
113+ To protect your rights, we need to prevent others from denying you
114+these rights or asking you to surrender the rights. Therefore, you have
115+certain responsibilities if you distribute copies of the software, or if
116+you modify it: responsibilities to respect the freedom of others.
117+
118+ For example, if you distribute copies of such a program, whether
119+gratis or for a fee, you must pass on to the recipients the same
120+freedoms that you received. You must make sure that they, too, receive
121+or can get the source code. And you must show them these terms so they
122+know their rights.
123+
124+ Developers that use the GNU GPL protect your rights with two steps:
125+(1) assert copyright on the software, and (2) offer you this License
126+giving you legal permission to copy, distribute and/or modify it.
127+
128+ For the developers' and authors' protection, the GPL clearly explains
129+that there is no warranty for this free software. For both users' and
130+authors' sake, the GPL requires that modified versions be marked as
131+changed, so that their problems will not be attributed erroneously to
132+authors of previous versions.
133+
134+ Some devices are designed to deny users access to install or run
135+modified versions of the software inside them, although the manufacturer
136+can do so. This is fundamentally incompatible with the aim of
137+protecting users' freedom to change the software. The systematic
138+pattern of such abuse occurs in the area of products for individuals to
139+use, which is precisely where it is most unacceptable. Therefore, we
140+have designed this version of the GPL to prohibit the practice for those
141+products. If such problems arise substantially in other domains, we
142+stand ready to extend this provision to those domains in future versions
143+of the GPL, as needed to protect the freedom of users.
144+
145+ Finally, every program is threatened constantly by software patents.
146+States should not allow patents to restrict development and use of
147+software on general-purpose computers, but in those that do, we wish to
148+avoid the special danger that patents applied to a free program could
149+make it effectively proprietary. To prevent this, the GPL assures that
150+patents cannot be used to render the program non-free.
151+
152+ The precise terms and conditions for copying, distribution and
153+modification follow.
154+
155+ TERMS AND CONDITIONS
156+
157+ 0. Definitions.
158+
159+ "This License" refers to version 3 of the GNU General Public License.
160+
161+ "Copyright" also means copyright-like laws that apply to other kinds of
162+works, such as semiconductor masks.
163+
164+ "The Program" refers to any copyrightable work licensed under this
165+License. Each licensee is addressed as "you". "Licensees" and
166+"recipients" may be individuals or organizations.
167+
168+ To "modify" a work means to copy from or adapt all or part of the work
169+in a fashion requiring copyright permission, other than the making of an
170+exact copy. The resulting work is called a "modified version" of the
171+earlier work or a work "based on" the earlier work.
172+
173+ A "covered work" means either the unmodified Program or a work based
174+on the Program.
175+
176+ To "propagate" a work means to do anything with it that, without
177+permission, would make you directly or secondarily liable for
178+infringement under applicable copyright law, except executing it on a
179+computer or modifying a private copy. Propagation includes copying,
180+distribution (with or without modification), making available to the
181+public, and in some countries other activities as well.
182+
183+ To "convey" a work means any kind of propagation that enables other
184+parties to make or receive copies. Mere interaction with a user through
185+a computer network, with no transfer of a copy, is not conveying.
186+
187+ An interactive user interface displays "Appropriate Legal Notices"
188+to the extent that it includes a convenient and prominently visible
189+feature that (1) displays an appropriate copyright notice, and (2)
190+tells the user that there is no warranty for the work (except to the
191+extent that warranties are provided), that licensees may convey the
192+work under this License, and how to view a copy of this License. If
193+the interface presents a list of user commands or options, such as a
194+menu, a prominent item in the list meets this criterion.
195+
196+ 1. Source Code.
197+
198+ The "source code" for a work means the preferred form of the work
199+for making modifications to it. "Object code" means any non-source
200+form of a work.
201+
202+ A "Standard Interface" means an interface that either is an official
203+standard defined by a recognized standards body, or, in the case of
204+interfaces specified for a particular programming language, one that
205+is widely used among developers working in that language.
206+
207+ The "System Libraries" of an executable work include anything, other
208+than the work as a whole, that (a) is included in the normal form of
209+packaging a Major Component, but which is not part of that Major
210+Component, and (b) serves only to enable use of the work with that
211+Major Component, or to implement a Standard Interface for which an
212+implementation is available to the public in source code form. A
213+"Major Component", in this context, means a major essential component
214+(kernel, window system, and so on) of the specific operating system
215+(if any) on which the executable work runs, or a compiler used to
216+produce the work, or an object code interpreter used to run it.
217+
218+ The "Corresponding Source" for a work in object code form means all
219+the source code needed to generate, install, and (for an executable
220+work) run the object code and to modify the work, including scripts to
221+control those activities. However, it does not include the work's
222+System Libraries, or general-purpose tools or generally available free
223+programs which are used unmodified in performing those activities but
224+which are not part of the work. For example, Corresponding Source
225+includes interface definition files associated with source files for
226+the work, and the source code for shared libraries and dynamically
227+linked subprograms that the work is specifically designed to require,
228+such as by intimate data communication or control flow between those
229+subprograms and other parts of the work.
230+
231+ The Corresponding Source need not include anything that users
232+can regenerate automatically from other parts of the Corresponding
233+Source.
234+
235+ The Corresponding Source for a work in source code form is that
236+same work.
237+
238+ 2. Basic Permissions.
239+
240+ All rights granted under this License are granted for the term of
241+copyright on the Program, and are irrevocable provided the stated
242+conditions are met. This License explicitly affirms your unlimited
243+permission to run the unmodified Program. The output from running a
244+covered work is covered by this License only if the output, given its
245+content, constitutes a covered work. This License acknowledges your
246+rights of fair use or other equivalent, as provided by copyright law.
247+
248+ You may make, run and propagate covered works that you do not
249+convey, without conditions so long as your license otherwise remains
250+in force. You may convey covered works to others for the sole purpose
251+of having them make modifications exclusively for you, or provide you
252+with facilities for running those works, provided that you comply with
253+the terms of this License in conveying all material for which you do
254+not control copyright. Those thus making or running the covered works
255+for you must do so exclusively on your behalf, under your direction
256+and control, on terms that prohibit them from making any copies of
257+your copyrighted material outside their relationship with you.
258+
259+ Conveying under any other circumstances is permitted solely under
260+the conditions stated below. Sublicensing is not allowed; section 10
261+makes it unnecessary.
262+
263+ 3. Protecting Users' Legal Rights From Anti-Circumvention Law.
264+
265+ No covered work shall be deemed part of an effective technological
266+measure under any applicable law fulfilling obligations under article
267+11 of the WIPO copyright treaty adopted on 20 December 1996, or
268+similar laws prohibiting or restricting circumvention of such
269+measures.
270+
271+ When you convey a covered work, you waive any legal power to forbid
272+circumvention of technological measures to the extent such circumvention
273+is effected by exercising rights under this License with respect to
274+the covered work, and you disclaim any intention to limit operation or
275+modification of the work as a means of enforcing, against the work's
276+users, your or third parties' legal rights to forbid circumvention of
277+technological measures.
278+
279+ 4. Conveying Verbatim Copies.
280+
281+ You may convey verbatim copies of the Program's source code as you
282+receive it, in any medium, provided that you conspicuously and
283+appropriately publish on each copy an appropriate copyright notice;
284+keep intact all notices stating that this License and any
285+non-permissive terms added in accord with section 7 apply to the code;
286+keep intact all notices of the absence of any warranty; and give all
287+recipients a copy of this License along with the Program.
288+
289+ You may charge any price or no price for each copy that you convey,
290+and you may offer support or warranty protection for a fee.
291+
292+ 5. Conveying Modified Source Versions.
293+
294+ You may convey a work based on the Program, or the modifications to
295+produce it from the Program, in the form of source code under the
296+terms of section 4, provided that you also meet all of these conditions:
297+
298+ a) The work must carry prominent notices stating that you modified
299+ it, and giving a relevant date.
300+
301+ b) The work must carry prominent notices stating that it is
302+ released under this License and any conditions added under section
303+ 7. This requirement modifies the requirement in section 4 to
304+ "keep intact all notices".
305+
306+ c) You must license the entire work, as a whole, under this
307+ License to anyone who comes into possession of a copy. This
308+ License will therefore apply, along with any applicable section 7
309+ additional terms, to the whole of the work, and all its parts,
310+ regardless of how they are packaged. This License gives no
311+ permission to license the work in any other way, but it does not
312+ invalidate such permission if you have separately received it.
313+
314+ d) If the work has interactive user interfaces, each must display
315+ Appropriate Legal Notices; however, if the Program has interactive
316+ interfaces that do not display Appropriate Legal Notices, your
317+ work need not make them do so.
318+
319+ A compilation of a covered work with other separate and independent
320+works, which are not by their nature extensions of the covered work,
321+and which are not combined with it such as to form a larger program,
322+in or on a volume of a storage or distribution medium, is called an
323+"aggregate" if the compilation and its resulting copyright are not
324+used to limit the access or legal rights of the compilation's users
325+beyond what the individual works permit. Inclusion of a covered work
326+in an aggregate does not cause this License to apply to the other
327+parts of the aggregate.
328+
329+ 6. Conveying Non-Source Forms.
330+
331+ You may convey a covered work in object code form under the terms
332+of sections 4 and 5, provided that you also convey the
333+machine-readable Corresponding Source under the terms of this License,
334+in one of these ways:
335+
336+ a) Convey the object code in, or embodied in, a physical product
337+ (including a physical distribution medium), accompanied by the
338+ Corresponding Source fixed on a durable physical medium
339+ customarily used for software interchange.
340+
341+ b) Convey the object code in, or embodied in, a physical product
342+ (including a physical distribution medium), accompanied by a
343+ written offer, valid for at least three years and valid for as
344+ long as you offer spare parts or customer support for that product
345+ model, to give anyone who possesses the object code either (1) a
346+ copy of the Corresponding Source for all the software in the
347+ product that is covered by this License, on a durable physical
348+ medium customarily used for software interchange, for a price no
349+ more than your reasonable cost of physically performing this
350+ conveying of source, or (2) access to copy the
351+ Corresponding Source from a network server at no charge.
352+
353+ c) Convey individual copies of the object code with a copy of the
354+ written offer to provide the Corresponding Source. This
355+ alternative is allowed only occasionally and noncommercially, and
356+ only if you received the object code with such an offer, in accord
357+ with subsection 6b.
358+
359+ d) Convey the object code by offering access from a designated
360+ place (gratis or for a charge), and offer equivalent access to the
361+ Corresponding Source in the same way through the same place at no
362+ further charge. You need not require recipients to copy the
363+ Corresponding Source along with the object code. If the place to
364+ copy the object code is a network server, the Corresponding Source
365+ may be on a different server (operated by you or a third party)
366+ that supports equivalent copying facilities, provided you maintain
367+ clear directions next to the object code saying where to find the
368+ Corresponding Source. Regardless of what server hosts the
369+ Corresponding Source, you remain obligated to ensure that it is
370+ available for as long as needed to satisfy these requirements.
371+
372+ e) Convey the object code using peer-to-peer transmission, provided
373+ you inform other peers where the object code and Corresponding
374+ Source of the work are being offered to the general public at no
375+ charge under subsection 6d.
376+
377+ A separable portion of the object code, whose source code is excluded
378+from the Corresponding Source as a System Library, need not be
379+included in conveying the object code work.
380+
381+ A "User Product" is either (1) a "consumer product", which means any
382+tangible personal property which is normally used for personal, family,
383+or household purposes, or (2) anything designed or sold for incorporation
384+into a dwelling. In determining whether a product is a consumer product,
385+doubtful cases shall be resolved in favor of coverage. For a particular
386+product received by a particular user, "normally used" refers to a
387+typical or common use of that class of product, regardless of the status
388+of the particular user or of the way in which the particular user
389+actually uses, or expects or is expected to use, the product. A product
390+is a consumer product regardless of whether the product has substantial
391+commercial, industrial or non-consumer uses, unless such uses represent
392+the only significant mode of use of the product.
393+
394+ "Installation Information" for a User Product means any methods,
395+procedures, authorization keys, or other information required to install
396+and execute modified versions of a covered work in that User Product from
397+a modified version of its Corresponding Source. The information must
398+suffice to ensure that the continued functioning of the modified object
399+code is in no case prevented or interfered with solely because
400+modification has been made.
401+
402+ If you convey an object code work under this section in, or with, or
403+specifically for use in, a User Product, and the conveying occurs as
404+part of a transaction in which the right of possession and use of the
405+User Product is transferred to the recipient in perpetuity or for a
406+fixed term (regardless of how the transaction is characterized), the
407+Corresponding Source conveyed under this section must be accompanied
408+by the Installation Information. But this requirement does not apply
409+if neither you nor any third party retains the ability to install
410+modified object code on the User Product (for example, the work has
411+been installed in ROM).
412+
413+ The requirement to provide Installation Information does not include a
414+requirement to continue to provide support service, warranty, or updates
415+for a work that has been modified or installed by the recipient, or for
416+the User Product in which it has been modified or installed. Access to a
417+network may be denied when the modification itself materially and
418+adversely affects the operation of the network or violates the rules and
419+protocols for communication across the network.
420+
421+ Corresponding Source conveyed, and Installation Information provided,
422+in accord with this section must be in a format that is publicly
423+documented (and with an implementation available to the public in
424+source code form), and must require no special password or key for
425+unpacking, reading or copying.
426+
427+ 7. Additional Terms.
428+
429+ "Additional permissions" are terms that supplement the terms of this
430+License by making exceptions from one or more of its conditions.
431+Additional permissions that are applicable to the entire Program shall
432+be treated as though they were included in this License, to the extent
433+that they are valid under applicable law. If additional permissions
434+apply only to part of the Program, that part may be used separately
435+under those permissions, but the entire Program remains governed by
436+this License without regard to the additional permissions.
437+
438+ When you convey a copy of a covered work, you may at your option
439+remove any additional permissions from that copy, or from any part of
440+it. (Additional permissions may be written to require their own
441+removal in certain cases when you modify the work.) You may place
442+additional permissions on material, added by you to a covered work,
443+for which you have or can give appropriate copyright permission.
444+
445+ Notwithstanding any other provision of this License, for material you
446+add to a covered work, you may (if authorized by the copyright holders of
447+that material) supplement the terms of this License with terms:
448+
449+ a) Disclaiming warranty or limiting liability differently from the
450+ terms of sections 15 and 16 of this License; or
451+
452+ b) Requiring preservation of specified reasonable legal notices or
453+ author attributions in that material or in the Appropriate Legal
454+ Notices displayed by works containing it; or
455+
456+ c) Prohibiting misrepresentation of the origin of that material, or
457+ requiring that modified versions of such material be marked in
458+ reasonable ways as different from the original version; or
459+
460+ d) Limiting the use for publicity purposes of names of licensors or
461+ authors of the material; or
462+
463+ e) Declining to grant rights under trademark law for use of some
464+ trade names, trademarks, or service marks; or
465+
466+ f) Requiring indemnification of licensors and authors of that
467+ material by anyone who conveys the material (or modified versions of
468+ it) with contractual assumptions of liability to the recipient, for
469+ any liability that these contractual assumptions directly impose on
470+ those licensors and authors.
471+
472+ All other non-permissive additional terms are considered "further
473+restrictions" within the meaning of section 10. If the Program as you
474+received it, or any part of it, contains a notice stating that it is
475+governed by this License along with a term that is a further
476+restriction, you may remove that term. If a license document contains
477+a further restriction but permits relicensing or conveying under this
478+License, you may add to a covered work material governed by the terms
479+of that license document, provided that the further restriction does
480+not survive such relicensing or conveying.
481+
482+ If you add terms to a covered work in accord with this section, you
483+must place, in the relevant source files, a statement of the
484+additional terms that apply to those files, or a notice indicating
485+where to find the applicable terms.
486+
487+ Additional terms, permissive or non-permissive, may be stated in the
488+form of a separately written license, or stated as exceptions;
489+the above requirements apply either way.
490+
491+ 8. Termination.
492+
493+ You may not propagate or modify a covered work except as expressly
494+provided under this License. Any attempt otherwise to propagate or
495+modify it is void, and will automatically terminate your rights under
496+this License (including any patent licenses granted under the third
497+paragraph of section 11).
498+
499+ However, if you cease all violation of this License, then your
500+license from a particular copyright holder is reinstated (a)
501+provisionally, unless and until the copyright holder explicitly and
502+finally terminates your license, and (b) permanently, if the copyright
503+holder fails to notify you of the violation by some reasonable means
504+prior to 60 days after the cessation.
505+
506+ Moreover, your license from a particular copyright holder is
507+reinstated permanently if the copyright holder notifies you of the
508+violation by some reasonable means, this is the first time you have
509+received notice of violation of this License (for any work) from that
510+copyright holder, and you cure the violation prior to 30 days after
511+your receipt of the notice.
512+
513+ Termination of your rights under this section does not terminate the
514+licenses of parties who have received copies or rights from you under
515+this License. If your rights have been terminated and not permanently
516+reinstated, you do not qualify to receive new licenses for the same
517+material under section 10.
518+
519+ 9. Acceptance Not Required for Having Copies.
520+
521+ You are not required to accept this License in order to receive or
522+run a copy of the Program. Ancillary propagation of a covered work
523+occurring solely as a consequence of using peer-to-peer transmission
524+to receive a copy likewise does not require acceptance. However,
525+nothing other than this License grants you permission to propagate or
526+modify any covered work. These actions infringe copyright if you do
527+not accept this License. Therefore, by modifying or propagating a
528+covered work, you indicate your acceptance of this License to do so.
529+
530+ 10. Automatic Licensing of Downstream Recipients.
531+
532+ Each time you convey a covered work, the recipient automatically
533+receives a license from the original licensors, to run, modify and
534+propagate that work, subject to this License. You are not responsible
535+for enforcing compliance by third parties with this License.
536+
537+ An "entity transaction" is a transaction transferring control of an
538+organization, or substantially all assets of one, or subdividing an
539+organization, or merging organizations. If propagation of a covered
540+work results from an entity transaction, each party to that
541+transaction who receives a copy of the work also receives whatever
542+licenses to the work the party's predecessor in interest had or could
543+give under the previous paragraph, plus a right to possession of the
544+Corresponding Source of the work from the predecessor in interest, if
545+the predecessor has it or can get it with reasonable efforts.
546+
547+ You may not impose any further restrictions on the exercise of the
548+rights granted or affirmed under this License. For example, you may
549+not impose a license fee, royalty, or other charge for exercise of
550+rights granted under this License, and you may not initiate litigation
551+(including a cross-claim or counterclaim in a lawsuit) alleging that
552+any patent claim is infringed by making, using, selling, offering for
553+sale, or importing the Program or any portion of it.
554+
555+ 11. Patents.
556+
557+ A "contributor" is a copyright holder who authorizes use under this
558+License of the Program or a work on which the Program is based. The
559+work thus licensed is called the contributor's "contributor version".
560+
561+ A contributor's "essential patent claims" are all patent claims
562+owned or controlled by the contributor, whether already acquired or
563+hereafter acquired, that would be infringed by some manner, permitted
564+by this License, of making, using, or selling its contributor version,
565+but do not include claims that would be infringed only as a
566+consequence of further modification of the contributor version. For
567+purposes of this definition, "control" includes the right to grant
568+patent sublicenses in a manner consistent with the requirements of
569+this License.
570+
571+ Each contributor grants you a non-exclusive, worldwide, royalty-free
572+patent license under the contributor's essential patent claims, to
573+make, use, sell, offer for sale, import and otherwise run, modify and
574+propagate the contents of its contributor version.
575+
576+ In the following three paragraphs, a "patent license" is any express
577+agreement or commitment, however denominated, not to enforce a patent
578+(such as an express permission to practice a patent or covenant not to
579+sue for patent infringement). To "grant" such a patent license to a
580+party means to make such an agreement or commitment not to enforce a
581+patent against the party.
582+
583+ If you convey a covered work, knowingly relying on a patent license,
584+and the Corresponding Source of the work is not available for anyone
585+to copy, free of charge and under the terms of this License, through a
586+publicly available network server or other readily accessible means,
587+then you must either (1) cause the Corresponding Source to be so
588+available, or (2) arrange to deprive yourself of the benefit of the
589+patent license for this particular work, or (3) arrange, in a manner
590+consistent with the requirements of this License, to extend the patent
591+license to downstream recipients. "Knowingly relying" means you have
592+actual knowledge that, but for the patent license, your conveying the
593+covered work in a country, or your recipient's use of the covered work
594+in a country, would infringe one or more identifiable patents in that
595+country that you have reason to believe are valid.
596+
597+ If, pursuant to or in connection with a single transaction or
598+arrangement, you convey, or propagate by procuring conveyance of, a
599+covered work, and grant a patent license to some of the parties
600+receiving the covered work authorizing them to use, propagate, modify
601+or convey a specific copy of the covered work, then the patent license
602+you grant is automatically extended to all recipients of the covered
603+work and works based on it.
604+
605+ A patent license is "discriminatory" if it does not include within
606+the scope of its coverage, prohibits the exercise of, or is
607+conditioned on the non-exercise of one or more of the rights that are
608+specifically granted under this License. You may not convey a covered
609+work if you are a party to an arrangement with a third party that is
610+in the business of distributing software, under which you make payment
611+to the third party based on the extent of your activity of conveying
612+the work, and under which the third party grants, to any of the
613+parties who would receive the covered work from you, a discriminatory
614+patent license (a) in connection with copies of the covered work
615+conveyed by you (or copies made from those copies), or (b) primarily
616+for and in connection with specific products or compilations that
617+contain the covered work, unless you entered into that arrangement,
618+or that patent license was granted, prior to 28 March 2007.
619+
620+ Nothing in this License shall be construed as excluding or limiting
621+any implied license or other defenses to infringement that may
622+otherwise be available to you under applicable patent law.
623+
624+ 12. No Surrender of Others' Freedom.
625+
626+ If conditions are imposed on you (whether by court order, agreement or
627+otherwise) that contradict the conditions of this License, they do not
628+excuse you from the conditions of this License. If you cannot convey a
629+covered work so as to satisfy simultaneously your obligations under this
630+License and any other pertinent obligations, then as a consequence you may
631+not convey it at all. For example, if you agree to terms that obligate you
632+to collect a royalty for further conveying from those to whom you convey
633+the Program, the only way you could satisfy both those terms and this
634+License would be to refrain entirely from conveying the Program.
635+
636+ 13. Use with the GNU Affero General Public License.
637+
638+ Notwithstanding any other provision of this License, you have
639+permission to link or combine any covered work with a work licensed
640+under version 3 of the GNU Affero General Public License into a single
641+combined work, and to convey the resulting work. The terms of this
642+License will continue to apply to the part which is the covered work,
643+but the special requirements of the GNU Affero General Public License,
644+section 13, concerning interaction through a network will apply to the
645+combination as such.
646+
647+ 14. Revised Versions of this License.
648+
649+ The Free Software Foundation may publish revised and/or new versions of
650+the GNU General Public License from time to time. Such new versions will
651+be similar in spirit to the present version, but may differ in detail to
652+address new problems or concerns.
653+
654+ Each version is given a distinguishing version number. If the
655+Program specifies that a certain numbered version of the GNU General
656+Public License "or any later version" applies to it, you have the
657+option of following the terms and conditions either of that numbered
658+version or of any later version published by the Free Software
659+Foundation. If the Program does not specify a version number of the
660+GNU General Public License, you may choose any version ever published
661+by the Free Software Foundation.
662+
663+ If the Program specifies that a proxy can decide which future
664+versions of the GNU General Public License can be used, that proxy's
665+public statement of acceptance of a version permanently authorizes you
666+to choose that version for the Program.
667+
668+ Later license versions may give you additional or different
669+permissions. However, no additional obligations are imposed on any
670+author or copyright holder as a result of your choosing to follow a
671+later version.
672+
673+ 15. Disclaimer of Warranty.
674+
675+ THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
676+APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
677+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
678+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
679+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
680+PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
681+IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
682+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
683+
684+ 16. Limitation of Liability.
685+
686+ IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
687+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
688+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
689+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
690+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
691+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
692+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
693+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
694+SUCH DAMAGES.
695+
696+ 17. Interpretation of Sections 15 and 16.
697+
698+ If the disclaimer of warranty and limitation of liability provided
699+above cannot be given local legal effect according to their terms,
700+reviewing courts shall apply local law that most closely approximates
701+an absolute waiver of all civil liability in connection with the
702+Program, unless a warranty or assumption of liability accompanies a
703+copy of the Program in return for a fee.
704+
705+ END OF TERMS AND CONDITIONS
706+
707+
708+On Debian systems, the complete text of the GNU General
709+Public License can be found in `/usr/share/common-licenses/GPL'.
710+
711+The Debian packaging is (C) 2009, David D Lowe <daviddlowe.flimm@gmail.com> and
712+is licensed under the GPL, see above.
713+
714+
715+# Please also look if there are files or directories which have a
716+# different copyright/license attached and list them here.
717
718=== added file 'debian/docs'
719--- debian/docs 1970-01-01 00:00:00 +0000
720+++ debian/docs 2009-03-05 15:03:56 +0000
721@@ -0,0 +1,1 @@
722+README
723
724=== added file 'debian/metacity_themer.1'
725--- debian/metacity_themer.1 1970-01-01 00:00:00 +0000
726+++ debian/metacity_themer.1 2009-03-05 16:16:47 +0000
727@@ -0,0 +1,11 @@
728+.TH METACITY THEMER 1 "March 2009" "version 0.9"
729+.SH NAME
730+metacity_themer \- Edit Metacity window decoration themes (Ubuntu uses these) and see the changes in real time.
731+.SH SYNOPSIS
732+.B metacity_themer
733+.SH DESCRIPTION
734+Metacity Themer allows you to open a metacity theme from its directory, and modify it. Changes are viewed real time,
735+which makes theme designing quicker and easier.
736+.SH AUTHOR
737+Isaiah Heyer (freshapplepy@gmail.com)
738+
739
740=== added file 'debian/rules'
741--- debian/rules 1970-01-01 00:00:00 +0000
742+++ debian/rules 2009-03-05 16:16:47 +0000
743@@ -0,0 +1,10 @@
744+#!/usr/bin/make -f
745+
746+DEB_PYTHON_SYSTEM=pycentral
747+
748+include /usr/share/cdbs/1/rules/debhelper.mk
749+include /usr/share/cdbs/1/class/python-distutils.mk
750+
751+DEB_INSTALL_MANPAGES_metacity-themer = debian/metacity_themer.1
752+
753+
754
755=== renamed directory 'share/metacity_themer/lib/metacity_themer' => 'metacity_themer'
756=== modified file 'metacity_themer/__init__.py'
757--- share/metacity_themer/lib/metacity_themer/__init__.py 2009-02-25 20:02:06 +0000
758+++ metacity_themer/__init__.py 2009-03-05 15:03:56 +0000
759@@ -1,13 +1,17 @@
760 #!/usr/bin/env python
761
762-from os.path import abspath, dirname, join, pardir
763+from os.path import abspath, dirname, join, pardir, exists
764+import sys
765
766
767 # here we define the path constants so that other modules can use it.
768 # this allows us to get access to the shared files without having to
769 # know the actual location, we just use the location of the current
770 # file and use paths relative to that.
771-SHARED_FILES = abspath(join(dirname(__file__), pardir, pardir))
772+if exists(abspath(join(dirname(__file__), pardir, pardir, 'share', 'metacity_themer'))):
773+ SHARED_FILES = abspath(join(dirname(__file__), pardir, pardir, 'share', 'metacity_themer'))
774+else:
775+ SHARED_FILES = join(sys.prefix, 'share/metacity_themer')
776 LOCALE_PATH = join(SHARED_FILES,'i18n')
777 RESOURCE_PATH = join(SHARED_FILES,'res')
778
779
780=== modified file 'metacity_themer/main.py'
781--- share/metacity_themer/lib/metacity_themer/main.py 2009-02-25 20:02:06 +0000
782+++ metacity_themer/main.py 2009-03-05 15:03:56 +0000
783@@ -40,6 +40,7 @@
784 import undo
785 import elements
786 import utils
787+import shutil
788
789
790 class MainWindow(object):
791@@ -317,8 +318,13 @@
792
793 preview_theme_name = filename.split('/')[-1]
794 # make sure the theme is valid
795- theme_test_path = utils.join(SHARED_FILES,'lib',
796+ if os.path.exists(utils.join(SHARED_FILES,
797+ 'metacity_themer','theme_test.py')):
798+ theme_test_path = utils.join(SHARED_FILES,
799 'metacity_themer','theme_test.py')
800+ else:
801+ import metacity_themer.theme_test
802+ theme_test_path = metacity_themer.theme_test.__file__
803
804 output = commands.getoutput("python '"+theme_test_path+"' '"+
805 preview_theme_name+"'")
806@@ -1032,15 +1038,16 @@
807
808 # make sure to not to load a theme thats already open
809 # in another instance of this program
810- for line in open(self.ct_path,'r'):
811- line = line.strip()
812- if line == theme_file:
813- response = dialogs.ConfirmDialog("Warning",
814- "Theme is already open in another window,\n"+
815- "open anyway?",self.window)
816+ if os.path.isfile(self.ct_path):
817+ for line in open(self.ct_path,'r'):
818+ line = line.strip()
819+ if line == theme_file:
820+ response = dialogs.ConfirmDialog("Warning",
821+ "Theme is already open in another window,\n"+
822+ "open anyway?",self.window)
823
824- if not response:
825- return None
826+ if not response:
827+ return None
828
829 ### undo stuff ###
830 undo.clear()
831
832=== modified file 'metacity_themer/theme_test.py'
833--- share/metacity_themer/lib/metacity_themer/theme_test.py 2009-02-20 02:37:30 +0000
834+++ metacity_themer/theme_test.py 2009-03-05 15:03:56 +0000
835@@ -20,7 +20,8 @@
836 import metacity
837 import sys
838
839-theme = metacity.theme_load(sys.argv[1])
840-theme.free()
841-
842-print "Valid"
843+if __name__ == '__main__':
844+ theme = metacity.theme_load(sys.argv[1])
845+ theme.free()
846+
847+ print "Valid"
848
849=== added file 'setup.py'
850--- setup.py 1970-01-01 00:00:00 +0000
851+++ setup.py 2009-03-05 16:16:47 +0000
852@@ -0,0 +1,40 @@
853+#!/usr/bin/env python
854+# 2008 copyright David D Lowe
855+# this file is released into the public domain, see http://creativecommons.org/licenses/publicdomain/
856+
857+from distutils.core import setup
858+import os, sys
859+import glob
860+
861+
862+def main():
863+
864+ share_path = os.path.join(os.path.dirname(os.path.abspath(__file__)), "share")
865+ data_files = []
866+ for path, dirs, files in os.walk(share_path):
867+ # please note that empty directories are not included, since distutils does not support them
868+ data_files.append((path.replace(share_path, "share", 1), [os.path.join(path, file) for file in files]))
869+ # data_files is a list of tuples to be passed to setup
870+
871+
872+ setup( name="metacity-themer", # this should start with a lowercase letter
873+ #so that it can be used as a debian package name later on
874+ version="0.1", # string, version of your program, not python version
875+ description="Metacity theme editor", # short
876+ author="Isaiah Meyer",
877+ author_email="freshapplepy@gmail.com",
878+ url="http://launchpad.net/mct", # home page for end-users
879+ license="GPL v3",
880+ packages=["metacity_themer"], # python packages, not debian packages
881+ data_files=data_files + [
882+ ('/usr/share/pixmaps', [os.path.join(share_path, 'metacity_themer/res/images/mt-logo-1.svg')]),
883+ ('/usr/share/applications', [os.path.join(share_path, 'applications/metacity_themer.desktop')])
884+ ], # data_files is a list of tuples
885+ # each tuple contaning an installation path and a list of data files
886+ scripts=["bin/metacity_themer"], # the script that should be run and installed in /usr/bin
887+ classifiers=["Development Status :: 4 - Beta", "Intended Audience :: Developers", "License :: OSI Approved :: GNU General Public License (GPL)", "Operating System :: POSIX :: Linux"],
888+ # a bunch of optional tags, a list of classifiers can be found at http://pypi.python.org/pypi?:action=list_classifiers
889+ long_description="""Edit Metacity window decoration themes (Ubuntu uses these) and see the changes in real time.""")
890+
891+if __name__ == "__main__":
892+ main()
893
894=== added directory 'share/applications'
895=== added file 'share/applications/metacity_themer.desktop'
896--- share/applications/metacity_themer.desktop 1970-01-01 00:00:00 +0000
897+++ share/applications/metacity_themer.desktop 2009-03-05 16:16:47 +0000
898@@ -0,0 +1,12 @@
899+[Desktop Entry]
900+Version=1.0
901+Encoding=UTF-8
902+Name=Metacity Themer
903+Comment=Edit metacity themes and preview them in real time
904+Generic Name=theme editor
905+Terminal=false
906+Icon=mt-logo-1.svg
907+Type=Application
908+Exec=metacity_themer
909+Categories=System;
910+StartupNotify=True
911
912=== removed directory 'share/metacity_themer/lib'

Subscribers

People subscribed via source and target branches

to all changes: