Package: libgpg-error
Version: 1.10-0.1
Severity: wishlist
Tags: d-i patch

Hello,

in order to upload a cryptsetup binary which uses shared libgpg-error0
library, unfortunately some more preliminary steps are required.

the cryptsetup binary now has all dependencies in experimental
(libgpg-error0 and libgcrypt11 stored in /lib). but cryptsetup as well
provides a udeb package for the debian-installer. as the binary shipped
there is the same one, libgpg-error0-udeb and libgcrypt11-udeb packages
are required as well.

i prepared a patch (applies against libgpg-error 1.10-0.1 from
experimental) which adds the udeb and two other minor fixes.

if you've no objections, i could upload it as NMU to experimental, just
like i did with the last upload.

greetings,
 jonas

-- System Information:
Debian Release: 6.0
  APT prefers unstable
  APT policy: (500, 'unstable'), (1, 'experimental')
Architecture: amd64 (x86_64)

Kernel: Linux 2.6.37-rc5-1-amd64-resivo (SMP w/2 CPU cores)
Locale: LANG=C, LC_CTYPE=de_DE.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
diff -rNu libgpg-error-1.10.orig/.pc/.quilt_patches libgpg-error-1.10/.pc/.quilt_patches
--- libgpg-error-1.10.orig/.pc/.quilt_patches	2010-12-31 15:49:19.000000000 +0100
+++ libgpg-error-1.10/.pc/.quilt_patches	1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-debian/patches
diff -rNu libgpg-error-1.10.orig/.pc/.quilt_series libgpg-error-1.10/.pc/.quilt_series
--- libgpg-error-1.10.orig/.pc/.quilt_series	2010-12-31 15:49:19.000000000 +0100
+++ libgpg-error-1.10/.pc/.quilt_series	1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-series
diff -rNu libgpg-error-1.10.orig/.pc/.version libgpg-error-1.10/.pc/.version
--- libgpg-error-1.10.orig/.pc/.version	2010-12-31 15:49:19.000000000 +0100
+++ libgpg-error-1.10/.pc/.version	1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-2
diff -rNu libgpg-error-1.10.orig/debian/changelog libgpg-error-1.10/debian/changelog
--- libgpg-error-1.10.orig/debian/changelog	2010-12-16 12:56:33.000000000 +0100
+++ libgpg-error-1.10/debian/changelog	2010-12-31 15:37:12.000000000 +0100
@@ -1,3 +1,11 @@
+libgpg-error (1.10-0.2) experimental; urgency=low
+
+  * Non-maintainer upload.
+  * Add libgpg-error0-udeb package for debian-installer.
+  * Link *.la files (thanks to ubuntu)
+
+ -- Jonas Meurer <[email protected]>  Fri, 31 Dec 2010 15:36:50 +0100
+
 libgpg-error (1.10-0.1) experimental; urgency=low
 
   * Non-maintainer upload.
diff -rNu libgpg-error-1.10.orig/debian/control libgpg-error-1.10/debian/control
--- libgpg-error-1.10.orig/debian/control	2010-12-16 12:35:15.000000000 +0100
+++ libgpg-error-1.10/debian/control	2010-12-31 15:34:39.000000000 +0100
@@ -28,3 +28,14 @@
  components.  Among these are GPG, GPGSM, GPGME, GPG-Agent, libgcrypt,
  pinentry, SmartCard Daemon and possibly more in the future.
 
