tags 463845 + patch
thanks
Hi,
Attached is the diff for my xdb 1.2.0-7.2 NMU.
diff -u xdb-1.2.0/debian/changelog xdb-1.2.0/debian/changelog
--- xdb-1.2.0/debian/changelog
+++ xdb-1.2.0/debian/changelog
@@ -1,3 +1,10 @@
+xdb (1.2.0-7.2) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Bump debhelper compat level to 6 (Closes: #463845).
+
+ -- Luk Claes <[EMAIL PROTECTED]> Sun, 03 Feb 2008 23:59:51 +0000
+
xdb (1.2.0-7.1) unstable; urgency=medium
* Non-maintainer upload.
diff -u xdb-1.2.0/debian/rules xdb-1.2.0/debian/rules
--- xdb-1.2.0/debian/rules
+++ xdb-1.2.0/debian/rules
@@ -5,9 +5,6 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
-# This is the debhelper compatability version to use.
-export DH_COMPAT=1
-
build: build-stamp
build-stamp:
dh_testdir
@@ -49,13 +46,11 @@
# Build architecture-dependent files here.
binary-arch: build install libxdb-dev libxdb1
-libxdb1: build
+libxdb1: build install
dh_testdir -plibxdb1
dh_testroot -plibxdb1
dh_installdirs -plibxdb1
- rm -rf debian/tmp/usr/bin \
- debian/tmp/usr/include
-# dh_movefiles -plibxdb1
+ dh_install -plibxdb1
dh_installdocs -plibxdb1
# dh_undocumented
dh_installchangelogs -plibxdb1 ChangeLog
@@ -70,12 +65,12 @@
dh_md5sums -plibxdb1
dh_builddeb -plibxdb1
-libxdb-dev: build libxdb1
+libxdb-dev: build install libxdb1
dh_testdir -plibxdb-dev
dh_testroot -plibxdb-dev
- dh_clean -v -plibxdb-dev -k
+# dh_clean -v -plibxdb-dev -k
dh_installdirs -plibxdb-dev
- dh_movefiles -plibxdb-dev
+ dh_install -plibxdb-dev
# copy the examples
install -d \
@@ -109,7 +104,7 @@
dh_compress -plibxdb-dev
dh_fixperms -plibxdb-dev
dh_installdeb -plibxdb-dev
- dh_shlibdeps -plibxdb-dev -Llibxdb1 -ldebian/tmp/usr/lib
+ dh_shlibdeps -plibxdb-dev -Llibxdb1 -ldebian/libxdb1/usr/lib
dh_gencontrol -plibxdb-dev
dh_makeshlibs -plibxdb-dev -V
dh_md5sums -plibxdb-dev
diff -u xdb-1.2.0/debian/control xdb-1.2.0/debian/control
--- xdb-1.2.0/debian/control
+++ xdb-1.2.0/debian/control
@@ -2,7 +2,7 @@
Priority: optional
Maintainer: Michael Vogt <[EMAIL PROTECTED]>
Standards-Version: 3.6.2
-Build-Depends: debhelper, autotools-dev
+Build-Depends: debhelper (>= 6), autotools-dev
Section: libs
Package: libxdb1
reverted:
--- xdb-1.2.0/debian/libxdb1.files
+++ xdb-1.2.0.orig/debian/libxdb1.files
@@ -1 +0,0 @@
-usr/lib/*.so.*
reverted:
--- xdb-1.2.0/debian/libxdb-dev.files
+++ xdb-1.2.0.orig/debian/libxdb-dev.files
@@ -1,3 +0,0 @@
-usr/lib/lib*{.la,.so,.a}
-usr/include/*
-usr/bin/*
only in patch2:
unchanged:
--- xdb-1.2.0.orig/debian/compat
+++ xdb-1.2.0/debian/compat
@@ -0,0 +1 @@
+6
only in patch2:
unchanged:
--- xdb-1.2.0.orig/debian/libxdb-dev.install
+++ xdb-1.2.0/debian/libxdb-dev.install
@@ -0,0 +1,3 @@
+debian/tmp/usr/lib/lib*{.la,.so,.a} usr/lib
+debian/tmp/usr/include/* usr/include
+debian/tmp/usr/bin/* usr/bin
only in patch2:
unchanged:
--- xdb-1.2.0.orig/debian/libxdb1.install
+++ xdb-1.2.0/debian/libxdb1.install
@@ -0,0 +1 @@
+debian/tmp/usr/lib/*.so.* usr/lib
