r30843 - in /desktop/unstable/glade/debian: changelog compat control control.in gir1.2-gladeui-2.0.install glade.install libgladeui-2-0.install libgladeui-common.install libgladeui-dev.install libgladeui-doc.install rules

biebl at users.alioth.debian.org biebl at users.alioth.debian.org
Thu Oct 20 05:02:01 UTC 2011


Author: biebl
Date: Thu Oct 20 05:01:59 2011
New Revision: 30843

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=30843
Log:
* Bump debhelper compatibility level to 8.
  - Strip debian/tmp/ from .install files.
  - Update Build-Depends on debhelper.
  - Remove old cruft from debian/rules which recent versions of
    dpkg-shlibdeps don't need anymore.

Modified:
    desktop/unstable/glade/debian/changelog
    desktop/unstable/glade/debian/compat
    desktop/unstable/glade/debian/control
    desktop/unstable/glade/debian/control.in
    desktop/unstable/glade/debian/gir1.2-gladeui-2.0.install
    desktop/unstable/glade/debian/glade.install
    desktop/unstable/glade/debian/libgladeui-2-0.install
    desktop/unstable/glade/debian/libgladeui-common.install
    desktop/unstable/glade/debian/libgladeui-dev.install
    desktop/unstable/glade/debian/libgladeui-doc.install
    desktop/unstable/glade/debian/rules

Modified: desktop/unstable/glade/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/glade/debian/changelog?rev=30843&op=diff
==============================================================================
--- desktop/unstable/glade/debian/changelog [utf-8] (original)
+++ desktop/unstable/glade/debian/changelog [utf-8] Thu Oct 20 05:01:59 2011
@@ -5,6 +5,11 @@
     - Track .xz tarballs.
   * debian/libgladeui-doc.links, debian/libgladeui-doc.install:
     - Update paths for gtk-doc API documentation which is now versioned.
+  * Bump debhelper compatibility level to 8.
+    - Strip debian/tmp/ from .install files.
+    - Update Build-Depends on debhelper.
+    - Remove old cruft from debian/rules which recent versions of
+      dpkg-shlibdeps don't need anymore.
 
  -- Michael Biebl <biebl at debian.org>  Thu, 20 Oct 2011 01:49:30 +0200
 

Modified: desktop/unstable/glade/debian/compat
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/glade/debian/compat?rev=30843&op=diff
==============================================================================
--- desktop/unstable/glade/debian/compat [utf-8] (original)
+++ desktop/unstable/glade/debian/compat [utf-8] Thu Oct 20 05:01:59 2011
@@ -1,1 +1,1 @@
-5
+8

Modified: desktop/unstable/glade/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/glade/debian/control?rev=30843&op=diff
==============================================================================
--- desktop/unstable/glade/debian/control [utf-8] (original)
+++ desktop/unstable/glade/debian/control [utf-8] Thu Oct 20 05:01:59 2011
@@ -11,7 +11,7 @@
 Vcs-Browser: http://svn.debian.org/viewsvn/pkg-gnome/desktop/unstable/glade
 Vcs-Svn: svn://svn.debian.org/svn/pkg-gnome/desktop/unstable/glade
 Build-Depends: cdbs (>= 0.4.41),
-               debhelper (>= 5),
+               debhelper (>= 8),
                gnome-pkg-tools (>= 0.10),
                libxml2-dev (>= 2.4.0),
                libgtk-3-dev (>= 3.0.0),
@@ -32,6 +32,7 @@
 Section: libs
 Depends: ${misc:Depends},
          ${shlibs:Depends},
+         ${python:Depends},
          libgladeui-common
 Description: GTK+ User Interface Build core library
  Glade is a RAD tool to enable quick and easy development of user

Modified: desktop/unstable/glade/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/glade/debian/control.in?rev=30843&op=diff
==============================================================================
--- desktop/unstable/glade/debian/control.in [utf-8] (original)
+++ desktop/unstable/glade/debian/control.in [utf-8] Thu Oct 20 05:01:59 2011
@@ -6,7 +6,7 @@
 Vcs-Browser: http://svn.debian.org/viewsvn/pkg-gnome/desktop/unstable/glade
 Vcs-Svn: svn://svn.debian.org/svn/pkg-gnome/desktop/unstable/glade
 Build-Depends: cdbs (>= 0.4.41),
-               debhelper (>= 5),
+               debhelper (>= 8),
                gnome-pkg-tools (>= 0.10),
                libxml2-dev (>= 2.4.0),
                libgtk-3-dev (>= 3.0.0),