+Package: libgpg-error0-udeb
+Priority: optional
+Section: debian-installer
+XC-Package-Type: udeb
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: library for common error values and messages in GnuPG components
+ Library that defines common error values for all GnuPG
+ components.  Among these are GPG, GPGSM, GPGME, GPG-Agent, libgcrypt,
+ pinentry, SmartCard Daemon and possibly more in the future.
+
diff -rNu libgpg-error-1.10.orig/debian/libgpg-error-dev.links libgpg-error-1.10/debian/libgpg-error-dev.links
--- libgpg-error-1.10.orig/debian/libgpg-error-dev.links	1970-01-01 01:00:00.000000000 +0100
+++ libgpg-error-1.10/debian/libgpg-error-dev.links	2010-12-31 15:36:09.000000000 +0100
@@ -0,0 +1 @@
+usr/lib/libgpg-error.la lib/libgpg-error.la
diff -rNu libgpg-error-1.10.orig/debian/libgpg-error0-udeb.dirs libgpg-error-1.10/debian/libgpg-error0-udeb.dirs
--- libgpg-error-1.10.orig/debian/libgpg-error0-udeb.dirs	1970-01-01 01:00:00.000000000 +0100
+++ libgpg-error-1.10/debian/libgpg-error0-udeb.dirs	2010-12-31 14:33:44.000000000 +0100
@@ -0,0 +1 @@
+lib
diff -rNu libgpg-error-1.10.orig/debian/libgpg-error0-udeb.install libgpg-error-1.10/debian/libgpg-error0-udeb.install
--- libgpg-error-1.10.orig/debian/libgpg-error0-udeb.install	1970-01-01 01:00:00.000000000 +0100
+++ libgpg-error-1.10/debian/libgpg-error0-udeb.install	2010-12-31 15:34:51.000000000 +0100
@@ -0,0 +1 @@
+lib/lib*.so.*
diff -rNu libgpg-error-1.10.orig/debian/rules libgpg-error-1.10/debian/rules
--- libgpg-error-1.10.orig/debian/rules	2010-12-16 12:06:13.000000000 +0100
+++ libgpg-error-1.10/debian/rules	2010-12-31 15:36:49.000000000 +0100
@@ -30,10 +30,10 @@
 endif
     
 
-version=`ls libgpg-error/.libs/lib*.so.* | \
- awk '{if (match($$0,/[0-9]+\.[0-9]+\.[0-9]+$$/)) print substr($$0,RSTART)}'`
-major=`ls libgpg-error/.libs/lib*.so.* | \
- awk '{if (match($$0,/\.so\.[0-9]+$$/)) print substr($$0,RSTART+4)}'`
+#version=`ls libgpg-error/.libs/lib*.so.* | \
+# awk '{if (match($$0,/[0-9]+\.[0-9]+\.[0-9]+$$/)) print substr($$0,RSTART)}'`
+#major=`ls libgpg-error/.libs/lib*.so.* | \
+# awk '{if (match($$0,/\.so\.[0-9]+$$/)) print substr($$0,RSTART+4)}'`
 
 configure: configure-stamp
 configure-stamp:
@@ -61,13 +61,11 @@
                 cp -f /usr/share/misc/config.sub config.sub
 #	-test -r /usr/share/misc/config.guess && \
                 cp -f /usr/share/misc/config.guess config.guess
-                                                                                                
 #	-if test -f ltmain.sh ; then touch ltmain.sh; else libtoolize -c; fi
 #	-if test -f aclocal.m4 ; then touch aclocal.m4; else aclocal-1.8 -I m4 ; fi
 #	-if test -f config.h.in ; then touch config.h.in; else autoheader2.50; fi
 #	-if test -f Makefile.in ; then find . -name Makefile.in -exec touch {} \; ;\
 #               else automake-1.8 --copy --add-missing; fi
-                                                                                                
 #	-if test -f configure ; then touch configure; else autoconf2.50; fi
 
 	[ ! -f Makefile ] || $(MAKE) distclean
@@ -91,6 +89,7 @@
 	dh_testdir
 	dh_testroot
 	dh_install --sourcedir=debian/tmp
+	sed -i "/dependency_libs/ s/'.*'/''/" debian/*/usr/lib/*.la
 
 	dh_installdocs
 	dh_installman
@@ -100,7 +99,7 @@
 	dh_strip
 	dh_compress
 	dh_fixperms
-	dh_makeshlibs -V
+	dh_makeshlibs -V --add-udeb=libgpg-error0-udeb
 	dh_installdeb
 	dh_shlibdeps
 	dh_gencontrol

Attachment: signature.asc
Description: Digital signature

Reply via email to