Control: tags 1058841 + pending

Dear maintainer,

I've prepared an NMU for libopenobex (versioned as 1.7.2-2.2) and
uploaded it to DELAYED/7.
It also includes the Debian Janitor changes from salsa.

I've pushed the same as a branch to:
  https://salsa.debian.org/debian/libopenobex/-/tree/nmu-1058841?ref_type=heads

Chris

diff -Nru libopenobex-1.7.2/debian/changelog libopenobex-1.7.2/debian/changelog
--- libopenobex-1.7.2/debian/changelog	2021-12-20 12:00:45.000000000 +0100
+++ libopenobex-1.7.2/debian/changelog	2024-01-14 14:06:37.000000000 +0100
@@ -1,3 +1,20 @@
+libopenobex (1.7.2-2.2) unstable; urgency=medium
+
+  * Non-maintainer upload.
+
+  [ Debian Janitor ]
+  * Trim trailing whitespace.
+  * Fix field name case in debian/copyright (FIles => Files).
+  * Remove constraints unnecessary since buster (oldstable):
+    + Build-Depends: Drop versioned constraint on cmake (>= 2.6.3).
+    + openobex-apps: Drop conflict with removed package openobex-apps (<<
+      1.7.1-4) in Breaks.
+
+  [ Chris Hofstaedtler ]
+  * Use udev.pc to place udev rules (Closes: #1058841)
+
+ -- Chris Hofstaedtler <z...@debian.org>  Sun, 14 Jan 2024 14:06:37 +0100
+
 libopenobex (1.7.2-2.1) unstable; urgency=medium
 
   * Non-maintainer upload.
@@ -52,7 +69,7 @@
 
 libopenobex (1.7.1-5) unstable; urgency=medium
 
-  * Fix build with libc6 2.22. (Closes: #811892) 
+  * Fix build with libc6 2.22. (Closes: #811892)
   * Bump Standards-Version to 3.9.7.
   * Add field of Vcs-Git and Vcs-Browser.
 
@@ -255,7 +272,7 @@
   * Add docbuild patch to be able to build documentation
   * Include documentation in the -dev package
   * Package openobex-apps is not shipped seperately anymore, so include it
-  * Package ircp is not shipped seperately anymore, so include it 
+  * Package ircp is not shipped seperately anymore, so include it
   * Update FSF address
 
  -- Hendrik Sattler <deb...@hendrik-sattler.de>  Fri, 10 Feb 2006 12:41:46 +0100
@@ -316,7 +333,7 @@
     the glib dependencies (Closes: #170090)
 
  -- Edd Dumbill <e...@debian.org>  Thu, 21 Nov 2002 22:57:42 +0000
- 
+
 libopenobex (0.9.8-6) unstable; urgency=low
 
   * Fixed the .so files to be in the right packages
diff -Nru libopenobex-1.7.2/debian/control libopenobex-1.7.2/debian/control
--- libopenobex-1.7.2/debian/control	2021-12-20 11:55:02.000000000 +0100
+++ libopenobex-1.7.2/debian/control	2024-01-14 14:06:37.000000000 +0100
@@ -2,10 +2,11 @@
 Priority: optional
 Section: comm
 Maintainer: Nobuhiro Iwamatsu <iwama...@debian.org>
-Build-Depends: debhelper-compat (= 13), cmake (>= 2.6.3),
+Build-Depends: debhelper-compat (= 13), cmake,
 	libbluetooth-dev [linux-any], libusb-1.0-0-dev,
 	pkg-config, doxygen, docbook-xml, docbook-xsl,
-	xsltproc, libxml2-utils, graphviz <!nodoc>
+	xsltproc, libxml2-utils, graphviz <!nodoc>,
+	systemd-dev
 Standards-Version: 4.6.0.1
 Homepage: http://sourceforge.net/projects/openobex/
 Vcs-Git: https://salsa.debian.org/debian/libopenobex.git
@@ -52,7 +53,6 @@
 Depends: ${misc:Depends}, ${shlibs:Depends}
 Conflicts: ircp
 Replaces: ircp
-Breaks: openobex-apps (<< 1.7.1-4)
 Description: Applications for OpenOBEX
  The Object Exchange protocol can best be described as binary HTTP.
  OBEX is optimised for ad-hoc wireless links and can be used to exchange
diff -Nru libopenobex-1.7.2/debian/copyright libopenobex-1.7.2/debian/copyright
--- libopenobex-1.7.2/debian/copyright	2021-12-20 11:55:02.000000000 +0100
+++ libopenobex-1.7.2/debian/copyright	2024-01-14 14:06:37.000000000 +0100
@@ -120,11 +120,11 @@
 Copyright: 2010, 2011, Hendrik Sattler
 License: GPL-2+
 
-FIles: debian/*
 Copyright: 2002, Schubert <er...@debian.org>
   2002, Edd Dumbill <e...@debian.org>
   2016, Nobuhiro Iwamatsu <iwama...@debian.org>
 License: GPL-2+
+Files: debian/*
 
 License: GPL-2+
  This program is free software; you can redistribute it and/or modify
diff -Nru libopenobex-1.7.2/debian/libopenobex2.install libopenobex-1.7.2/debian/libopenobex2.install
--- libopenobex-1.7.2/debian/libopenobex2.install	2021-12-20 11:55:02.000000000 +0100
+++ libopenobex-1.7.2/debian/libopenobex2.install	2024-01-14 14:06:37.000000000 +0100
@@ -1,3 +1,3 @@
 usr/lib/*/libopenobex.so.*
 usr/sbin/obex-check-device
-lib/udev/rules.d/60-openobex.rules
+${env:deb_udevdir}/rules.d/60-openobex.rules
diff -Nru libopenobex-1.7.2/debian/rules libopenobex-1.7.2/debian/rules
--- libopenobex-1.7.2/debian/rules	2021-12-20 11:57:51.000000000 +0100
+++ libopenobex-1.7.2/debian/rules	2024-01-14 14:06:37.000000000 +0100
@@ -6,6 +6,8 @@
 export DEB_BUILD_MAINT_OPTIONS=hardening=+all
 BUILDDIR = obj-$(DEB_HOST_MULTIARCH)
 
+export deb_udevdir = $(shell pkg-config --variable=udevdir udev | sed s,^/,,)
+
 %:
 	dh $@
 

Reply via email to