Modified: desktop/unstable/glade/debian/gir1.2-gladeui-2.0.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/glade/debian/gir1.2-gladeui-2.0.install?rev=30843&op=diff
==============================================================================
--- desktop/unstable/glade/debian/gir1.2-gladeui-2.0.install [utf-8] (original)
+++ desktop/unstable/glade/debian/gir1.2-gladeui-2.0.install [utf-8] Thu Oct 20 05:01:59 2011
@@ -1,1 +1,1 @@
-debian/tmp/usr/lib/girepository-1.0/Gladeui-2.0.typelib
+usr/lib/girepository-1.0/Gladeui-2.0.typelib

Modified: desktop/unstable/glade/debian/glade.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/glade/debian/glade.install?rev=30843&op=diff
==============================================================================
--- desktop/unstable/glade/debian/glade.install [utf-8] (original)
+++ desktop/unstable/glade/debian/glade.install [utf-8] Thu Oct 20 05:01:59 2011
@@ -1,6 +1,6 @@
-debian/tmp/usr/bin
-debian/tmp/usr/share/icons/hicolor
-debian/tmp/usr/share/applications
-debian/tmp/usr/share/omf
-debian/tmp/usr/share/gnome
+usr/bin
+usr/share/icons/hicolor
+usr/share/applications
+usr/share/omf
+usr/share/gnome
 debian/glade.xpm usr/share/pixmaps/

Modified: desktop/unstable/glade/debian/libgladeui-2-0.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/glade/debian/libgladeui-2-0.install?rev=30843&op=diff
==============================================================================
--- desktop/unstable/glade/debian/libgladeui-2-0.install [utf-8] (original)
+++ desktop/unstable/glade/debian/libgladeui-2-0.install [utf-8] Thu Oct 20 05:01:59 2011
@@ -1,2 +1,2 @@
-debian/tmp/usr/lib/libgladeui-2.so.*
-debian/tmp/usr/lib/glade/modules/*.so
+usr/lib/libgladeui-2.so.*
+usr/lib/glade/modules/*.so

Modified: desktop/unstable/glade/debian/libgladeui-common.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/glade/debian/libgladeui-common.install?rev=30843&op=diff
==============================================================================
--- desktop/unstable/glade/debian/libgladeui-common.install [utf-8] (original)
+++ desktop/unstable/glade/debian/libgladeui-common.install [utf-8] Thu Oct 20 05:01:59 2011
@@ -1,3 +1,3 @@
-debian/tmp/usr/share/locale
-debian/tmp/usr/share/glade/pixmaps
-debian/tmp/usr/share/glade/catalogs/*.xml
+usr/share/locale
+usr/share/glade/pixmaps
+usr/share/glade/catalogs/*.xml

Modified: desktop/unstable/glade/debian/libgladeui-dev.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/glade/debian/libgladeui-dev.install?rev=30843&op=diff
==============================================================================
--- desktop/unstable/glade/debian/libgladeui-dev.install [utf-8] (original)
+++ desktop/unstable/glade/debian/libgladeui-dev.install [utf-8] Thu Oct 20 05:01:59 2011
@@ -1,4 +1,4 @@
-debian/tmp/usr/lib/*.so
-debian/tmp/usr/include
-debian/tmp/usr/lib/pkgconfig
-debian/tmp/usr/share/gir-1.0
+usr/lib/*.so
+usr/include
+usr/lib/pkgconfig
+usr/share/gir-1.0

Modified: desktop/unstable/glade/debian/libgladeui-doc.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/glade/debian/libgladeui-doc.install?rev=30843&op=diff
==============================================================================
--- desktop/unstable/glade/debian/libgladeui-doc.install [utf-8] (original)
+++ desktop/unstable/glade/debian/libgladeui-doc.install [utf-8] Thu Oct 20 05:01:59 2011
@@ -1,1 +1,1 @@
-debian/tmp/usr/share/gtk-doc/html/gladeui-2/* /usr/share/doc/libgladeui-doc/html/
+usr/share/gtk-doc/html/gladeui-2/* /usr/share/doc/libgladeui-doc/html/

Modified: desktop/unstable/glade/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/glade/debian/rules?rev=30843&op=diff
==============================================================================
--- desktop/unstable/glade/debian/rules [utf-8] (original)
+++ desktop/unstable/glade/debian/rules [utf-8] Thu Oct 20 05:01:59 2011
@@ -14,14 +14,6 @@
 
 LDFLAGS += -Wl,-z,defs -Wl,-O1 -Wl,--as-needed
 
-# ensures that libgladeui's shlibs are in place when calling dh_shlibdeps
-binary/glade:: binary/$(SHARED_PKG)
-
-# link with the freshly built libgladeui during dh_shlibdeps, and use freshly
-# generated shlib information
-DEB_SHLIBDEPS_LIBRARY_glade += $(SHARED_PKG)
-DEB_SHLIBDEPS_INCLUDE_glade += debian/$(SHARED_PKG)/usr/lib/
-
 binary-post-install/$(SHARED_PKG)::
 	dh_pysupport -p$(SHARED_PKG)
 




More information about the pkg-gnome-commits mailing list