[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[Git][debian-mate-team/atril][master] 9 commits: debian/watch: Use format version 4.



Title: GitLab

Mike Gabriel pushed to branch master at Debian and Ubuntu MATE Packaging Team / atril

Commits:

16 changed files:

Changes:

  • debian/atril-common.install
    1 1
     usr/share/atril/
    
    2 2
     usr/share/caja/extensions/
    
    3
    -usr/share/gtk-doc/
    
    3
    +usr/share/doc/atril/html/
    
    4 4
     usr/share/help/
    
    5 5
     usr/share/icons/
    
    6 6
     usr/share/locale/
    

  • debian/atril-common.links
    1
    +usr/share/doc/atril/html/ usr/share/gtk-doc/html/atril

  • debian/atril.lintian-overrides deleted
    1
    -# atril ships a caja extension and those extensions are known to erroneously
    
    2
    -# trigger debhelper's makeshlibs script
    
    3
    -atril: postinst-has-useless-call-to-ldconfig
    
    4
    -atril: postrm-has-useless-call-to-ldconfig

  • debian/changelog
    1
    -atril (1.26.0-1) UNRELEASED; urgency=medium
    
    1
    +atril (1.26.0-1) unstable; urgency=medium
    
    2 2
     
    
    3
    +  [ Martin Wimpress ]
    
    3 4
       * New upstream release.
    
    4
    -  * New upstream release.
    
    5
    +  * debian/*.symbols:
    
    6
    +    + Update symbols for MATE 1.26.
    
    7
    +
    
    8
    +  [ Mike Gabriel ]
    
    9
    +  * debian/control:
    
    10
    +    + Add B-D: mate-submodules-source (>= 0.0~git20210623.f3091f9).
    
    11
    +    + Bump Standards-Version: to 4.6.0. No changes needed.
    
    12
    +    + Drop transitional pkg 'gir1.2-atril' and drop lintian override for it.
    
    13
    +  * debian/rules:
    
    14
    +    + Unpack libegg (mate-submodules) at the beginning of dh_auto_configure.
    
    15
    +  * debian/watch:
    
    16
    +    + Use format version 4.
    
    17
    +  * debian/copyright:
    
    18
    +    + Update copyright attributions.
    
    19
    +  * debian/{rules,atril-common,libatril*-dev.*}:
    
    20
    +    + Move GTK API documentation to pkg's doc folder.
    
    21
    +  * debian/libatrildocument3.symbols:
    
    22
    +    + Add Build-Depends-Package: meta data field for all .so files mentioned.
    
    23
    +  * debian/atril.lintian-overrides:
    
    24
    +    + Drop file. Overrides not required anymore.
    
    5 25
     
    
    6
    - -- Martin Wimpress <code@wimpress.io>  Sat, 21 Aug 2021 18:02:22 +0100
    
    26
    + -- Mike Gabriel <sunweaver@debian.org>  Sun, 12 Dec 2021 01:36:45 +0100
    
    7 27
     
    
    8 28
     atril (1.24.0-1) unstable; urgency=medium
    
    9 29
     
    

  • debian/control
    ... ... @@ -31,6 +31,7 @@ Build-Depends: debhelper-compat (= 13),
    31 31
                    libxml2-utils,
    
    32 32
                    lsb-release,
    
    33 33
                    mate-common (>= 1.24.0-1~),
    
    34
    +               mate-submodules-source (>= 0.0~git20210623.f3091f9),
    
    34 35
                    xsltproc,
    
    35 36
                    yelp-tools,
    
    36 37
                    zlib1g-dev,
    
    ... ... @@ -177,13 +178,3 @@ Description: GObject introspection data for libatrilview
    177 178
      .
    
    178 179
      It can be used by packages using the GIRepository format to generate
    
    179 180
      dynamic bindings.
    180
    -
    
    181
    -Package: gir1.2-atril
    
    182
    -Section: oldlibs
    
    183
    -Architecture: any
    
    184
    -Depends: ${misc:Depends},
    
    185
    -         gir1.2-atrildocument-1.5.0 (= ${binary:Version}),
    
    186
    -         gir1.2-atrilview-1.5.0 (= ${binary:Version}),
    
    187
    -Description: GObject introspection data for libatril* (transitional package)
    
    188
    - This package is a transitional package to gir1.2-atrildocument-1.5.0 and
    
    189
    - gir1.2-atrilview-1.5.0. This package can be safely removed.

  • debian/copyright
    ... ... @@ -236,16 +236,7 @@ Files: libview/ev-form-field-accessible.c
    236 236
     Copyright: 2014, Igalia
    
    237 237
     License: GPL-2+
    
    238 238
     
    
    239
    -Files: cut-n-paste/smclient/eggdesktopfile.h
    
    240
    -       cut-n-paste/smclient/eggsmclient-private.h
    
    241
    -       cut-n-paste/smclient/eggsmclient.c
    
    242
    -       cut-n-paste/smclient/eggsmclient.h
    
    243
    -Copyright: 2007, Novell, Inc.
    
    244
    -License: LGPL-2+
    
    245
    -
    
    246
    -Files: atril-document.h
    
    247
    -       atril-view.h
    
    248
    -       libdocument/ev-init.c
    
    239
    +Files: libdocument/ev-init.c
    
    249 240
            libdocument/ev-init.h
    
    250 241
     Copyright: 2009, Christian Persch
    
    251 242
     License: LGPL-2.1+
    
    ... ... @@ -445,18 +436,6 @@ Files: backend/tiff/tiff2ps.h
    445 436
     Copyright: 2005, rpath, Inc.
    
    446 437
     License: GPL-2+
    
    447 438
     
    
    448
    -Files: cut-n-paste/smclient/eggsmclient-xsmp.c
    
    449
    -Copyright: 1998, Carsten Schaar, and twm
    
    450
    -           1998, The Open Group
    
    451
    -           2007, Novell, Inc
    
    452
    -License: LGPL-2+
    
    453
    -
    
    454
    -Files: cut-n-paste/smclient/eggdesktopfile.c
    
    455
    -Copyright: 1999-2000, Red Hat Inc
    
    456
    -           2001, George Lebl
    
    457
    -           2007, Novell, Inc
    
    458
    -License: LGPL-2+
    
    459
    -
    
    460 439
     Files: backend/ps/ev-spectre.h
    
    461 440
     Copyright: 1998-2005, The Free Software Foundation, Inc.
    
    462 441
     License: LGPL-2+
    
    ... ... @@ -564,7 +543,9 @@ Copyright: Jonathan Blandford <jrb@redhat.com>
    564 543
                朱涛 <bill_zt@sina.com>
    
    565 544
     License: GFDL-1.1+
    
    566 545
     
    
    567
    -Files: .travis.yml
    
    546
    +Files: .build.yml
    
    547
    +       .gitmodules
    
    548
    +       .travis.yml
    
    568 549
            .tx/config
    
    569 550
            .github/issue_template.md
    
    570 551
            .github/FUNDING.yml
    
    ... ... @@ -592,45 +573,31 @@ Files: .travis.yml
    592 573
            backend/xps/*.in
    
    593 574
            backend/Makefile.am
    
    594 575
            backend/backend.symbols
    
    595
    -       cut-n-paste/smclient/Makefile.am
    
    596 576
            cut-n-paste/toolbar-editor/Makefile.am
    
    597 577
            cut-n-paste/toolbar-editor/*.list
    
    598 578
            cut-n-paste/zoom-control/Makefile.am
    
    599 579
            cut-n-paste/Makefile.am
    
    600 580
            data/icons/16x16/actions/Makefile.am
    
    601
    -       data/icons/16x16/actions/*.png
    
    602 581
            data/icons/16x16/actions/*.xcf
    
    603 582
            data/icons/16x16/actions/*.svg
    
    604 583
            data/icons/16x16/apps/Makefile.am
    
    605
    -       data/icons/16x16/apps/*.png
    
    606 584
            data/icons/16x16/mimetypes/Makefile.am
    
    607
    -       data/icons/16x16/mimetypes/*.png
    
    608 585
            data/icons/16x16/Makefile.am
    
    609 586
            data/icons/22x22/actions/Makefile.am
    
    610
    -       data/icons/22x22/actions/*.png
    
    611 587
            data/icons/22x22/actions/*.xcf
    
    612 588
            data/icons/22x22/actions/*.svg
    
    613 589
            data/icons/22x22/apps/Makefile.am
    
    614
    -       data/icons/22x22/apps/*.png
    
    615 590
            data/icons/22x22/mimetypes/Makefile.am
    
    616
    -       data/icons/22x22/mimetypes/*.png
    
    617 591
            data/icons/22x22/Makefile.am
    
    618 592
            data/icons/24x24/actions/Makefile.am
    
    619
    -       data/icons/24x24/actions/*.png
    
    620 593
            data/icons/24x24/apps/Makefile.am
    
    621
    -       data/icons/24x24/apps/*.png
    
    622 594
            data/icons/24x24/mimetypes/Makefile.am
    
    623
    -       data/icons/24x24/mimetypes/*.png
    
    624 595
            data/icons/24x24/Makefile.am
    
    625 596
            data/icons/32x32/actions/Makefile.am
    
    626
    -       data/icons/32x32/actions/*.png
    
    627 597
            data/icons/32x32/mimetypes/Makefile.am
    
    628
    -       data/icons/32x32/mimetypes/*.png
    
    629 598
            data/icons/32x32/Makefile.am
    
    630 599
            data/icons/48x48/actions/Makefile.am
    
    631
    -       data/icons/48x48/actions/*.png
    
    632 600
            data/icons/48x48/apps/Makefile.am
    
    633
    -       data/icons/48x48/apps/*.png
    
    634 601
            data/icons/48x48/Makefile.am
    
    635 602
            data/icons/scalable/actions/Makefile.am
    
    636 603
            data/icons/scalable/actions/*.svg
    
    ... ... @@ -682,7 +649,7 @@ Files: .travis.yml
    682 649
            ChangeLog
    
    683 650
            Makefile.am
    
    684 651
            NEWS
    
    685
    -       README
    
    652
    +       README.md
    
    686 653
            autogen.sh
    
    687 654
            atril-document.*
    
    688 655
            atril-view.*
    
    ... ... @@ -693,6 +660,11 @@ License: GPL-2+
    693 660
     Comment:
    
    694 661
      Using license from COPYING file.
    
    695 662
     
    
    663
    +Files: git.mk
    
    664
    +Copyright: 2009, Red Hat, Inc.
    
    665
    +  2010,2011,2012,2013, Behdad Esfahbod
    
    666
    +License: public-domain
    
    667
    +
    
    696 668
     Files: debian/*
    
    697 669
     Copyright: 2011-2014, Stefano Karapetsas <stefano@karapetsas.com>
    
    698 670
                2014, Mike Gabriel <sunweaver@debian.org>
    
    ... ... @@ -792,3 +764,8 @@ License: GFDL-1.1+
    792 764
      .
    
    793 765
      On Debian systems, the complete text of the GNU Free Documentation License
    
    794 766
      version 1.2 can be found in "/usr/share/common-licenses/GFDL-1.2".
    
    767
    +
    
    768
    +License: public-domain
    
    769
    + Copying and distribution of this file, with or without modification,
    
    770
    + is permitted in any medium without royalty provided the copyright
    
    771
    + notice and this notice are preserved.

  • debian/libatrildocument-dev.doc-base
    1
    +Document: libatrildocument-doc
    
    2
    +Title: libatrildocument API documentation
    
    3
    +Author: MATE Desktop Team
    
    4
    +Abstract: This document describes the API of the libatrildocument library.
    
    5
    +Section: Programming/C
    
    6
    +
    
    7
    +Format: HTML
    
    8
    +Index: /usr/share/doc/libatrildocument-dev/html/index.html
    
    9
    +Files: /usr/share/doc/libatrildocument-dev/html/*

  • debian/libatrildocument-dev.install
    ... ... @@ -2,3 +2,4 @@ usr/include/atril/*/*document*
    2 2
     usr/lib/*/*document*.so
    
    3 3
     usr/lib/*/pkgconfig/*document*
    
    4 4
     usr/share/gir-1.0/AtrilDocument*.gir
    
    5
    +usr/share/doc/libatrildocument-dev/html
    \ No newline at end of file

  • debian/libatrildocument-dev.links
    1
    +usr/share/doc/libatrildocument-dev/html usr/share/gtk-doc/html/libatrildocument-1.5.0

  • debian/libatrildocument3.symbols
    ... ... @@ -326,22 +326,31 @@ libatrildocument.so.3 libatrildocument3 #MINVER#
    326 326
      ev_transition_effect_type_get_type@Base 1.8.0
    
    327 327
      ev_xfer_uri_simple@Base 1.8.0
    
    328 328
     libcomicsdocument.so libatrildocument3 #MINVER#
    
    329
    +* Build-Depends-Package: libatrildocument-dev
    
    329 330
      register_atril_backend@Base 1.8.0
    
    330 331
     libdjvudocument.so libatrildocument3 #MINVER#
    
    332
    +* Build-Depends-Package: libatrildocument-dev
    
    331 333
      register_atril_backend@Base 1.8.0
    
    332 334
     libdvidocument.so libatrildocument3 #MINVER#
    
    335
    +* Build-Depends-Package: libatrildocument-dev
    
    333 336
      register_atril_backend@Base 1.8.0
    
    334 337
     libepubdocument.so libatrildocument3 #MINVER#
    
    338
    +* Build-Depends-Package: libatrildocument-dev
    
    335 339
      register_atril_backend@Base 1.10.1
    
    336 340
     libpdfdocument.so libatrildocument3 #MINVER#
    
    341
    +* Build-Depends-Package: libatrildocument-dev
    
    337 342
     #MISSING: 1.26.0# _Z29pdf_document_images_get_imageP17_EvDocumentImagesP8_EvImage@Base 1.8.0
    
    338 343
      pdf_document_get_type@Base 1.8.0
    
    339 344
      register_atril_backend@Base 1.8.0
    
    340 345
     libpixbufdocument.so libatrildocument3 #MINVER#
    
    346
    +* Build-Depends-Package: libatrildocument-dev
    
    341 347
      register_atril_backend@Base 1.8.0
    
    342 348
     libpsdocument.so libatrildocument3 #MINVER#
    
    349
    +* Build-Depends-Package: libatrildocument-dev
    
    343 350
      register_atril_backend@Base 1.8.0
    
    344 351
     libtiffdocument.so libatrildocument3 #MINVER#
    
    352
    +* Build-Depends-Package: libatrildocument-dev
    
    345 353
      register_atril_backend@Base 1.8.0
    
    346 354
     libxpsdocument.so libatrildocument3 #MINVER#
    
    355
    +* Build-Depends-Package: libatrildocument-dev
    
    347 356
      register_atril_backend@Base 1.8.0

  • debian/libatrilview-dev.doc-base
    1
    +Document: libatrilview-doc
    
    2
    +Title: libatrilview API documentation
    
    3
    +Author: MATE Desktop Team
    
    4
    +Abstract: This document describes the API of the libatrilview library.
    
    5
    +Section: Programming/C
    
    6
    +
    
    7
    +Format: HTML
    
    8
    +Index: /usr/share/doc/libatrilview-dev/html/index.html
    
    9
    +Files: /usr/share/doc/libatrilview-dev/html/*

  • debian/libatrilview-dev.install
    ... ... @@ -2,3 +2,4 @@ usr/include/atril/*/*view*
    2 2
     usr/lib/*/*view*.so
    
    3 3
     usr/lib/*/pkgconfig/*view*
    
    4 4
     usr/share/gir-1.0/AtrilView*.gir
    
    5
    +usr/share/doc/libatrilview-dev/html
    \ No newline at end of file

  • debian/libatrilview-dev.links
    1
    +usr/share/doc/libatrilview-dev/html usr/share/gtk-doc/html/libatrilview-1.5.0

  • debian/rules
    ... ... @@ -22,12 +22,20 @@ override_dh_install:
    22 22
     	rm -rfv debian/tmp/usr/lib/*/*.la
    
    23 23
     	rm -rfv debian/tmp/usr/lib/*/caja/extensions-2.0/*.la
    
    24 24
     	rm -rfv debian/tmp/usr/lib/*/atril/3/backends/*.la
    
    25
    +	mkdir -p debian/tmp/usr/share/doc/atril/
    
    26
    +	mv debian/tmp/usr/share/gtk-doc/html/atril debian/tmp/usr/share/doc/atril/html
    
    27
    +	mkdir -p debian/tmp/usr/share/doc/libatrilview-dev/
    
    28
    +	mv debian/tmp/usr/share/gtk-doc/html/libatrilview-1.5.0 debian/tmp/usr/share/doc/libatrilview-dev/html
    
    29
    +	mkdir -p debian/tmp/usr/share/doc/libatrildocument-dev/
    
    30
    +	mv debian/tmp/usr/share/gtk-doc/html/libatrildocument-1.5.0 debian/tmp/usr/share/doc/libatrildocument-dev/html
    
    25 31
     	dh_install
    
    26 32
     
    
    27 33
     override_dh_auto_test:
    
    28 34
     	DEB_BUILD_OPTIONS=nocheck dh_auto_test
    
    29 35
     
    
    30 36
     override_dh_auto_configure:
    
    37
    +	# we need libegg from mate-submodules
    
    38
    +	cd cut-n-paste/smclient/; tar xvJf /usr/src/mate-submodules-source.tar.xz
    
    31 39
     	NOCONFIGURE=1 ./autogen.sh
    
    32 40
     	dh_auto_configure $(DHFLAGS) -- \
    
    33 41
     		--enable-gtk-doc \
    

  • debian/source/lintian-overrides deleted
    1
    -# ignore lintian about gir1.2-atril complaints, the package is a transitional package
    
    2
    -source: typelib-missing-gir-depends gir1.2-atril

  • debian/watch
    1
    -version=3
    
    1
    +version=4
    
    2 2
     https://git.mate-desktop.org/atril/ \
    
    3 3
         snapshot/atril-(\d\.(?:[0-9]+|)[24680]\.\d)\.tar\.xz


  • Reply to: