tags 426355 + pending patch
thanks

Hi,

Here the patch of my NMU attempt

If you have any objections about this NMU please contact me ASAP

Regards

Laurent Bigonville
diff -ru libonig-5.5.2/debian/changelog onig-5.9.0/debian/changelog
--- libonig-5.5.2/debian/changelog	2007-08-04 14:51:49.000000000 +0200
+++ onig-5.9.0/debian/changelog	2007-08-04 15:08:15.000000000 +0200
@@ -1,3 +1,16 @@
+libonig (5.9.0-0.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * New upstream release (Closes: #426355)
+  * debian/control:
+    - Use binary:Version instead of Source-Version
+  * debian/rules:
+    - Don't hide make distclean error
+    - Fix copy of config.{sub,guess}
+    - Remove deprecated DH_COMPAT and use compat file instead
+
+ -- Laurent Bigonville <[EMAIL PROTECTED]>  Sat, 04 Aug 2007 15:07:34 +0200
+
 libonig (5.5.2-1) unstable; urgency=low
 
   * new upstream release
Seulement dans onig-5.9.0/debian/: compat
diff -ru libonig-5.5.2/debian/control onig-5.9.0/debian/control
--- libonig-5.5.2/debian/control	2007-08-04 14:51:49.000000000 +0200
+++ onig-5.9.0/debian/control	2007-08-04 14:53:58.000000000 +0200
@@ -18,7 +18,7 @@
 Package: libonig2-dbg
 Section: libdevel
 Architecture: any
-Depends: ${shlibs:Depends}, libonig2 (= ${Source-Version})
+Depends: ${shlibs:Depends}, libonig2 (= ${binary:Version})
 Description: Debugging symbols for libonig2
  The characteristics of this library is that different character
  encoding for every regular expression object can be specified.
@@ -30,7 +30,7 @@
 Package: libonig-dev
 Section: libdevel
 Architecture: any
-Depends: ${shlibs:Depends}, libonig2 (= ${Source-Version})
+Depends: ${shlibs:Depends}, libonig2 (= ${binary:Version})
 Description: Development files for libonig2
  The characteristics of this library is that different character
  encoding for every regular expression object can be specified.
diff -ru libonig-5.5.2/debian/rules onig-5.9.0/debian/rules
--- libonig-5.5.2/debian/rules	2007-08-04 14:51:49.000000000 +0200
+++ onig-5.9.0/debian/rules	2007-08-04 15:07:23.000000000 +0200
@@ -4,8 +4,6 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-export DH_COMPAT = 5
-
 DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 
@@ -22,7 +20,12 @@
 	dh_testdir
 
 	# update libonig's autotools files
-	cp /usr/share/misc/config.{sub,guess} .
+ifneq "$(wildcard /usr/share/misc/config.sub)" ""
+	cp -f /usr/share/misc/config.sub config.sub
+endif
+ifneq "$(wildcard /usr/share/misc/config.guess)" ""
+	cp -f /usr/share/misc/config.guess config.guess
+endif
 
 	# ./configure
 	CFLAGS="$(CFLAGS)" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \
@@ -40,7 +43,7 @@
 	dh_testroot
 	rm -f build-stamp install*-stamp
 
-	-$(MAKE) distclean
+	[ ! -f Makefile ] || $(MAKE) distclean
 
 	dh_clean
 

Attachment: pgpHXtlC5669g.pgp
Description: PGP signature

Reply via email to