r13568 - in /desktop/unstable/glade-3/debian: changelog control control.in libgladeui-1-dev.install rules

[joss at users.alioth.debian.org]

Author: joss
Date: Sun Nov 25 13:50:05 2007
New Revision: 13568

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=13568
Log:
* Install docs correctly in libgladeui-1-dev.
* Correctly move gnome and bonobo icons to glade-gnome.
* Disable static library build (not used).
* Enable gtk-doc build.
* Make libgladeui-1-dev architecture-independent.

Modified:
    desktop/unstable/glade-3/debian/changelog
    desktop/unstable/glade-3/debian/control
    desktop/unstable/glade-3/debian/control.in
    desktop/unstable/glade-3/debian/libgladeui-1-dev.install
    desktop/unstable/glade-3/debian/rules

Modified: desktop/unstable/glade-3/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/glade-3/debian/changelog?rev=13568&op=diff
==============================================================================
--- desktop/unstable/glade-3/debian/changelog (original)
+++ desktop/unstable/glade-3/debian/changelog Sun Nov 25 13:50:05 2007
@@ -1,4 +1,4 @@
-glade-3 (3.4.0-1) UNRELEASED; urgency=low
+glade-3 (3.4.0-1) unstable; urgency=low
 
   [ Josselin Mouette ]
   * Set priority to optional.
@@ -19,7 +19,14 @@
   * debian/rules
     + Fix debian menu path to use Applications/Programming.
 
- -- Deng Xiyue <manphiz-guest at users.alioth.debian.org>  Wed, 31 Oct 2007 23:27:56 +0800
+  [ Josselin Mouette ]
+  * Install docs correctly in libgladeui-1-dev.
+  * Correctly move gnome and bonobo icons to glade-gnome.
+  * Disable static library build (not used).
+  * Enable gtk-doc build.
+  * Make libgladeui-1-dev architecture-independent.
+
+ -- Josselin Mouette <joss at debian.org>  Sun, 25 Nov 2007 14:25:19 +0100
 
 glade-3 (3.2.2-1) unstable; urgency=low
 

Modified: desktop/unstable/glade-3/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/glade-3/debian/control?rev=13568&op=diff
==============================================================================
--- desktop/unstable/glade-3/debian/control (original)
+++ desktop/unstable/glade-3/debian/control Sun Nov 25 13:50:05 2007
@@ -47,11 +47,11 @@
  saving files.
 
 Package: libgladeui-1-dev
-Architecture: any
+Architecture: all
 Section: libdevel
 Depends: ${misc:Depends},
          ${shlibs:Depends},
-         libgladeui-1-7 (= ${binary:Version}),
+         libgladeui-1-7 (>= ${source:Version}),
          libgtk2.0-dev (>= 2.10.0),
          libxml2-dev (>= 2.4.0)
 Description: GTK+ User Interface Build core library (development files)

Modified: desktop/unstable/glade-3/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/glade-3/debian/control.in?rev=13568&op=diff
==============================================================================
--- desktop/unstable/glade-3/debian/control.in (original)
+++ desktop/unstable/glade-3/debian/control.in Sun Nov 25 13:50:05 2007
@@ -47,11 +47,10 @@
  saving files.
 
 Package: libgladeui-1-dev
-Architecture: any
+Architecture: all
 Section: libdevel
 Depends: ${misc:Depends},
-         ${shlibs:Depends},
-         libgladeui-1-7 (= ${binary:Version}),
+         libgladeui-1-7 (>= ${source:Version}),
          libgtk2.0-dev (>= 2.10.0),
          libxml2-dev (>= 2.4.0)
 Description: GTK+ User Interface Build core library (development files)

Modified: desktop/unstable/glade-3/debian/libgladeui-1-dev.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/glade-3/debian/libgladeui-1-dev.install?rev=13568&op=diff
==============================================================================
--- desktop/unstable/glade-3/debian/libgladeui-1-dev.install (original)
+++ desktop/unstable/glade-3/debian/libgladeui-1-dev.install Sun Nov 25 13:50:05 2007
@@ -1,3 +1,4 @@
 debian/tmp/usr/lib/*.so
 debian/tmp/usr/include
 debian/tmp/usr/lib/pkgconfig
+debian/tmp/usr/share/gtk-doc/html/gladeui/* /usr/share/doc/libgladeui-1-dev/html/

Modified: desktop/unstable/glade-3/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/glade-3/debian/rules?rev=13568&op=diff
==============================================================================
--- desktop/unstable/glade-3/debian/rules (original)
+++ desktop/unstable/glade-3/debian/rules Sun Nov 25 13:50:05 2007
@@ -13,9 +13,8 @@
 GNOME_MODULE := glade3
 
 DEB_CONFIGURE_EXTRA_FLAGS += \
-			--disable-gtk-doc \
-			--disable-scrollkeeper \
-			--enable-static
+			--enable-gtk-doc \
+			--disable-scrollkeeper
 # Disabled until there are some useful python widget catalogs:
 #                            --enable-python
 
@@ -34,8 +33,8 @@
 
 # move stuff that will go in glade-gnome
 binary-post-install/libgladeui-1-7::
-	for file in $$(find debian/libgladeui-1-5/usr/share/glade3/pixmaps/ -name gnome\* -or -name bonobo\*); do \
-		target_dir=$$(dirname $${file/libgladeui-1-5/glade-gnome}); \
+	for file in $$(find debian/libgladeui-1-7/usr/share/glade3/pixmaps/ -name \*gnome\* -or -name \*bonobo\*); do \
+		target_dir=$$(dirname $${file/libgladeui-1-7/glade-gnome}); \
 		mkdir -p $${target_dir}; \
 		mv $${file} $${target_dir}; \
 	done