r27422 - in /desktop/experimental/eog/debian: changelog control control.in eog.install gir1.2-eog-3.0.install rules

joss at users.alioth.debian.org joss at users.alioth.debian.org
Sun Apr 10 21:17:33 UTC 2011


Author: joss
Date: Sun Apr 10 21:17:31 2011
New Revision: 27422

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=27422
Log:
* Update build-dependencies.
* Put the gir in the eog package, since it’s in a private directory.
* Remove useless cleanup in rules.

Removed:
    desktop/experimental/eog/debian/gir1.2-eog-3.0.install
Modified:
    desktop/experimental/eog/debian/changelog
    desktop/experimental/eog/debian/control
    desktop/experimental/eog/debian/control.in
    desktop/experimental/eog/debian/eog.install
    desktop/experimental/eog/debian/rules

Modified: desktop/experimental/eog/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/eog/debian/changelog?rev=27422&op=diff
==============================================================================
--- desktop/experimental/eog/debian/changelog [utf-8] (original)
+++ desktop/experimental/eog/debian/changelog [utf-8] Sun Apr 10 21:17:31 2011
@@ -2,6 +2,9 @@
 
   * Make the -dev package depend on the gir package.
   * New upstream release.
+  * Update build-dependencies.
+  * Put the gir in the eog package, since it’s in a private directory.
+  * Remove useless cleanup in rules.
 
  -- Josselin Mouette <joss at debian.org>  Sun, 10 Apr 2011 22:57:14 +0200
 

Modified: desktop/experimental/eog/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/eog/debian/control?rev=27422&op=diff
==============================================================================
--- desktop/experimental/eog/debian/control [utf-8] (original)
+++ desktop/experimental/eog/debian/control [utf-8] Sun Apr 10 21:17:31 2011
@@ -7,7 +7,7 @@
 Section: gnome
 Priority: optional
 Maintainer: Guilherme de S. Pastore <gpastore at debian.org>
-Uploaders: Andreas Henriksson <andreas at fatal.se>, Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Emilio Pozuelo Monfort <pochu at debian.org>, Frederic Peters <fpeters at debian.org>, Michael Biebl <biebl at debian.org>
+Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Emilio Pozuelo Monfort <pochu at debian.org>, Frederic Peters <fpeters at debian.org>, Josselin Mouette <joss at debian.org>, Michael Biebl <biebl at debian.org>
 Standards-Version: 3.9.0
 Homepage: http://projects.gnome.org/eog
 Build-Depends: cdbs (>= 0.4.41),
@@ -15,12 +15,14 @@
                gnome-pkg-tools (>= 0.10),
                gtk-doc-tools (>= 1.9),
                intltool (>= 0.40.0),
+               pkg-config,
                gnome-doc-utils,
-               libgtk-3-dev (>= 3.0.0),
+               libgtk-3-dev (>= 3.0.2),
                libglib2.0-dev (>= 2.25.15),
                libgnome-desktop-3-dev (>= 2.91.2),
                gnome-icon-theme (>= 2.19.1),
                shared-mime-info (>= 0.20),
+               gsettings-desktop-schemas-dev (>= 2.91.92),
                libpeas-dev (>= 0.7.4),
                zlib1g-dev,
                libexif-dev (>= 0.6.14),
@@ -29,7 +31,7 @@
                libjpeg62-dev,
                libdbus-glib-1-dev (>= 0.71),
                libxml2-dev (>= 2.0),
-               x11proto-core-dev,
+               libx11-dev,
                libatk1.0-dev (>= 1.32.0-2~),
                gir1.2-glib-2.0,
                gir1.2-gtk-3.0 (>= 3.0.0),
@@ -43,7 +45,7 @@
 Architecture: any
 Depends: ${shlibs:Depends},
          ${misc:Depends},
-         gir1.2-eog-3.0 (= ${binary:Version}),
+         ${gir:Depends},
          gnome-icon-theme (>= 2.19.1),
          shared-mime-info (>= 0.20),
          gsettings-desktop-schemas (>= 2.91.92)
@@ -71,7 +73,6 @@
 Package: eog-dev
 Architecture: all
 Depends: eog (>= ${source:Version}),
-         gir1.2-eog-3.0 (>= source:Version}),
          libgtk-3-dev (>= 3.0.0),
          ${misc:Depends}
 Description: Development files for the Eye of GNOME
@@ -80,17 +81,3 @@
  .
  This package contains header files and development information, which
  is needed to build plugins for the Eye of GNOME.
