[Pkg-cli-apps-commits] [SCM] podsleuth branch, master, updated. debian/0.6.4-2-13-gb8d8f47
Chow Loong Jin
hyperair at gmail.com
Fri Oct 2 18:38:10 UTC 2009
The following commit has been merged in the master branch:
commit b2126c2d0e0a3cffaa95b2c16c36b762bddcb04c
Author: Chow Loong Jin <hyperair at gmail.com>
Date: Sat Oct 3 02:03:57 2009 +0800
DH7-ization
* Drop sgutils patch, no longer needed.
* Add me to Uploaders
* Tidy up build-deps
* Use mono-csc
* Use DH7
diff --git a/debian/changelog b/debian/changelog
index e891e16..e46fd1d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,21 +1,23 @@
-podsleuth (0.6.4-3) UNRELEASED; urgency=low
+podsleuth (0.6.5-1) UNRELEASED; urgency=low
[ Martin Pitt ]
* debian/control: libsgutils1-dev → libsgutils2-dev.
- * Add 01-sgutils-soname.patch: Update configure check for new libsgutils
- soname.
[ Iain Lane ]
* Update DLLImports/DLLMap for the above transition
* Increase Standards-Version, no changes required
[ Chow Loong Jin ]
- * debian/control:
+ * debian/control, debian/rules, debian/compat:
+ Update Vcs-* to git
+ + Use DH7 and mono-csc instead of csc
+ + Bump compat level to 7
+ + Tidied up build-dependencies
+ + Add me to Uploaders
* debian/watch:
+ Update to support new URLs
- -- Chow Loong Jin <hyperair at ubuntu.com> Sat, 03 Oct 2009 01:28:31 +0800
+ -- Chow Loong Jin <hyperair at ubuntu.com> Sat, 03 Oct 2009 02:03:37 +0800
podsleuth (0.6.4-2) unstable; urgency=low
diff --git a/debian/compat b/debian/compat
index 7ed6ff8..7f8f011 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-5
+7
diff --git a/debian/control b/debian/control
index 53efefa..c515b35 100644
--- a/debian/control
+++ b/debian/control
@@ -2,16 +2,14 @@ Source: podsleuth
Section: sound
Priority: optional
Maintainer: Debian CLI Applications Team <pkg-cli-apps-team at lists.alioth.debian.org>
-Uploaders: Sebastian Dröge <slomo at debian.org>
-Build-Depends: debhelper (>= 5),
- cdbs,
- cli-common-dev (>= 0.4.4),
- mono-devel,
- libmono-dev (>= 1.1.10),
- libmono-posix2.0-cil,
- libndesk-dbus1.0-cil (>= 0.4),
- libhal-dev (>= 0.5.6),
- libsgutils2-dev
+Uploaders: Sebastian Dröge <slomo at debian.org>,
+ Chow Loong Jin <hyperair at ubuntu.com>
+Build-Depends: debhelper (>= 7.0.50),
+ cli-common-dev (>= 0.5.7),
+ mono-devel (>= 2.4.2),
+ libndesk-dbus1.0-cil (>= 0.4),
+ libhal-dev (>= 0.5.6),
+ libsgutils2-dev
Standards-Version: 3.8.3
Vcs-Git: git://git.debian.org/git/pkg-cli-apps/packages/podsleuth.git
Vcs-Browser: http://git.debian.org/?p=pkg-cli-apps/packages/podsleuth.git
diff --git a/debian/patches/01-sgutils-soname.patch b/debian/patches/01-sgutils-soname.patch
deleted file mode 100644
index fd927e5..0000000
--- a/debian/patches/01-sgutils-soname.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-diff -Nur -x '*.orig' -x '*~' podsleuth.git/configure podsleuth.git.new/configure
---- podsleuth.git/configure 2009-08-24 13:51:28.000000000 +0100
-+++ podsleuth.git.new/configure 2009-08-24 14:20:50.000000000 +0100
-@@ -4392,13 +4392,13 @@
-
-
-
--{ $as_echo "$as_me:$LINENO: checking for sg_ll_inquiry in -lsgutils" >&5
--$as_echo_n "checking for sg_ll_inquiry in -lsgutils... " >&6; }
-+{ $as_echo "$as_me:$LINENO: checking for sg_ll_inquiry in -lsgutils2" >&5
-+$as_echo_n "checking for sg_ll_inquiry in -lsgutils2... " >&6; }
- if test "${ac_cv_lib_sgutils_sg_ll_inquiry+set}" = set; then
- $as_echo_n "(cached) " >&6
- else
- ac_check_lib_save_LIBS=$LIBS
--LIBS="-lsgutils $LIBS"
-+LIBS="-lsgutils2 $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
-@@ -4462,11 +4462,11 @@
- #define HAVE_LIBSGUTILS 1
- _ACEOF
-
-- LIBS="-lsgutils $LIBS"
-+ LIBS="-lsgutils2 $LIBS"
-
- else
-- { { $as_echo "$as_me:$LINENO: error: Error! You need to have libsgutils." >&5
--$as_echo "$as_me: error: Error! You need to have libsgutils." >&2;}
-+ { { $as_echo "$as_me:$LINENO: error: Error! You need to have libsgutils2." >&5
-+$as_echo "$as_me: error: Error! You need to have libsgutils2." >&2;}
- { (exit 1); exit 1; }; }
-
- fi
-diff -Nur -x '*.orig' -x '*~' podsleuth.git/m4/podsleuth.m4 podsleuth.git.new/m4/podsleuth.m4
---- podsleuth.git/m4/podsleuth.m4 2009-07-05 22:24:20.000000000 +0100
-+++ podsleuth.git.new/m4/podsleuth.m4 2009-08-24 14:20:50.000000000 +0100
-@@ -32,8 +32,8 @@
-
- AC_DEFUN([PODSLEUTH_CHECK_SGUTILS],
- [
-- AC_CHECK_LIB(sgutils, sg_ll_inquiry, [],
-- AC_MSG_ERROR([Error! You need to have libsgutils.])
-+ AC_CHECK_LIB(sgutils2, sg_ll_inquiry, [],
-+ AC_MSG_ERROR([Error! You need to have libsgutils2.])
- )
- ])
-
-diff -Nur -x '*.orig' -x '*~' podsleuth.git/src/PodSleuth/PodSleuth/ScsiReader.cs podsleuth.git.new/src/PodSleuth/PodSleuth/ScsiReader.cs
---- podsleuth.git/src/PodSleuth/PodSleuth/ScsiReader.cs 2009-07-05 22:24:20.000000000 +0100
-+++ podsleuth.git.new/src/PodSleuth/PodSleuth/ScsiReader.cs 2009-08-24 14:21:02.000000000 +0100
-@@ -50,7 +50,7 @@
- }
- }
-
-- [DllImport("libsgutils.so.1")]
-+ [DllImport("libsgutils2.so.2")]
- private static extern int sg_ll_inquiry(int sg_fd, int cmddt, int evpd, int pg_op,
- IntPtr resp, int mx_resp_len, int noisy, int verbose);
-
-@@ -74,4 +74,4 @@
- }
- }
- }
--}
-\ No newline at end of file
-+}
-diff -Nur -x '*.orig' -x '*~' podsleuth.git/src/PodSleuth/PodSleuth.dll.config.in podsleuth.git.new/src/PodSleuth/PodSleuth.dll.config.in
---- podsleuth.git/src/PodSleuth/PodSleuth.dll.config.in 2009-07-05 22:24:20.000000000 +0100
-+++ podsleuth.git.new/src/PodSleuth/PodSleuth.dll.config.in 2009-08-24 14:21:16.000000000 +0100
-@@ -1,4 +1,4 @@
- <configuration>
-- <dllmap dll="libsgutils.so.1" target="libsgutils.so.1" />
-+ <dllmap dll="libsgutils2.so.2" target="libsgutils2.so.2" />
- </configuration>
-
diff --git a/debian/rules b/debian/rules
index 3d60d0f..15d7df2 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,22 +1,11 @@
#!/usr/bin/make -f
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
-include /usr/share/cdbs/1/class/gnome.mk
-include /usr/share/cdbs/1/rules/utils.mk
+include /usr/share/cli-common/cli.make
-common-binary-post-install-arch:: list-missing
-
-export MONO_SHARED_DIR=$(CURDIR)
-
-DEB_CONFIGURE_EXTRA_FLAGS += --with-hal-callouts-dir=/usr/lib/hal \
- --with-update-dir=/var/lib/podsleuth \
- MCS=/usr/bin/csc
-
-common-binary-predeb-indep::
- dh_clifixperms
- dh_clideps -d
-
-clean::
- rm -rf $(MONO_SHARED_DIR)/.wapi
+override_dh_auto_configure:
+ dh_auto_configure -- --with-hal-callouts-dir=/usr/lib/hal \
+ --with-update-dir=/var/lib/podsleuth \
+ MCS=/usr/bin/mono-csc
+%:
+ dh $@
--
podsleuth
More information about the Pkg-cli-apps-commits
mailing list