Merge lp:~dobey/ubuntuone-client/no-autotools into lp:ubuntuone-client/packaging-dailies

Proposed by dobey on 2013-06-07
Status: Merged
Approved by: Brian Curtin on 2013-06-07
Approved revision: 77
Merged at revision: 77
Proposed branch: lp:~dobey/ubuntuone-client/no-autotools
Merge into: lp:ubuntuone-client/packaging-dailies
Diff against target: 480 lines (+14/-403)
6 files modified
control (+9/-61)
copyright (+0/-311)
gir1.2-syncdaemon-1.0.install (+0/-2)
libsyncdaemon-1.0-1.install (+0/-1)
libsyncdaemon-1.0-dev.install (+0/-5)
rules (+5/-23)
To merge this branch: bzr merge lp:~dobey/ubuntuone-client/no-autotools
Reviewer Review Type Date Requested Status
Brian Curtin (community) Approve on 2013-06-07
Mike McCracken (community) 2013-06-07 Approve on 2013-06-07
Review via email: mp+168148@code.launchpad.net

Commit message

Update for changes to build system.

To post a comment you must log in.
Mike McCracken (mikemc) wrote :

Looks Good To Me

review: Approve
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'control'
2--- control 2013-02-14 15:56:28 +0000
3+++ control 2013-06-07 18:54:23 +0000
4@@ -1,31 +1,23 @@
5 Source: ubuntuone-client
6 Section: net
7 Priority: optional
8-XS-Python-Version: >= 2.5
9-Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
10-XSBC-Original-Maintainer: Rick McBride <rick.mcbride@canonical.com>
11-Build-Depends: debhelper (>= 7.0.50),
12- cdbs,
13- autoconf,
14- automake (>= 1.10),
15+Maintainer: Ubuntu One Developers <ubuntuone-users@lists.launchpad.net>
16+Build-Depends:
17 dbus,
18+ debhelper (>= 7.0.50),
19+ dh-translations,
20 gir1.2-glib-2.0,
21 gir1.2-notify-0.7,
22 gir1.2-unity-5.0 | gir1.2-unity-4.0 | gir1.2-unity-3.0 (>= 3.8.4),
23- gnome-common,
24- gobject-introspection (>= 0.10.0),
25- gtk-doc-tools (>= 1.0),
26 intltool (>= 0.40.0),
27 language-pack-en,
28- libdbus-glib-1-dev (>= 0.70),
29- libgirepository1.0-dev (>= 0.6.3),
30- libtool,
31- pkg-config (>= 0.19),
32+ pep8,
33 pyflakes,
34- python-all-dev (>= 2.6.6-3),
35+ python-all (>= 2.6.6-3),
36 python-configglue,
37 python-dbus,
38 python-dirspec,
39+ python-distutils-extra (>= 2.26),
40 python-gi | python-gobject (>= 2.90),
41 python-mocker,
42 python-oauthlib (>= 0.3.5),
43@@ -39,11 +31,10 @@
44 python-ubuntu-sso-client (>= 4.1),
45 python-ubuntuone-storageprotocol (>= 4.1),
46 python-zope.interface,
47- ubuntuone-dev-tools (>= 4.1),
48- valac,
49- xutils-dev
50+ ubuntuone-dev-tools (>= 4.1)
51 Standards-Version: 3.9.3
52 Homepage: https://one.ubuntu.com
53+X-Python-Version: >= 2.6
54
55 Package: ubuntuone-client
56 Architecture: all
57@@ -105,46 +96,3 @@
58 Ubuntu One is a suite of on-line services. This package provides the Python
59 libraries for the Ubuntu One file storage and sharing synchronization
60 daemon, and OAuth desktop integration.
61-
62-Package: libsyncdaemon-1.0-1
63-Section: libs
64-Architecture: any
65-Depends: ${shlibs:Depends}, ${misc:Depends},
66- ubuntuone-client (>= ${source:Version})
67-Breaks: ubuntuone-client (<< 1.3.0)
68-Replaces: ubuntuone-client (<< 1.3.0)
69-Description: Ubuntu One synchronization daemon library
70- Ubuntu One is a suite of on-line services. This package provides the C
71- library for the Ubuntu One file storage and sharing synchronization daemon.
72-
73-Package: libsyncdaemon-1.0-dev
74-Section: libdevel
75-Architecture: any
76-Depends: ${misc:Depends},
77- libsyncdaemon-1.0-1 (= ${binary:Version}),
78- libdbus-glib-1-dev
79-Breaks: ubuntuone-client (<< 1.3.0)
80-Replaces: ubuntuone-client (<< 1.3.0)
81-Description: Ubuntu One synchronization daemon library
82- Ubuntu One is a suite of on-line services. This package provides the C
83- library for the Ubuntu One file storage and sharing synchronization daemon
84- development files.
85-
86-Package: gir1.2-syncdaemon-1.0
87-Section: libs
88-Architecture: any
89-Depends: ${gir:Depends},
90- ${shlibs:Depends},
91- ${misc:Depends}
92-Breaks: gir1.0-syncdaemon-1.0
93-Replaces: gir1.0-syncdaemon-1.0
94-Description: Ubuntu One synchronization daemon library
95- Ubuntu One is a suite of on-line services. This package provides the C
96- library for the Ubuntu One file storage and sharing synchronization daemon
97- development files.
98- .
99- This package contains introspection data
100- .
101- It can be used by packages using the GIRepository format to generate
102- dynamic bindings.
103-
104
105=== modified file 'copyright'
106--- copyright 2012-09-12 18:56:31 +0000
107+++ copyright 2013-06-07 18:54:23 +0000
108@@ -31,314 +31,3 @@
109 version. If you delete this exception statement from all source
110 files in the program, then also delete it here.
111
112-Files: *.svg ./data/icons/*
113-Copyright: 2009-2012 Canonical Ltd.
114-License: CC-BY-SA-3.0
115- Creative Commons Attribution-ShareAlike 3.0
116- THE WORK (AS DEFINED BELOW) IS PROVIDED UNDER THE TERMS OF THIS CREATIVE
117- COMMONS PUBLIC LICENSE ("CCPL" OR "LICENSE"). THE WORK IS PROTECTED BY
118- COPYRIGHT AND/OR OTHER APPLICABLE LAW. ANY USE OF THE WORK OTHER THAN AS
119- AUTHORIZED UNDER THIS LICENSE OR COPYRIGHT LAW IS PROHIBITED.
120- .
121- BY EXERCISING ANY RIGHTS TO THE WORK PROVIDED HERE, YOU ACCEPT AND AGREE TO BE
122- BOUND BY THE TERMS OF THIS LICENSE. TO THE EXTENT THIS LICENSE MAY BE
123- CONSIDERED TO BE A CONTRACT, THE LICENSOR GRANTS YOU THE RIGHTS CONTAINED HERE
124- IN CONSIDERATION OF YOUR ACCEPTANCE OF SUCH TERMS AND CONDITIONS.
125- .
126- 1. Definitions
127- .
128- 1. "Adaptation" means a work based upon the Work, or upon the Work and other
129- pre-existing works, such as a translation, adaptation, derivative work,
130- arrangement of music or other alterations of a literary or artistic work,
131- or phonogram or performance and includes cinematographic adaptations or
132- any other form in which the Work may be recast, transformed, or adapted
133- including in any form recognizably derived from the original, except that
134- a work that constitutes a Collection will not be considered an Adaptation
135- for the purpose of this License. For the avoidance of doubt, where the
136- Work is a musical work, performance or phonogram, the synchronization of
137- the Work in timed-relation with a moving image ("synching") will be
138- considered an Adaptation for the purpose of this License.
139- 2. "Collection" means a collection of literary or artistic works, such as
140- encyclopedias and anthologies, or performances, phonograms or broadcasts,
141- or other works or subject matter other than works listed in Section 1(f)
142- below, which, by reason of the selection and arrangement of their
143- contents, constitute intellectual creations, in which the Work is included
144- in its entirety in unmodified form along with one or more other
145- contributions, each constituting separate and independent works in
146- themselves, which together are assembled into a collective whole. A work
147- that constitutes a Collection will not be considered an Adaptation (as
148- defined below) for the purposes of this License.
149- 3. "Creative Commons Compatible License" means a license that is listed at
150- http://creativecommons.org/compatiblelicenses that has been approved by
151- Creative Commons as being essentially equivalent to this License,
152- including, at a minimum, because that license: (i) contains terms that
153- have the same purpose, meaning and effect as the License Elements of this
154- License; and, (ii) explicitly permits the relicensing of adaptations of
155- works made available under that license under this License or a Creative
156- Commons jurisdiction license with the same License Elements as this
157- License.
158- 4. "Distribute" means to make available to the public the original and copies
159- of the Work or Adaptation, as appropriate, through sale or other transfer
160- of ownership.
161- 5. "License Elements" means the following high-level license attributes as
162- selected by Licensor and indicated in the title of this License:
163- Attribution, ShareAlike.
164- 6. "Licensor" means the individual, individuals, entity or entities that
165- offer(s) the Work under the terms of this License.
166- 7. "Original Author" means, in the case of a literary or artistic work, the
167- individual, individuals, entity or entities who created the Work or if no
168- individual or entity can be identified, the publisher; and in addition (i)
169- in the case of a performance the actors, singers, musicians, dancers, and
170- other persons who act, sing, deliver, declaim, play in, interpret or
171- otherwise perform literary or artistic works or expressions of folklore;
172- (ii) in the case of a phonogram the producer being the person or legal
173- entity who first fixes the sounds of a performance or other sounds; and,
174- (iii) in the case of broadcasts, the organization that transmits the
175- broadcast.
176- 8. "Work" means the literary and/or artistic work offered under the terms of
177- this License including without limitation any production in the literary,
178- scientific and artistic domain, whatever may be the mode or form of its
179- expression including digital form, such as a book, pamphlet and other
180- writing; a lecture, address, sermon or other work of the same nature; a
181- dramatic or dramatico-musical work; a choreographic work or entertainment
182- in dumb show; a musical composition with or without words; a
183- cinematographic work to which are assimilated works expressed by a
184- process analogous to cinematography; a work of drawing, painting,
185- architecture, sculpture, engraving or lithography; a photographic work to
186- which are assimilated works expressed by a process analogous to
187- photography; a work of applied art; an illustration, map, plan, sketch or
188- three-dimensional work relative to geography, topography, architecture or
189- science; a performance; a broadcast; a phonogram; a compilation of data
190- to the extent it is protected as a copyrightable work; or a work
191- performed by a variety or circus performer to the extent it is not
192- otherwise considered a literary or artistic work.
193- 9. "You" means an individual or entity exercising rights under this License
194- who has not previously violated the terms of this License with respect to
195- the Work, or who has received express permission from the Licensor to
196- exercise rights under this License despite a previous violation.
197- 10. "Publicly Perform" means to perform public recitations of the Work and to
198- communicate to the public those public recitations, by any means or
199- process, including by wire or wireless means or public digital
200- performances; to make available to the public Works in such a way that
201- members of the public may access these Works from a place and at a place
202- individually chosen by them; to perform the Work to the public by any
203- means or process and the communication to the public of the performances
204- of the Work, including by public digital performance; to broadcast and
205- rebroadcast the Work by any means including signs, sounds or images.
206- 11. "Reproduce" means to make copies of the Work by any means including
207- without limitation by sound or visual recordings and the right of fixation
208- and reproducing fixations of the Work, including storage of a protected
209- performance or phonogram in digital form or other electronic medium.
210- .
211- 2. Fair Dealing Rights. Nothing in this License is intended to reduce, limit,
212- or restrict any uses free from copyright or rights arising from limitations
213- or exceptions that are provided for in connection with the copyright
214- protection under copyright law or other applicable laws.
215- .
216- 3. License Grant. Subject to the terms and conditions of this License, Licensor
217- hereby grants You a worldwide, royalty-free, non-exclusive, perpetual (for
218- the duration of the applicable copyright) license to exercise the rights in
219- the Work as stated below:
220- .
221- 1. to Reproduce the Work, to incorporate the Work into one or more
222- Collections, and to Reproduce the Work as incorporated in the Collections;
223- 2. to create and Reproduce Adaptations provided that any such Adaptation,
224- including any translation in any medium, takes reasonable steps to clearly
225- label, demarcate or otherwise identify that changes were made to the
226- original Work. For example, a translation could be marked "The original
227- work was translated from English to Spanish," or a modification could
228- indicate "The original work has been modified.";
229- 3. to Distribute and Publicly Perform the Work including as incorporated in
230- Collections; and,
231- 4. to Distribute and Publicly Perform Adaptations.
232- 5.
233- .
234- For the avoidance of doubt:
235- 1. Non-waivable Compulsory License Schemes. In those jurisdictions in
236- which the right to collect royalties through any statutory or
237- compulsory licensing scheme cannot be waived, the Licensor reserves
238- the exclusive right to collect such royalties for any exercise by
239- You of the rights granted under this License;
240- 2. Waivable Compulsory License Schemes. In those jurisdictions in which
241- the right to collect royalties through any statutory or compulsory
242- licensing scheme can be waived, the Licensor waives the exclusive
243- right to collect such royalties for any exercise by You of the
244- rights granted under this License; and,
245- 3. Voluntary License Schemes. The Licensor waives the right to collect
246- royalties, whether individually or, in the event that the Licensor
247- is a member of a collecting society that administers voluntary
248- licensing schemes, via that society, from any exercise by You of the
249- rights granted under this License.
250- .
251- The above rights may be exercised in all media and formats whether now known or
252- hereafter devised. The above rights include the right to make such
253- modifications as are technically necessary to exercise the rights in other
254- media and formats.
255- Subject to Section 8(f), all rights not expressly granted by Licensor are
256- hereby reserved.
257- .
258- 4. Restrictions. The license granted in Section 3 above is expressly made
259- subject to and limited by the following restrictions:
260- .
261- 1. You may Distribute or Publicly Perform the Work only under the terms of
262- this License. You must include a copy of, or the Uniform Resource
263- Identifier (URI) for, this License with every copy of the Work You
264- Distribute or Publicly Perform. You may not offer or impose any terms on
265- the Work that restrict the terms of this License or the ability of the
266- recipient of the Work to exercise the rights granted to that recipient
267- under the terms of the License. You may not sublicense the Work. You must
268- keep intact all notices that refer to this License and to the disclaimer
269- of warranties with every copy of the Work You Distribute or Publicly
270- Perform. When You Distribute or Publicly Perform the Work, You may not
271- impose any effective technological measures on the Work that restrict the
272- ability of a recipient of the Work from You to exercise the rights granted
273- to that recipient under the terms of the License. This Section 4(a)
274- applies to the Work as incorporated in a Collection, but this does not
275- require the Collection apart from the Work itself to be made subject to
276- the terms of this License. If You create a Collection, upon notice from
277- any Licensor You must, to the extent practicable, remove from the
278- Collection any credit as required by Section 4(c), as requested. If You
279- create an Adaptation, upon notice from any Licensor You must, to the
280- extent practicable, remove from the Adaptation any credit as required by
281- Section 4(c), as requested.
282- 2. You may Distribute or Publicly Perform an Adaptation only under the terms
283- of: (i) this License; (ii) a later version of this License with the same
284- License Elements as this License; (iii) a Creative Commons jurisdiction
285- license (either this or a later license version) that contains the same
286- License Elements as this License (e.g., Attribution-ShareAlike 3.0 US));
287- (iv) a Creative Commons Compatible License. If you license the Adaptation
288- under one of the licenses mentioned in (iv), you must comply with the
289- terms of that license. If you license the Adaptation under the terms of
290- any of the licenses mentioned in (i), (ii) or (iii) (the "Applicable
291- License"), you must comply with the terms of the Applicable License
292- generally and the following provisions: (I) You must include a copy of, or
293- the URI for, the Applicable License with every copy of each Adaptation You
294- Distribute or Publicly Perform; (II) You may not offer or impose any terms
295- on the Adaptation that restrict the terms of the Applicable License or the
296- ability of the recipient of the Adaptation to exercise the rights granted
297- to that recipient under the terms of the Applicable License; (III) You
298- must keep intact all notices that refer to the Applicable License and to
299- the disclaimer of warranties with every copy of the Work as included in
300- the Adaptation You Distribute or Publicly Perform; (IV) when You
301- Distribute or Publicly Perform the Adaptation, You may not impose any
302- effective technological measures on the Adaptation that restrict the
303- ability of a recipient of the Adaptation from You to exercise the rights
304- granted to that recipient under the terms of the Applicable License. This
305- Section 4(b) applies to the Adaptation as incorporated in a Collection,
306- but this does not require the Collection apart from the Adaptation itself
307- to be made subject to the terms of the Applicable License.
308- 3. If You Distribute, or Publicly Perform the Work or any Adaptations or
309- Collections, You must, unless a request has been made pursuant to Section
310- 4(a), keep intact all copyright notices for the Work and provide,
311- reasonable to the medium or means You are utilizing: (i) the name of the
312- Original Author (or pseudonym, if applicable) if supplied, and/or if the
313- Original Author and/or Licensor designate another party or parties (e.g.,
314- a sponsor institute, publishing entity, journal) for attribution
315- ("Attribution Parties") in Licensor's copyright notice, terms of service
316- or by other reasonable means, the name of such party or parties; (ii) the
317- title of the Work if supplied; (iii) to the extent reasonably practicable,
318- the URI, if any, that Licensor specifies to be associated with the Work,
319- unless such URI does not refer to the copyright notice or licensing
320- information for the Work; and (iv) , consistent with Ssection 3(b), in the
321- case of an Adaptation, a credit identifying the use of the Work in the
322- Adaptation (e.g., "French translation of the Work by Original Author," or
323- "Screenplay based on original Work by Original Author"). The credit
324- required by this Section 4(c) may be implemented in any reasonable manner;
325- provided, however, that in the case of a Adaptation or Collection, at a
326- minimum such credit will appear, if a credit for all contributing authors
327- of the Adaptation or Collection appears, then as part of these credits and
328- in a manner at least as prominent as the credits for the other
329- contributing authors. For the avoidance of doubt, You may only use the
330- credit required by this Section for the purpose of attribution in the
331- manner set out above and, by exercising Your rights under this License,
332- You may not implicitly or explicitly assert or imply any connection with,
333- sponsorship or endorsement by the Original Author, Licensor and/or
334- Attribution Parties, as appropriate, of You or Your use of the Work,
335- without the separate, express prior written permission of the Original
336- Author, Licensor and/or Attribution Parties.
337- 4. Except as otherwise agreed in writing by the Licensor or as may be
338- otherwise permitted by applicable law, if You Reproduce, Distribute or
339- Publicly Perform the Work either by itself or as part of any Adaptations
340- or Collections, You must not distort, mutilate, modify or take other
341- derogatory action in relation to the Work which would be prejudicial to
342- the Original Author's honor or reputation. Licensor agrees that in those
343- jurisdictions (e.g. Japan), in which any exercise of the right granted in
344- Section 3(b) of this License (the right to make Adaptations) would be
345- deemed to be a distortion, mutilation, modification or other derogatory
346- action prejudicial to the Original Author's honor and reputation, the
347- Licensor will waive or not assert, as appropriate, this Section, to the
348- fullest extent permitted by the applicable national law, to enable You to
349- reasonably exercise Your right under Section 3(b) of this License (right
350- to make Adaptations) but not otherwise.
351- .
352- 5. Representations, Warranties and Disclaimer
353- .
354- UNLESS OTHERWISE MUTUALLY AGREED TO BY THE PARTIES IN WRITING, LICENSOR OFFERS
355- THE WORK AS-IS AND MAKES NO REPRESENTATIONS OR WARRANTIES OF ANY KIND
356- CONCERNING THE WORK, EXPRESS, IMPLIED, STATUTORY OR OTHERWISE, INCLUDING,
357- WITHOUT LIMITATION, WARRANTIES OF TITLE, MERCHANTIBILITY, FITNESS FOR A
358- PARTICULAR PURPOSE, NONINFRINGEMENT, OR THE ABSENCE OF LATENT OR OTHER DEFECTS,
359- ACCURACY, OR THE PRESENCE OF ABSENCE OF ERRORS, WHETHER OR NOT DISCOVERABLE.
360- SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION OF IMPLIED WARRANTIES, SO SUCH
361- EXCLUSION MAY NOT APPLY TO YOU.
362- .
363- 6. Limitation on Liability. EXCEPT TO THE EXTENT REQUIRED BY APPLICABLE LAW, IN
364- NO EVENT WILL LICENSOR BE LIABLE TO YOU ON ANY LEGAL THEORY FOR ANY SPECIAL,
365- INCIDENTAL, CONSEQUENTIAL, PUNITIVE OR EXEMPLARY DAMAGES ARISING OUT OF THIS
366- LICENSE OR THE USE OF THE WORK, EVEN IF LICENSOR HAS BEEN ADVISED OF THE
367- POSSIBILITY OF SUCH DAMAGES.
368- .
369- 7. Termination
370- .
371- 1. This License and the rights granted hereunder will terminate automatically
372- upon any breach by You of the terms of this License. Individuals or
373- entities who have received Adaptations or Collections from You under this
374- License, however, will not have their licenses terminated provided such
375- individuals or entities remain in full compliance with those licenses.
376- Sections 1, 2, 5, 6, 7, and 8 will survive any termination of this
377- License.
378- 2. Subject to the above terms and conditions, the license granted here is
379- perpetual (for the duration of the applicable copyright in the Work).
380- Notwithstanding the above, Licensor reserves the right to release the Work
381- under different license terms or to stop distributing the Work at any
382- time; provided, however that any such election will not serve to withdraw
383- this License (or any other license that has been, or is required to be,
384- granted under the terms of this License), and this License will continue
385- in full force and effect unless terminated as stated above.
386- .
387- 8. Miscellaneous
388- .
389- 1. Each time You Distribute or Publicly Perform the Work or a Collection, the
390- Licensor offers to the recipient a license to the Work on the same terms
391- and conditions as the license granted to You under this License.
392- 2. Each time You Distribute or Publicly Perform an Adaptation, Licensor
393- offers to the recipient a license to the original Work on the same terms
394- and conditions as the license granted to You under this License.
395- 3. If any provision of this License is invalid or unenforceable under
396- applicable law, it shall not affect the validity or enforceability of the
397- remainder of the terms of this License, and without further action by the
398- parties to this agreement, such provision shall be reformed to the minimum
399- extent necessary to make such provision valid and enforceable.
400- 4. No term or provision of this License shall be deemed waived and no breach
401- consented to unless such waiver or consent shall be in writing and signed
402- by the party to be charged with such waiver or consent.
403- 5. This License constitutes the entire agreement between the parties with
404- respect to the Work licensed here. There are no understandings,
405- agreements or representations with respect to the Work not specified here.
406- Licensor shall not be bound by any additional provisions that may appear
407- in any communication from You. This License may not be modified without
408- the mutual written agreement of the Licensor and You.
409- 6. The rights granted under, and the subject matter referenced, in this
410- License were drafted utilizing the terminology of the Berne Convention for
411- the Protection of Literary and Artistic Works (as amended on September 28,
412- 1979), the Rome Convention of 1961, the WIPO Copyright Treaty of 1996, the
413- WIPO Performances and Phonograms Treaty of 1996 and the Universal
414- Copyright Convention (as revised on July 24, 1971). These rights and
415- subject matter take effect in the relevant jurisdiction in which the
416- License terms are sought to be enforced according to the corresponding
417- provisions of the implementation of those treaty provisions in the
418- applicable national law. If the standard suite of rights granted under
419- applicable copyright law includes additional rights not granted under this
420- License, such additional rights are deemed to be included in the License;
421- this License is not intended to restrict the license of any rights under
422- applicable law.
423
424=== removed file 'gir1.2-syncdaemon-1.0.install'
425--- gir1.2-syncdaemon-1.0.install 2012-09-12 18:56:31 +0000
426+++ gir1.2-syncdaemon-1.0.install 1970-01-01 00:00:00 +0000
427@@ -1,2 +0,0 @@
428-usr/lib/girepository-*/*
429-
430
431=== removed file 'libsyncdaemon-1.0-1.install'
432--- libsyncdaemon-1.0-1.install 2012-09-12 18:56:31 +0000
433+++ libsyncdaemon-1.0-1.install 1970-01-01 00:00:00 +0000
434@@ -1,1 +0,0 @@
435-usr/lib/libsyncdaemon-1.0.so.*
436
437=== removed file 'libsyncdaemon-1.0-dev.install'
438--- libsyncdaemon-1.0-dev.install 2012-09-17 20:44:05 +0000
439+++ libsyncdaemon-1.0-dev.install 1970-01-01 00:00:00 +0000
440@@ -1,5 +0,0 @@
441-usr/include/libsyncdaemon-*
442-usr/lib/libsyncdaemon-*.{a,la,so}
443-usr/lib/pkgconfig/*.pc
444-usr/share/gir-*/*.gir
445-
446
447=== modified file 'rules'
448--- rules 2012-09-12 18:56:31 +0000
449+++ rules 2013-06-07 18:54:23 +0000
450@@ -1,26 +1,8 @@
451 #!/usr/bin/make -f
452
453-include /usr/share/cdbs/1/rules/debhelper.mk
454-include /usr/share/cdbs/1/rules/utils.mk
455-include /usr/share/cdbs/1/class/gnome.mk
456-
457-DEB_CONFIGURE_SCRIPT = $(CURDIR)/$(DEB_SRCDIR)/autogen.sh
458-DEB_CONFIGURE_EXTRA_FLAGS = --enable-debug
459-DEB_INSTALL_ARGS = --fail-missing
460-
461-binary-install/python-ubuntuone-client::
462- dh_python2 -ppython-ubuntuone-client
463-
464-install/libsyncdaemon-1.0-dev::
465- for file in debian/tmp/usr/lib/*.la; do \
466- sed -i "/dependency_libs/ s/'.*'/''/" $$file ; \
467- done
468-
469-common-build-arch common-build-indep:: debian/stamp-check
470-debian/stamp-check:
471- LANG=en_US.UTF-8 LANGUAGE=en_US.UTF-8 LC_ALL=en_US.UTF-8 $(DEB_MAKE_INVOKE) check
472- touch $@
473-
474-makefile-clean::
475- rm -f debian/stamp-check
476+%:
477+ dh $@ --with python2,translations --fail-missing
478+
479+override_dh_auto_test:
480+ LANG=en_US.UTF-8 LANGUAGE=en_US.UTF-8 LC_ALL=en_US.UTF-8 ./run-tests
481

Subscribers

People subscribed via source and target branches

to all changes: