r15637 - in /desktop/experimental/glade-3/debian: changelog control control.in libgladeui-1-7.install libgladeui-1-8.install rules

manphiz-guest at users.alioth.debian.org manphiz-guest at users.alioth.debian.org
Sun Apr 13 06:59:42 UTC 2008


Author: manphiz-guest
Date: Sun Apr 13 06:59:40 2008
New Revision: 15637

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=15637
Log:
+ Soversion updated to 8, rename shared library name to
libgladeui-1-8.
* Use sed to get shared library name SHARED_PKG and replace all
references to ease future soversion updates.

Added:
    desktop/experimental/glade-3/debian/libgladeui-1-8.install
      - copied unchanged from r15636, desktop/experimental/glade-3/debian/libgladeui-1-7.install
Removed:
    desktop/experimental/glade-3/debian/libgladeui-1-7.install
Modified:
    desktop/experimental/glade-3/debian/changelog
    desktop/experimental/glade-3/debian/control
    desktop/experimental/glade-3/debian/control.in
    desktop/experimental/glade-3/debian/rules

Modified: desktop/experimental/glade-3/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glade-3/debian/changelog?rev=15637&op=diff
==============================================================================
--- desktop/experimental/glade-3/debian/changelog (original)
+++ desktop/experimental/glade-3/debian/changelog Sun Apr 13 06:59:40 2008
@@ -1,6 +1,8 @@
 glade-3 (3.5.2-1) experimental; urgency=low
 
   * New upstream development release.
+    + Soversion updated to 8, rename shared library name to
+      libgladeui-1-8.
     + Update gtk-doc-tools b-dep to >= 1.9 as required by new version.
   * Don't (b-)dep on versioned scrollkeeper.  (Closes: #469699)
   * Comment out ALLOWED_DISTS += unstable, as it's now targeting
@@ -9,8 +11,10 @@
   * Recommend libgtk2.0-dev >= 2.12.0.
   * Don't make shared library Conflicts/Replaces older versions, as they
     should be able to coexist.
-
- -- Deng Xiyue <manphiz-guest at users.alioth.debian.org>  Thu, 10 Apr 2008 20:21:50 +0800
+  * Use sed to get shared library name SHARED_PKG and replace all
+    references to ease future soversion updates.
+
+ -- Deng Xiyue <manphiz-guest at users.alioth.debian.org>  Sun, 13 Apr 2008 14:44:15 +0800
 
 glade-3 (3.4.3-1) unstable; urgency=low
 

Modified: desktop/experimental/glade-3/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glade-3/debian/control?rev=15637&op=diff
==============================================================================
--- desktop/experimental/glade-3/debian/control (original)
+++ desktop/experimental/glade-3/debian/control Sun Apr 13 06:59:40 2008
@@ -20,7 +20,7 @@
 Standards-Version: 3.7.3
 Homepage: http://glade.gnome.org
 
-Package: libgladeui-1-7
+Package: libgladeui-1-8
 Architecture: any
 Section: libdevel
 Depends: ${misc:Depends},
@@ -41,7 +41,7 @@
 Architecture: all
 Section: libdevel
 Depends: ${misc:Depends},
-         libgladeui-1-7 (>= ${source:Version}),
+         libgladeui-1-8 (>= ${source:Version}),
          libgtk2.0-dev (>= 2.12.0),
          libxml2-dev (>= 2.4.0)
 Description: GTK+ User Interface Build core library (development files)

Modified: desktop/experimental/glade-3/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glade-3/debian/control.in?rev=15637&op=diff
==============================================================================
--- desktop/experimental/glade-3/debian/control.in (original)
+++ desktop/experimental/glade-3/debian/control.in Sun Apr 13 06:59:40 2008
@@ -20,7 +20,7 @@
 Standards-Version: 3.7.3
 Homepage: http://glade.gnome.org
 
-Package: libgladeui-1-7
+Package: libgladeui-1-8
 Architecture: any
 Section: libdevel
 Depends: ${misc:Depends},
@@ -41,7 +41,7 @@
 Architecture: all
 Section: libdevel
 Depends: ${misc:Depends},
-         libgladeui-1-7 (>= ${source:Version}),
+         libgladeui-1-8 (>= ${source:Version}),
          libgtk2.0-dev (>= 2.12.0),
          libxml2-dev (>= 2.4.0)
 Description: GTK+ User Interface Build core library (development files)

Modified: desktop/experimental/glade-3/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glade-3/debian/rules?rev=15637&op=diff
==============================================================================
--- desktop/experimental/glade-3/debian/rules (original)
+++ desktop/experimental/glade-3/debian/rules Sun Apr 13 06:59:40 2008
@@ -12,6 +12,8 @@
 
 GNOME_MODULE := glade3
 
+SHARED_PKG := $(shell sed -rn 's/Package:[[:space:]]*(libgladeui-[0-9\.]+-[0-9][0-9a-z]*)[[:space:]]*$$/\1/p' debian/control)
+
 DEB_CONFIGURE_EXTRA_FLAGS += \
 			--enable-gtk-doc \
 			--disable-scrollkeeper
@@ -21,20 +23,20 @@
 LDFLAGS += -Wl,-z,defs -Wl,-O1 -Wl,--as-needed
 
 # ensures that libgladeui's shlibs are in place when calling dh_shlibdeps
-binary-glade:: binary-libgladeui-1-7
-binary-glade-gnome:: binary-libgladeui-1-7
+binary-glade:: binary-$(SHARED_PKG)
+binary-glade-gnome:: binary-$(SHARED_PKG)
 
 # link with the freshly build libgladeui during dh_shlibdeps, and use freshly
 # generated shlib information
-DEB_SHLIBDEPS_LIBRARY_glade += libgladeui-1-7
-DEB_SHLIBDEPS_INCLUDE_glade += debian/libgladeui-1-7/usr/lib/
-DEB_SHLIBDEPS_LIBRARY_glade-common += libgladeui-1-7
-DEB_SHLIBDEPS_INCLUDE_glade-common += debian/libgladeui-1-7/usr/lib/
+DEB_SHLIBDEPS_LIBRARY_glade += $(SHARED_PKG)
+DEB_SHLIBDEPS_INCLUDE_glade += debian/$(SHARED_PKG)/usr/lib/
+DEB_SHLIBDEPS_LIBRARY_glade-common += $(SHARED_PKG)
+DEB_SHLIBDEPS_INCLUDE_glade-common += debian/$(SHARED_PKG)/usr/lib/
 
 # move stuff that will go in glade-gnome
-binary-post-install/libgladeui-1-7::
-	for file in $$(find debian/libgladeui-1-7/usr/share/glade3/pixmaps/ -name \*gnome\* -or -name \*bonobo\*); do \
-		target_dir=$$(dirname debian/glade-gnome/$${file#debian/libgladeui-1-7/}); \
+binary-post-install/$(SHARED_PKG)::
+	for file in $$(find debian/$(SHARED_PKG)/usr/share/glade3/pixmaps/ -name \*gnome\* -or -name \*bonobo\*); do \
+		target_dir=$$(dirname debian/glade-gnome/$${file#debian/$(SHARED_PKG)/}); \
 		mkdir -p $${target_dir}; \
 		mv $${file} $${target_dir}; \
 	done




More information about the pkg-gnome-commits mailing list