[Debian-hebrew-package] [svn] r372 - pkg/fribidi/trunk/debian

[Lior Kaplan]

Author: kaplan-guest
Date: Sun Mar 12 19:28:43 2006
New Revision: 372

Modified:
   pkg/fribidi/trunk/debian/changelog
   pkg/fribidi/trunk/debian/compat
   pkg/fribidi/trunk/debian/control
   pkg/fribidi/trunk/debian/rules
Log:
Fix #356260 fribidi: Please add udeb: lines to shlibs file


Modified: pkg/fribidi/trunk/debian/changelog
==============================================================================
--- pkg/fribidi/trunk/debian/changelog	(original)
+++ pkg/fribidi/trunk/debian/changelog	Sun Mar 12 19:28:43 2006
@@ -1,3 +1,10 @@
+fribidi (0.10.7-3) unstable; urgency=low
+
+  * Apply patch from Frans Pop on debian/{rules,control} to better handle udeb 
+    package in the shlibs file (Closes: #356260)
+
+ -- Lior Kaplan <webmaster at guides.co.il>  Sun, 12 Mar 2006 21:22:31 +0200
+
 fribidi (0.10.7-2) unstable; urgency=low
 
   * Update watch file (Closes: #354354)

Modified: pkg/fribidi/trunk/debian/compat
==============================================================================
--- pkg/fribidi/trunk/debian/compat	(original)
+++ pkg/fribidi/trunk/debian/compat	Sun Mar 12 19:28:43 2006
@@ -1 +1 @@
-4
+5

Modified: pkg/fribidi/trunk/debian/control
==============================================================================
--- pkg/fribidi/trunk/debian/control	(original)
+++ pkg/fribidi/trunk/debian/control	Sun Mar 12 19:28:43 2006
@@ -4,7 +4,7 @@
 Maintainer: Debian Hebrew Packaging Team <debian-hebrew-package at lists.alioth.debian.org>
 Uploaders: Baruch Even <baruch at debian.org>, Lior Kaplan <webmaster at guides.co.il>
 Standards-Version: 3.6.2
-Build-Depends: debhelper (>> 4.0.0), pkg-config
+Build-Depends: debhelper (>> 5.0.22), pkg-config
 
 Package: libfribidi0
 Architecture: any
@@ -26,10 +26,11 @@
  Upstream: http://fribidi.org/
 
 Package: libfribidi0-udeb
+XC-Package-Type: udeb
 Architecture: any
 Section: debian-installer
 Priority: extra
-Depends: libc-udeb
+Depends: ${shlibs:Depends}
 Description: Free Implementation of the Unicode BiDi algorithm
  This Debian Installer component provided Bidirectional support 
  for Arabic and/or Hebrew languages.

Modified: pkg/fribidi/trunk/debian/rules
==============================================================================
--- pkg/fribidi/trunk/debian/rules	(original)
+++ pkg/fribidi/trunk/debian/rules	Sun Mar 12 19:28:43 2006
@@ -13,15 +13,10 @@
 export DH_OPTIONS
 
 FRIBIDI_UDEB=libfribidi0-udeb
-DEBVERSION=$(shell dpkg-parsechangelog | grep '^Version: ' | sed -e 's/^Version: //')
-UDEBNAME=$(FRIBIDI_UDEB)_$(DEBVERSION)_$(shell dpkg --print-architecture).udeb
 
 ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
 OBJS += xmalloc.o
-STRIP= /bin/true
 else
-STRIPTOOL=strip
-STRIP= $(STRIPTOOL) --remove-section=.note --remove-section=.comment
 DEB_CFLAGS=-Os -fomit-frame-pointer
 endif
 
@@ -73,25 +68,21 @@
 
 	dh_movefiles
 
-	dh_installdocs -a -N$(FRIBIDI_UDEB)
-	dh_installman -a -N$(FRIBIDI_UDEB)
-	dh_installchangelogs ChangeLog -a -N$(FRIBIDI_UDEB)
+	dh_installdocs -a
+	dh_installman -a
+	dh_installchangelogs ChangeLog -a
 	mkdir -p debian/$(FRIBIDI_UDEB)/lib
 	cp -a debian/libfribidi0/usr/lib/* debian/$(FRIBIDI_UDEB)/lib
-	$(STRIP) debian/$(FRIBIDI_UDEB)/lib/libfribidi.so.0.0.0
-	dh_strip
+	dh_strip -a
 	dh_link
 	dh_compress
 	dh_fixperms
-	dh_makeshlibs -V -N$(FRIBIDI_UDEB)
-	dh_shlibdeps -Xusr/bin/fribidi -N$(FRIBIDI_UDEB)
-	dh_installdeb -N$(FRIBIDI_UDEB)
-	dh_gencontrol -a -N$(FRIBIDI_UDEB)
-	dh_md5sums -a -N$(FRIBIDI_UDEB)
-	dh_builddeb -a -N$(FRIBIDI_UDEB)
-	dh_gencontrol -p$(FRIBIDI_UDEB) -- -fdebian/files~
-	dpkg-distaddfile $(UDEBNAME) debian-installer extra
-	dh_builddeb $(FRIBIDI_UDEB) --filename=$(UDEBNAME)
+	dh_makeshlibs -V --add-udeb="$(FRIBIDI_UDEB)"
+	dh_shlibdeps -Xusr/bin/fribidi
+	dh_installdeb
+	dh_gencontrol
+	dh_md5sums
+	dh_builddeb
 
 binary: binary-indep binary-arch
 .PHONY: build clean binary-indep binary-arch binary install configure