-
-Package: gir1.2-eog-3.0
-Section: libs
-Architecture: any
-Depends: eog (>= ${binary:Version}),
-         ${gir:Depends},
-         ${shlibs:Depends},
-         ${misc:Depends}
-Description: GObject introspection data for the Eye of GNOME
- eog or the Eye of GNOME is a graphics viewer for the GNOME desktop
- which uses the gdk-pixbuf library.
- .
- This package contains introspection data for the GNOME web browser.
-

Modified: desktop/experimental/eog/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/eog/debian/control.in?rev=27422&op=diff
==============================================================================
--- desktop/experimental/eog/debian/control.in [utf-8] (original)
+++ desktop/experimental/eog/debian/control.in [utf-8] Sun Apr 10 21:17:31 2011
@@ -10,12 +10,14 @@
                gnome-pkg-tools (>= 0.10),
                gtk-doc-tools (>= 1.9),
                intltool (>= 0.40.0),
+               pkg-config,
                gnome-doc-utils,
-               libgtk-3-dev (>= 3.0.0),
+               libgtk-3-dev (>= 3.0.2),
                libglib2.0-dev (>= 2.25.15),
                libgnome-desktop-3-dev (>= 2.91.2),
                gnome-icon-theme (>= 2.19.1),
                shared-mime-info (>= 0.20),
+               gsettings-desktop-schemas-dev (>= 2.91.92),
                libpeas-dev (>= 0.7.4),
                zlib1g-dev,
                libexif-dev (>= 0.6.14),
@@ -24,7 +26,7 @@
                libjpeg62-dev,
                libdbus-glib-1-dev (>= 0.71),
                libxml2-dev (>= 2.0),
-               x11proto-core-dev,
+               libx11-dev,
                libatk1.0-dev (>= 1.32.0-2~),
                gir1.2-glib-2.0,
                gir1.2-gtk-3.0 (>= 3.0.0),
@@ -38,7 +40,7 @@
 Architecture: any
 Depends: ${shlibs:Depends},
          ${misc:Depends},
-         gir1.2-eog-3.0 (= ${binary:Version}),
+         ${gir:Depends},
          gnome-icon-theme (>= 2.19.1),
          shared-mime-info (>= 0.20),
          gsettings-desktop-schemas (>= 2.91.92)
@@ -66,7 +68,6 @@
 Package: eog-dev
 Architecture: all
 Depends: eog (>= ${source:Version}),
-         gir1.2-eog-3.0 (>= source:Version}),
          libgtk-3-dev (>= 3.0.0),
          ${misc:Depends}
 Description: Development files for the Eye of GNOME
@@ -75,17 +76,3 @@
  .
  This package contains header files and development information, which
  is needed to build plugins for the Eye of GNOME.
-
-Package: gir1.2-eog-3.0
-Section: libs
-Architecture: any
-Depends: eog (>= ${binary:Version}),
-         ${gir:Depends},
-         ${shlibs:Depends},
-         ${misc:Depends}
-Description: GObject introspection data for the Eye of GNOME
- eog or the Eye of GNOME is a graphics viewer for the GNOME desktop
- which uses the gdk-pixbuf library.
- .
- This package contains introspection data for the GNOME web browser.
-

Modified: desktop/experimental/eog/debian/eog.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/eog/debian/eog.install?rev=27422&op=diff
==============================================================================
--- desktop/experimental/eog/debian/eog.install [utf-8] (original)
+++ desktop/experimental/eog/debian/eog.install [utf-8] Sun Apr 10 21:17:31 2011
@@ -10,3 +10,4 @@
 debian/tmp/usr/share/applications
 debian/tmp/usr/lib/eog/plugins/*plugin
 debian/tmp/usr/lib/eog/plugins/*.so
+debian/tmp/usr/lib/eog/girepository-1.0

Modified: desktop/experimental/eog/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/eog/debian/rules?rev=27422&op=diff
==============================================================================
--- desktop/experimental/eog/debian/rules [utf-8] (original)
+++ desktop/experimental/eog/debian/rules [utf-8] Sun Apr 10 21:17:31 2011
@@ -12,9 +12,5 @@
 
 DEB_DH_MAKESHLIBS_ARGS_ALL += --no-act
 
-binary-post-install/eog::
-	# remove gir file from eog package, it will be in eog-dev
-	rm -rf `pwd`/debian/eog/usr/share/eog/gir-1.0/
-
-binary-predeb/gir1.2-eog-3.0::
+binary-predeb/eog::
 	dh_girepository -ldebian/tmp/usr/share/eog/gir-1.0/ /usr/lib/eog/girepository-1.0/




More information about the pkg-gnome-commits mailing list