Bug#787425: dkopp: diff for NMU version 6.5-1.1

2020-05-05 Thread zeha 
Control: tags 787425 + patch
Control: tags 787425 + pending

Dear maintainer,

I've prepared an NMU for dkopp (versioned as 6.5-1.1) and
uploaded it to DELAYED/05. Please feel free to tell me if I
should delay it longer.

Best,
Chris

diff -Nru dkopp-6.5/debian/changelog dkopp-6.5/debian/changelog
--- dkopp-6.5/debian/changelog  2014-06-06 12:26:36.0 +
+++ dkopp-6.5/debian/changelog  2020-05-05 20:06:12.0 +
@@ -1,3 +1,10 @@
+dkopp (6.5-1.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Use blkid instead of volname. (Closes: #787425)
+
+ -- Chris Hofstaedtler   Tue, 05 May 2020 20:06:12 +
+
 dkopp (6.5-1) unstable; urgency=medium
 
   * New upstream release.
diff -Nru dkopp-6.5/debian/patches/03-blkid.patch 
dkopp-6.5/debian/patches/03-blkid.patch
--- dkopp-6.5/debian/patches/03-blkid.patch 1970-01-01 00:00:00.0 
+
+++ dkopp-6.5/debian/patches/03-blkid.patch 2020-05-05 20:06:00.0 
+
@@ -0,0 +1,13 @@
+Index: dkopp-6.5/dkopp-6.5.cc
+===
+--- dkopp-6.5.orig/dkopp-6.5.cc
 dkopp-6.5/dkopp-6.5.cc
+@@ -2489,7 +2489,7 @@ showpoop:
+ 
+dvdtime = dstat.st_ctime;   // 
 set DVD/BD ID = mod time
+ 
+-   snprintf(command,99,"volname %s",BJdvd);// 
 get DVD/BD label
++   snprintf(command,99,"blkid -c /dev/null -s LABEL -o value %s",BJdvd);   // 
 get DVD/BD label
+fid = popen(command,"r");
+if (fid) {
+   pp = fgets_trim(mbuff,99,fid,1);
diff -Nru dkopp-6.5/debian/patches/series dkopp-6.5/debian/patches/series
--- dkopp-6.5/debian/patches/series 2014-06-06 12:24:51.0 +
+++ dkopp-6.5/debian/patches/series 2020-05-05 20:02:09.0 +
@@ -1,2 +1,3 @@
 01-desktop_file.patch
 02-makefile.patch
+03-blkid.patch

Bug#926379: golang-github-hashicorp-go-cleanhttp: diff for NMU version 0.5.0-1.1

2019-04-06 Thread zeha 
Control: tags 926379 + patch
Control: tags 926379 + pending

Dear maintainer,

I've prepared an NMU for golang-github-hashicorp-go-cleanhttp (versioned as 
0.5.0-1.1) and
uploaded it, as well as opened an MR on salsa.d.o.

Cheers,
Chris

diff -Nru golang-github-hashicorp-go-cleanhttp-0.5.0/debian/changelog 
golang-github-hashicorp-go-cleanhttp-0.5.0/debian/changelog
--- golang-github-hashicorp-go-cleanhttp-0.5.0/debian/changelog 2019-01-01 
06:25:09.0 +
+++ golang-github-hashicorp-go-cleanhttp-0.5.0/debian/changelog 2019-04-06 
16:24:28.0 +
@@ -1,3 +1,11 @@
+golang-github-hashicorp-go-cleanhttp (0.5.0-1.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Apply patch from upstream to fix FTBFS with Go 1.11.6.
+(Closes: #926379)
+
+ -- Chris Hofstaedtler   Sat, 06 Apr 2019 16:24:28 +
+
 golang-github-hashicorp-go-cleanhttp (0.5.0-1) unstable; urgency=medium
 
   * New upstream version 0.5.0
diff -Nru 
golang-github-hashicorp-go-cleanhttp-0.5.0/debian/patches/d3fcbee8e1810ecee4bdbf415f42f84cfd0e3361.patch
 
golang-github-hashicorp-go-cleanhttp-0.5.0/debian/patches/d3fcbee8e1810ecee4bdbf415f42f84cfd0e3361.patch
--- 
golang-github-hashicorp-go-cleanhttp-0.5.0/debian/patches/d3fcbee8e1810ecee4bdbf415f42f84cfd0e3361.patch
1970-01-01 00:00:00.0 +
+++ 
golang-github-hashicorp-go-cleanhttp-0.5.0/debian/patches/d3fcbee8e1810ecee4bdbf415f42f84cfd0e3361.patch
2019-04-06 16:24:02.0 +
@@ -0,0 +1,41 @@
+From d3fcbee8e1810ecee4bdbf415f42f84cfd0e3361 Mon Sep 17 00:00:00 2001
+From: Jeff Mitchell 
+Date: Sat, 6 Apr 2019 12:20:18 -0400
+Subject: [PATCH] Fix tests against newer Go
+
+Fixes #14
+---
+ handlers_test.go | 8 
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/handlers_test.go b/handlers_test.go
+index 95ef812..a22e84a 100644
+--- a/handlers_test.go
 b/handlers_test.go
+@@ -30,22 +30,22 @@ func TestPrintablePathCheckHandler(t *testing.T) {
+   },
+ 
+   "invalid newline": {
+-  path:   "/invalid\n",
++  path:   "/invalid%0A",
+   expectCode: http.StatusBadRequest,
+   },
+ 
+   "invalid carriage return": {
+-  path:   "/invalid\r",
++  path:   "/invalid%0D",
+   expectCode: http.StatusBadRequest,
+   },
+ 
+   "invalid null": {
+-  path:   "/invalid\x00",
++  path:   "/invalid%00",
+   expectCode: http.StatusBadRequest,
+   },
+ 
+   "invalid alternate status": {
+-  path:   "/invalid\n",
++  path:   "/invalid%0A",
+   expectCode: http.StatusInternalServerError,
+   input: {
+   ErrStatus: http.StatusInternalServerError,
diff -Nru golang-github-hashicorp-go-cleanhttp-0.5.0/debian/patches/series 
golang-github-hashicorp-go-cleanhttp-0.5.0/debian/patches/series
--- golang-github-hashicorp-go-cleanhttp-0.5.0/debian/patches/series
1970-01-01 00:00:00.0 +
+++ golang-github-hashicorp-go-cleanhttp-0.5.0/debian/patches/series
2019-04-06 16:24:05.0 +
@@ -0,0 +1 @@
+d3fcbee8e1810ecee4bdbf415f42f84cfd0e3361.patch

Bug#924337: collectd: diff for NMU version 5.8.1-1.3

2019-04-06 Thread zeha 
Control: tags 924337 + patch
Control: tags 924337 + pending

I've taken the liberty of uploading Johnathan's patch to DELAYED/02.

If interested parties want me to delay or cancel it, please let me know.

Cheers,
Chris



diff -Nru collectd-5.8.1/debian/changelog collectd-5.8.1/debian/changelog
--- collectd-5.8.1/debian/changelog 2018-12-25 11:08:23.0 +
+++ collectd-5.8.1/debian/changelog 2019-04-06 12:21:09.0 +
@@ -1,3 +1,15 @@
+collectd (5.8.1-1.3) unstable; urgency=medium
+
+  * Non-maintainer upload.
+
+  [ Jonathan McDowell ]
+  * Re-enable mqtt + varnish plugins. (Closes: #924337)
+
+  [ Chris Hofstaedtler ]
+  * Apply Jonathan's patch and upload it.
+
+ -- Chris Hofstaedtler   Sat, 06 Apr 2019 12:21:09 +
+
 collectd (5.8.1-1.2) unstable; urgency=medium
 
   * Non-maintainer upload.
diff -Nru collectd-5.8.1/debian/control collectd-5.8.1/debian/control
--- collectd-5.8.1/debian/control   2018-12-19 14:51:04.0 +
+++ collectd-5.8.1/debian/control   2019-04-06 12:20:16.0 +
@@ -32,6 +32,7 @@
  libmicrohttpd-dev,
  libmodbus-dev,
  libmongoc-dev,
+ libmosquitto-dev,
  libmnl-dev [linux-any],
  libnotify-dev,
  libopenipmi-dev,
@@ -54,7 +55,7 @@
  libtokyotyrant-dev [linux-any],
  libudev-dev [linux-any],
  libupsclient-dev | libupsclient1-dev,
-# libvarnishapi-dev,
+ libvarnishapi-dev,
  libvirt-dev (>= 0.4.0-6) [linux-any],
  libxen-dev [amd64 arm64 armhf i386],
  libxml2-dev,
diff -Nru collectd-5.8.1/debian/rules collectd-5.8.1/debian/rules
--- collectd-5.8.1/debian/rules 2018-12-19 14:51:28.0 +
+++ collectd-5.8.1/debian/rules 2019-04-06 12:20:16.0 +
@@ -88,14 +88,6 @@
 # Cf. https://github.com/collectd/collectd/issues/1574
 confflags += --disable-sigrok
 
-# temporarily disable varnish plugin, as #879471 blocks collectd from
-# migrating to testing.
-confflags += --disable-varnish
-
-# temporarily disable mqtt plugin, as #911265, #911266 blocks collectd from
-# migrating to testing.
-confflags += --disable-mqtt
-
 # disable lvm plugin, liblvm2app is deprecated upstream, #915692
 # Cf. https://github.com/collectd/collectd/issues/2647
 confflags += --disable-lvm

Bug#919486: osinfo-db: diff for NMU version 0.20181120-1.1

2019-04-05 Thread zeha 
Control: tags 919486 + patch
Control: tags 919486 + pending

Dear maintainer,

I've prepared an NMU for osinfo-db (versioned as 0.20181120-1.1) and
uploaded it to DELAYED/5. Please feel free to tell me if I
should delay it longer.

I'm also going to open a PR on salsa.

Cheers,
Chris


diff -Nru osinfo-db-0.20181120/debian/changelog 
osinfo-db-0.20181120/debian/changelog
--- osinfo-db-0.20181120/debian/changelog   2018-11-20 21:41:36.0 
+
+++ osinfo-db-0.20181120/debian/changelog   2019-04-05 17:33:34.0 
+
@@ -1,3 +1,10 @@
+osinfo-db (0.20181120-1.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Add data file for Debian 10. (Closes: #919486)
+
+ -- Chris Hofstaedtler   Fri, 05 Apr 2019 17:33:34 +
+
 osinfo-db (0.20181120-1) unstable; urgency=medium
 
   * [aa777b6] New upstream version 0.20181120
diff -Nru osinfo-db-0.20181120/debian/patches/debian-10 
osinfo-db-0.20181120/debian/patches/debian-10
--- osinfo-db-0.20181120/debian/patches/debian-10   1970-01-01 
00:00:00.0 +
+++ osinfo-db-0.20181120/debian/patches/debian-10   2019-04-05 
17:30:38.0 +
@@ -0,0 +1,144 @@
+Description: Add Debian buster data
+ With preliminary/guessed URLs.
+Author: Chris Hofstaedtler 
+Last-Update: 2019-04-05
+
+Index: osinfo-db-0.20181120/data/os/debian.org/debian-10.xml.in
+===
+--- /dev/null
 osinfo-db-0.20181120/data/os/debian.org/debian-10.xml.in
+@@ -0,0 +1,134 @@
++
++
++  http://debian.org/debian/10;>
++debian10
++debianbuster
++<_name>Debian Buster
++10
++<_vendor>Debian Project
++linux
++debian
++http://debian.org/debian/9"/>
++http://debian.org/debian/9"/>
++
++2019-03-12
++
++
++  http://pcisig.com/pci/1af4/1041"/> 
++  http://pcisig.com/pci/1af4/1042"/> 
++  http://pcisig.com/pci/1af4/1043"/> 
++  http://pcisig.com/pci/1af4/1044"/> 
++  http://pcisig.com/pci/1af4/1045"/> 
++  http://pcisig.com/pci/1af4/1048"/> 
++  http://pcisig.com/pci/1af4/1049"/> 
++  http://pcisig.com/pci/1af4/1052"/> 
++  http://qemu.org/chipset/x86/q35"/> 
++  http://pcisig.com/pci/8086/10d3"/> 
++  http://pcisig.com/pci/8086/293e"/> 
++
++
++
++  
++10
++1
++1073741824
++10737418240
++  
++  
++10
++1073741824
++21474836480
++  
++
++
++
++  <_name>Debian 10
++
++
++  <_name>Debian 10
++
++
++
++
++  
++  
http://cdimage.debian.org/cdimage/release/10.0.0/i386/iso-cd/debian-10.0.0-i386-netinst.iso
++  
++Debian 10.(\d)+.(\d)+ i386 n
++  
++  install.386/vmlinuz
++  install.386/initrd.gz
++
++
++  
++  
http://cdimage.debian.org/cdimage/release/10.0.0/amd64/iso-cd/debian-10.0.0-amd64-netinst.iso
++  
++  Debian 10.(\d)+.(\d)+ amd64 n
++  
++  install.amd/vmlinuz
++  install.amd/initrd.gz
++
++
++  
++  
http://cdimage.debian.org/cdimage/release/10.0.0/arm64/iso-cd/debian-10.0.0-arm64-netinst.iso
++  
++  Debian 10.(\d)+.(\d)+ arm64 n
++  
++  install.arm64/vmlinuz
++  install.arm64/initrd.gz
++
++
++  
++  
http://cdimage.debian.org/cdimage/release/10.0.0/armhf/iso-cd/debian-10.0.0-armhf-netinst.iso
++  
++  Debian 10.(\d)+.(\d)+ armhf n
++  
++  install.armhf/vmlinuz
++  install.armhf/initrd.gz
++
++
++
++
++  
++  
http://cdimage.debian.org/cdimage/release/10.0.0/i386/iso-dvd/debian-10.0.0-i386-DVD-1.iso
++  
++Debian 10.(\d)+.(\d)+ i386 1
++  
++  install.386/vmlinuz
++  install.386/initrd.gz
++
++
++  
++  
http://cdimage.debian.org/cdimage/release/10.0.0/amd64/iso-dvd/debian-10.0.0-amd64-DVD-1.iso
++  
++  Debian 10.(\d)+.(\d)+ amd64 1
++  
++  install.amd/vmlinuz
++  install.amd/initrd.gz
++
++
++  
++  
http://cdimage.debian.org/cdimage/release/10.0.0/arm64/iso-dvd/debian-10.0.0-arm64-DVD-1.iso
++  
++  Debian 10.(\d)+.(\d)+ arm64 1
++  
++  install.arm64/vmlinuz
++  install.arm64/initrd.gz
++
++
++  
++  
http://cdimage.debian.org/cdimage/release/10.0.0/armhf/iso-dvd/debian-10.0.0-armhf-DVD-1.iso
++  
++  Debian 10.(\d)+.(\d)+ armhf 1
++  
++  install.armhf/vmlinuz
++  install.armhf/initrd.gz
++
++
++
++  
++  
++
++  
++
++
diff -Nru osinfo-db-0.20181120/debian/patches/series 
osinfo-db-0.20181120/debian/patches/series
--- osinfo-db-0.20181120/debian/patches/series  1970-01-01 00:00:00.0 
+
+++ osinfo-db-0.20181120/debian/patches/series  2019-04-05 17:18:31.0 
+
@@ -0,0 +1 @@
+debian-10

Bug#877436: botan1.10: diff for NMU version 1.10.17-0.1

2017-10-09 Thread zeha 
Control: tags 877436 + pending

Dear Ondřej,

I've prepared an NMU for botan1.10 (versioned as 1.10.17-0.1) and
will upload it to DELAYED/4. Please feel free to tell me if I
should delay it longer.

Cheers,
Chris


diff -Nru botan1.10-1.10.16/botan_version.py botan1.10-1.10.17/botan_version.py
--- botan1.10-1.10.16/botan_version.py  2017-04-05 01:07:02.0 +
+++ botan1.10-1.10.17/botan_version.py  2017-10-02 06:00:00.0 +
@@ -1,11 +1,11 @@
 
 release_major = 1
 release_minor = 10
-release_patch = 16
+release_patch = 17
 
 release_so_abi_rev = 1
 
 # These are set by the distribution script
-release_vc_rev = 'git:3756c97d295d06ac19cec6736e05003afb10623e'
-release_datestamp = 20170404
-release_type = 'released'
+release_vc_rev = 'git:f7fe6beb5b3b6f944aa7bac491a3455e48ef6ebb'
+release_datestamp = 20171002
+release_type = 'release'
diff -Nru botan1.10-1.10.16/configure.py botan1.10-1.10.17/configure.py
--- botan1.10-1.10.16/configure.py  2017-04-05 01:06:45.0 +
+++ botan1.10-1.10.17/configure.py  2017-10-02 06:00:00.0 +
@@ -59,9 +59,6 @@
 logging.debug('Monotone reported revision %s' % (rev))
 
 return 'mtn:' + rev
-except OSError as e:
-logging.debug('Error getting rev from monotone - %s' % (e[1]))
-return 'unknown'
 except Exception as e:
 logging.debug('Error getting rev from monotone - %s' % (e))
 return 'unknown'
diff -Nru botan1.10-1.10.16/debian/changelog botan1.10-1.10.17/debian/changelog
--- botan1.10-1.10.16/debian/changelog  2017-05-29 11:45:02.0 +
+++ botan1.10-1.10.17/debian/changelog  2017-10-09 09:19:15.0 +
@@ -1,3 +1,13 @@
+botan1.10 (1.10.17-0.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * New upstream release 1.10.17 (Closes: #877436)
++ [CVE-2017-14737]: Side channel affecting modular exponentiation
++ Upstream has imported Debian architecture support patches, removed
+  them.
+
+ -- Christian Hofstaedtler   Mon, 09 Oct 2017 09:19:15 +
+
 botan1.10 (1.10.16-1) unstable; urgency=high
 
   * Update d/watch to match new upstream download directory
diff -Nru 
botan1.10-1.10.16/debian/patches/0001-add-mips64-mipsn32-support.patch 
botan1.10-1.10.17/debian/patches/0001-add-mips64-mipsn32-support.patch
--- botan1.10-1.10.16/debian/patches/0001-add-mips64-mipsn32-support.patch  
2017-05-29 11:45:02.0 +
+++ botan1.10-1.10.17/debian/patches/0001-add-mips64-mipsn32-support.patch  
1970-01-01 00:00:00.0 +
@@ -1,64 +0,0 @@
-From: =?utf-8?q?Ond=C5=99ej_Sur=C3=BD?= 
-Date: Tue, 29 Nov 2016 15:10:20 +0100
-Subject: add-mips64-mipsn32-support
-

- src/build-data/arch/mipsn32.txt | 22 ++
- src/build-data/cc/clang.txt |  2 ++
- src/build-data/cc/gcc.txt   |  1 +
- 3 files changed, 25 insertions(+)
- create mode 100644 src/build-data/arch/mipsn32.txt
-
-diff --git a/src/build-data/arch/mipsn32.txt b/src/build-data/arch/mipsn32.txt
-new file mode 100644
-index 000..96ced25
 /dev/null
-+++ b/src/build-data/arch/mipsn32.txt
-@@ -0,0 +1,22 @@
-+
-+mipsn32el # For Debian
-+
-+
-+
-+r4000
-+r4100
-+r4300
-+r4400
-+r4600
-+r4560
-+r5000
-+r8000
-+r1
-+
-+
-+
-+r4k -> r4000
-+r5k -> r5000
-+r8k -> r8000
-+r10k -> r1
-+
-diff --git a/src/build-data/cc/clang.txt b/src/build-data/cc/clang.txt
-index cbcfd89..23237e3 100644
 a/src/build-data/cc/clang.txt
-+++ b/src/build-data/cc/clang.txt
-@@ -39,6 +39,8 @@ westmere  -> "-march=corei7 -maes"
- 
- 
- x86_64  -> "-m64"
-+mips32  -> "-mabi=32"
-+mipsn32  -> "-mabi=n32"
- mips64  -> "-mabi=64"
- s390-> "-m31"
- s390x   -> "-m64"
-diff --git a/src/build-data/cc/gcc.txt b/src/build-data/cc/gcc.txt
-index 1fc6831..938c065 100644
 a/src/build-data/cc/gcc.txt
-+++ b/src/build-data/cc/gcc.txt
-@@ -80,6 +80,7 @@ hppa  -> "-march=SUBMODEL" hppa
- ia64  -> "-mtune=SUBMODEL"
- m68k  -> "-mSUBMODEL"
- mips32-> "-mips1 -mcpu=SUBMODEL" mips32-
-+mipsn32-> "-mips3 -mcpu=SUBMODEL" mips64-
- mips64-> "-mips3 -mcpu=SUBMODEL" mips64-
- ppc32 -> "-mcpu=SUBMODEL" ppc
- ppc64 -> "-mcpu=SUBMODEL" ppc
diff -Nru botan1.10-1.10.16/debian/patches/0002-add-powerpc64le-support.patch 
botan1.10-1.10.17/debian/patches/0002-add-powerpc64le-support.patch
--- botan1.10-1.10.16/debian/patches/0002-add-powerpc64le-support.patch 
2017-05-29 11:45:02.0 +
+++ botan1.10-1.10.17/debian/patches/0002-add-powerpc64le-support.patch 
1970-01-01 00:00:00.0 +
@@ -1,109 +0,0 @@
-From: =?utf-8?q?Ond=C5=99ej_Sur=C3=BD?= 
-Date: Tue, 29 Nov 2016 15:10:20 +0100
-Subject: add-powerpc64le-support
-

- src/build-data/arch/ppc64.txt   |  5 -
- src/build-data/arch/ppc64le.txt | 21 +
- src/build-data/cc/gcc.txt   |  1 +
- src/math/mp/mp_asm64/info.txt   |  1 +
- src/utils/cpuid.cpp |  6 ++
- 5 files changed, 33

Bug#806075: maradns: diff for NMU version 2.0.13-1.2

2016-08-09 Thread zeha 
Control: tags 806075 + pending

Dear maintainer,

I've prepared an NMU for maradns (versioned as 2.0.13-1.2) and
uploaded it to DELAYED/5. Please feel free to tell me if I
should delay it longer.

Cheers,
Chris.


diff -Nru maradns-2.0.13/debian/changelog maradns-2.0.13/debian/changelog
--- maradns-2.0.13/debian/changelog 2016-07-01 15:38:52.0 +
+++ maradns-2.0.13/debian/changelog 2016-08-09 19:39:43.0 +
@@ -1,3 +1,11 @@
+maradns (2.0.13-1.2) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Fix FTBFS when built with dpkg-buildpackage -A.
+(Closes: #806075). Patch and report by Santiago Vila .
+
+ -- Christian Hofstaedtler   Tue, 09 Aug 2016 19:39:43 +
+
 maradns (2.0.13-1.1) unstable; urgency=medium
 
   * Non-maintainer upload.
diff -Nru maradns-2.0.13/debian/rules maradns-2.0.13/debian/rules
--- maradns-2.0.13/debian/rules 2015-10-03 07:37:13.0 +
+++ maradns-2.0.13/debian/rules 2016-08-09 19:39:40.0 +
@@ -38,7 +38,7 @@
make -f $(MAKEFILE) all COMPILED=\"${COMPILED}\" VERSION=\"${VERSION}\"
mv rng/rng-32bit-tables.h.bak rng/rng-32bit-tables.h
 
-override_dh_install:
+override_dh_install-arch:
dh_install
mv $(TMP)/usr/sbin/bind2csv2.py $(TMP)/usr/sbin/bind2csv2
 
@@ -48,7 +48,7 @@
 override_dh_installexamples:
dh_installexamples -XMakefile
 
-override_dh_installman:
+override_dh_installman-arch:
dh_installman
cd $(CURDIR)/debian/maradns-deadwood/usr/share/man/man1/ && mv 
Deadwood.1 deadwood.1 && cd -

Bug#831813: nullmailer: diff for NMU version 1:1.13-1.2

2016-07-31 Thread zeha 
Control: tags 831813 + patch
Control: tags 831813 + pending

Dear maintainer,

I've prepared an NMU for nullmailer (versioned as 1:1.13-1.2) and
uploaded it to DELAYED/5. Please feel free to tell me if I
should delay it longer.

Cheers,
Christian


diff -Nru nullmailer-1.13/debian/changelog nullmailer-1.13/debian/changelog
--- nullmailer-1.13/debian/changelog2016-07-12 23:15:52.0 +
+++ nullmailer-1.13/debian/changelog2016-07-31 21:00:29.0 +
@@ -1,3 +1,11 @@
+nullmailer (1:1.13-1.2) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Do not keep relayhost data in debconf database longer than
+strictly needed. (Closes: #831813)
+
+ -- Christian Hofstaedtler   Sun, 31 Jul 2016 20:57:13 +
+
 nullmailer (1:1.13-1.1) unstable; urgency=medium
 
   * Non-maintainer upload.
diff -Nru nullmailer-1.13/debian/postinst nullmailer-1.13/debian/postinst
--- nullmailer-1.13/debian/postinst 2012-08-21 08:07:21.0 +
+++ nullmailer-1.13/debian/postinst 2016-07-31 20:57:10.0 +
@@ -37,6 +37,8 @@
 -e 's/[[:space:]]*:[[:space:]]*/\n/g' \
 -e ':b s/(\[[^]=]*)=/\1:/; tb' \
 -e 's/[][]//g' > /etc/nullmailer/remotes
+   # zap debconf entry, as this key may contain sensitive data.
+   db_set nullmailer/relayhost ""
 
db_get nullmailer/adminaddr
if [ "$RET" ]; then

Bug#819856: dnsmasq: diff for NMU version 2.76-1.2

2016-07-15 Thread zeha 
Control: tags 819856 + patch
Control: tags 819856 + pending

Dear maintainer,

I've prepared an NMU for dnsmasq (versioned as 2.76-1.2) and
uploaded it to DELAYED/5. Please feel free to tell me if I
should delay it longer.

Best,
Chris


diff -u dnsmasq-2.76/debian/changelog dnsmasq-2.76/debian/changelog
--- dnsmasq-2.76/debian/changelog
+++ dnsmasq-2.76/debian/changelog
@@ -1,3 +1,11 @@
+dnsmasq (2.76-1.2) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * dnsmasq: Install marker file to determine package installed state,
+for the benefit of the init script. (Closes: #819856)
+
+ -- Christian Hofstaedtler   Sat, 16 Jul 2016 00:17:57 +
+
 dnsmasq (2.76-1.1) unstable; urgency=medium
 
   * Non-maintainer upload.
diff -u dnsmasq-2.76/debian/init dnsmasq-2.76/debian/init
--- dnsmasq-2.76/debian/init
+++ dnsmasq-2.76/debian/init
@@ -33,7 +33,7 @@
 # The following test ensures the dnsmasq service is not started, when the
 # package 'dnsmasq' is removed but not purged, even if the dnsmasq-base 
 # package is still in place.
-test -d /usr/share/doc/dnsmasq || exit 0
+test -e /usr/share/dnsmasq/installed-marker || exit 0
  
 test -x $DAEMON || exit 0
 
diff -u dnsmasq-2.76/debian/rules dnsmasq-2.76/debian/rules
--- dnsmasq-2.76/debian/rules
+++ dnsmasq-2.76/debian/rules
@@ -105,6 +105,7 @@
-d debian/daemon/etc/dnsmasq.d \
-d debian/daemon/etc/resolvconf/update.d \
-d debian/daemon/usr/lib/resolvconf/dpkg-event.d \
+   -d debian/daemon/usr/share/dnsmasq \
-d debian/daemon/etc/default \
-d debian/daemon/lib/systemd/system \
 -d debian/daemon/etc/insserv.conf.d
@@ -113,6 +114,7 @@
install -m 755 debian/init debian/daemon/etc/init.d/dnsmasq
install -m 755 debian/resolvconf 
debian/daemon/etc/resolvconf/update.d/dnsmasq
install -m 755 debian/resolvconf-package 
debian/daemon/usr/lib/resolvconf/dpkg-event.d/dnsmasq
+   install -m 644 debian/installed-marker debian/daemon/usr/share/dnsmasq
install -m 644 debian/default debian/daemon/etc/default/dnsmasq
install -m 644 dnsmasq.conf.example debian/daemon/etc/dnsmasq.conf
install -m 644 debian/readme.dnsmasq.d 
debian/daemon/etc/dnsmasq.d/README
only in patch2:
unchanged:
--- dnsmasq-2.76.orig/debian/installed-marker
+++ dnsmasq-2.76/debian/installed-marker
@@ -0,0 +1,2 @@
+# This file indicates dnsmasq (and not just dnsmasq-base) is installed.
+# It is an implementation detail of the dnsmasq init script.

Bug#827883: tellico: diff for NMU version 2.3.9+dfsg.1-1.1

2016-07-15 Thread zeha 
Control: tags 827883 + pending

Dear maintainer,

I've prepared an NMU for tellico (versioned as 2.3.9+dfsg.1-1.1) and
uploaded it to DELAYED/5. Please feel free to tell me if I
should delay it longer.

Cheers,
Chris

diff -Nru tellico-2.3.9+dfsg.1/debian/changelog 
tellico-2.3.9+dfsg.1/debian/changelog
--- tellico-2.3.9+dfsg.1/debian/changelog   2014-10-18 10:42:24.0 
+
+++ tellico-2.3.9+dfsg.1/debian/changelog   2016-07-15 13:42:28.0 
+
@@ -1,3 +1,11 @@
+tellico (2.3.9+dfsg.1-1.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Drop build dependency on obsolete nepomuk-core-dev. (Closes: #827883)
+Patch from Pino Toscano .
+
+ -- Christian Hofstaedtler   Fri, 15 Jul 2016 13:42:26 +
+
 tellico (2.3.9+dfsg.1-1) unstable; urgency=low
 
   * New upstream release.
diff -Nru tellico-2.3.9+dfsg.1/debian/control 
tellico-2.3.9+dfsg.1/debian/control
--- tellico-2.3.9+dfsg.1/debian/control 2014-10-18 10:43:48.0 +
+++ tellico-2.3.9+dfsg.1/debian/control 2016-07-15 13:39:57.0 +
@@ -2,7 +2,7 @@
 Section: kde
 Priority: optional
 Maintainer: Regis Boudin 
-Build-Depends: debhelper (>= 9), cmake, pkg-config, pkg-kde-tools (>= 0.9), 
kdelibs5-dev (>=4:4.7), libxml2-dev, libxslt1-dev, libtag1-dev, libyaz4-dev, 
libkcddb-dev, kdepimlibs5-dev (>=4:4.7), libpoppler-qt4-dev, libexempi-dev, 
libqimageblitz-dev, nepomuk-core-dev, libksane-dev, shared-desktop-ontologies, 
libqjson-dev
+Build-Depends: debhelper (>= 9), cmake, pkg-config, pkg-kde-tools (>= 0.9), 
kdelibs5-dev (>=4:4.7), libxml2-dev, libxslt1-dev, libtag1-dev, libyaz4-dev, 
libkcddb-dev, kdepimlibs5-dev (>=4:4.7), libpoppler-qt4-dev, libexempi-dev, 
libqimageblitz-dev, libksane-dev, shared-desktop-ontologies, libqjson-dev
 Standards-Version: 3.9.6
 Homepage: http://tellico-project.org/
 Vcs-Git: git://anongit.kde.org/tellico.git

Bug#760041: (no subject)

2016-07-12 Thread zeha 
Cc:
Bcc: 
Subject: nullmailer: diff for NMU version 1:1.13-1.1
Date: Wed, 13 Jul 2016 01:17:31 +0200
X-NMUDIFF-Version: 2.16.6

Hi Michael,

thanks for checking the diff.

Here's a new one, which has removed mail-transport-agent.target,
fixed Documentation= and uses Type=forking instead.

I'm going to upload this to DELAYED/5.

Best,
Chris


diff -Nru nullmailer-1.13/debian/changelog nullmailer-1.13/debian/changelog
--- nullmailer-1.13/debian/changelog2014-08-08 02:19:32.0 +0200
+++ nullmailer-1.13/debian/changelog2016-07-13 01:15:52.0 +0200
@@ -1,3 +1,17 @@
+nullmailer (1:1.13-1.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+
+  [ Alexis Bienvenüe ]
+  * Deterministic file order in archives. (Closes: #820661)
+
+  [ Christian Hofstaedtler ]
+  * Bump Standards-Version to 3.9.8.
+  * Add native systemd units, based on initial patch supplied
+by Viktar Vauchkevich. (Closes: #760041)
+
+ -- Christian Hofstaedtler   Wed, 13 Jul 2016 01:15:46 +0200
+
 nullmailer (1:1.13-1) unstable; urgency=low
 
   * Ack NMU, thankyou for your help with this package.
diff -Nru nullmailer-1.13/debian/control nullmailer-1.13/debian/control
--- nullmailer-1.13/debian/control  2014-08-06 22:42:09.0 +0200
+++ nullmailer-1.13/debian/control  2016-07-13 01:11:38.0 +0200
@@ -2,14 +2,21 @@
 Section: mail
 Priority: extra
 Maintainer: Nick Leverton 
-Build-Depends: debhelper (>= 9), po-debconf, automake, autoconf,
- dh-autoreconf, libgnutls28-dev | libgnutls-dev
-Standards-Version: 3.9.5
+Build-Depends: autoconf,
+   automake,
+   debhelper (>= 9),
+   dh-autoreconf,
+   dh-systemd,
+   libgnutls28-dev | libgnutls-dev,
+   po-debconf
+Standards-Version: 3.9.8
 Homepage: http://untroubled.org/nullmailer/
 
 Package: nullmailer
 Architecture: any
-Depends: lsb-base, ${misc:Depends}, ${shlibs:Depends}
+Depends: lsb-base,
+ ${misc:Depends},
+ ${shlibs:Depends}
 Recommends: rsyslog | system-log-daemon
 Conflicts: mail-transport-agent
 Provides: mail-transport-agent
diff -Nru nullmailer-1.13/debian/links nullmailer-1.13/debian/links
--- nullmailer-1.13/debian/links2011-03-01 22:23:44.0 +0100
+++ nullmailer-1.13/debian/links2016-07-02 15:33:53.0 +0200
@@ -1,9 +1,9 @@
 bin/true usr/bin/newaliases
 usr/sbin/sendmail usr/lib/sendmail
-usr/share/man/man7/nullmailer.7.gz usr/share/man/man1/mailq.1.gz
-usr/share/man/man8/nullmailer-queue.8.gz usr/share/man/man5/adminaddr.5.gz
 usr/share/man/man1/nullmailer-inject.1.gz usr/share/man/man5/defaultdomain.5.gz
 usr/share/man/man1/nullmailer-inject.1.gz usr/share/man/man5/defaulthost.5.gz
 usr/share/man/man1/nullmailer-inject.1.gz usr/share/man/man5/idhost.5.gz
+usr/share/man/man7/nullmailer.7.gz usr/share/man/man1/mailq.1.gz
+usr/share/man/man8/nullmailer-queue.8.gz usr/share/man/man5/adminaddr.5.gz
 usr/share/man/man8/nullmailer-send.8.gz usr/share/man/man5/pausetime.5.gz
 usr/share/man/man8/nullmailer-send.8.gz usr/share/man/man5/remotes.5.gz
diff -Nru nullmailer-1.13/debian/manpages nullmailer-1.13/debian/manpages
--- nullmailer-1.13/debian/manpages 2012-05-16 21:45:16.0 +0200
+++ nullmailer-1.13/debian/manpages 2016-07-02 15:33:53.0 +0200
@@ -1,2 +1,2 @@
-doc/sendmail.1
 debian/man/*
+doc/sendmail.1
diff -Nru nullmailer-1.13/debian/nullmailer.service 
nullmailer-1.13/debian/nullmailer.service
--- nullmailer-1.13/debian/nullmailer.service   1970-01-01 01:00:00.0 
+0100
+++ nullmailer-1.13/debian/nullmailer.service   2016-07-13 01:06:08.0 
+0200
@@ -0,0 +1,11 @@
+[Unit]
+Description=Mail Transport Agent
+Documentation=man:nullmailer(7)
+
+[Service]
+Type=forking
+ExecStart=/usr/sbin/nullmailer-send --daemon
+User=mail
+
+[Install]
+WantedBy=multi-user.target
diff -Nru nullmailer-1.13/debian/patches/15_sort_files_in_archive.diff 
nullmailer-1.13/debian/patches/15_sort_files_in_archive.diff
--- nullmailer-1.13/debian/patches/15_sort_files_in_archive.diff
1970-01-01 01:00:00.0 +0100
+++ nullmailer-1.13/debian/patches/15_sort_files_in_archive.diff
2016-07-02 15:32:32.0 +0200
@@ -0,0 +1,16 @@
+Description: Sort files in archive
+ Sort files when using mergelib to create libnullmailer.a, to get
+ reproducible build
+Author: Alexis Bienvenüe 
+
+Index: nullmailer-1.13/lib/mergelib.sh
+===
+--- nullmailer-1.13.orig/lib/mergelib.sh
 nullmailer-1.13/lib/mergelib.sh
+@@ -12,5 +12,5 @@ for input in "$@"; do
+   ar x ../../"$input"
+   cd ..
+ done
+-ar rc ../"$archive" */*
++ar rc ../"$archive" `LC_ALL=C ls */*`
+ ranlib ../"$archive"
diff -Nru nullmailer-1.13/debian/patches/series 
nullmailer-1.13/debian/patches/series
--- nullmailer-1.13/debian/patches/series   2014-08-07 10:01:55.0 
+0200
+++

Bug#796585: aoetools: diff for NMU version 36-1.1

2016-07-08 Thread zeha 
Control: tags 796585 + patch
Control: tags 796585 + pending

Dear maintainer,

I've prepared an NMU for aoetools (versioned as 36-1.1) and
uploaded it to DELAYED/5. Please feel free to tell me if I
should delay it longer.

Best,
Chris


diff -Nru aoetools-36/debian/60-aoe.rules aoetools-36/debian/60-aoe.rules
--- aoetools-36/debian/60-aoe.rules 1970-01-01 01:00:00.0 +0100
+++ aoetools-36/debian/60-aoe.rules 2016-07-04 17:05:48.0 +0200
@@ -0,0 +1,11 @@
+# These rules tell udev what device nodes to create for aoe support.
+
+# aoe char devices
+SUBSYSTEM=="aoe", KERNEL=="discover",  NAME="etherd/%k", GROUP="disk", 
MODE="0220"
+SUBSYSTEM=="aoe", KERNEL=="err",   NAME="etherd/%k", GROUP="disk", 
MODE="0440"
+SUBSYSTEM=="aoe", KERNEL=="interfaces",NAME="etherd/%k", GROUP="disk", 
MODE="0220"
+SUBSYSTEM=="aoe", KERNEL=="revalidate",NAME="etherd/%k", GROUP="disk", 
MODE="0220"
+SUBSYSTEM=="aoe", KERNEL=="flush", NAME="etherd/%k", GROUP="disk", 
MODE="0220"
+
+# run discover once the module is loaded
+SUBSYSTEM=="aoe", KERNEL=="discover", ACTION=="add", TAG+="systemd", 
ENV{SYSTEMD_WANTS}+="aoe-discover.service"
diff -Nru aoetools-36/debian/aoetools.aoe-discover.service 
aoetools-36/debian/aoetools.aoe-discover.service
--- aoetools-36/debian/aoetools.aoe-discover.service1970-01-01 
01:00:00.0 +0100
+++ aoetools-36/debian/aoetools.aoe-discover.service2016-07-04 
21:55:08.0 +0200
@@ -0,0 +1,10 @@
+[Unit]
+Description=ATA over Ethernet discovery
+BindsTo=sys-devices-virtual-aoe-discover.device
+DefaultDependencies=no
+Conflicts=shutdown.target
+After=network-online.target
+
+[Service]
+Type=oneshot
+ExecStart=/sbin/aoe-discover
diff -Nru aoetools-36/debian/aoetools.default 
aoetools-36/debian/aoetools.default
--- aoetools-36/debian/aoetools.default 2014-01-17 22:21:51.0 +0100
+++ aoetools-36/debian/aoetools.default 2016-07-04 16:16:48.0 +0200
@@ -1,5 +1,9 @@
 # Configuration file for aoetools.
 
+## NOTE: This file is NOT READ under systemd.
+## If you need to restrict the used interfaces, please read 
/usr/lib/modules-load.d/aoetools.conf
+## Filesystems can be mounted using /etc/fstab.
+
 # Enter the list of network interfaces to restrict the AoE discovery to, 
separated by spaces.
 # It can be blank, i.e. "", if you want to run AoE over all the interfaces.
 # If you do not want AoE discovery at all, enter "none" as the list of 
interfaces.
diff -Nru aoetools-36/debian/aoetools.install 
aoetools-36/debian/aoetools.install
--- aoetools-36/debian/aoetools.install 1970-01-01 01:00:00.0 +0100
+++ aoetools-36/debian/aoetools.install 2016-07-04 16:57:08.0 +0200
@@ -0,0 +1,2 @@
+debian/modules-load.d/aoetools.conf /usr/lib/modules-load.d/
+debian/60-aoe.rules /lib/udev/rules.d/
diff -Nru aoetools-36/debian/aoetools.links aoetools-36/debian/aoetools.links
--- aoetools-36/debian/aoetools.links   1970-01-01 01:00:00.0 +0100
+++ aoetools-36/debian/aoetools.links   2016-07-08 11:49:54.0 +0200
@@ -0,0 +1,2 @@
+dev/null lib/systemd/system/aoetools.service
+usr/sbin/aoe-discover etc/network/if-up.d/aoe-discover
diff -Nru aoetools-36/debian/aoetools.postinst 
aoetools-36/debian/aoetools.postinst
--- aoetools-36/debian/aoetools.postinst1970-01-01 01:00:00.0 
+0100
+++ aoetools-36/debian/aoetools.postinst2016-07-04 16:51:05.0 
+0200
@@ -0,0 +1,24 @@
+#!/bin/sh
+
+set -e
+
+case "$1" in
+configure)
+if which udevadm >/dev/null; then
+udevadm control --reload || true
+fi
+# load the kernel module (as opposed to letting the init script do it)
+if [ -d /run/systemd/system ] ; then
+/lib/systemd/systemd-modules-load aoetools.conf
+fi
+;;
+abort-upgrade|abort-remove|abort-deconfigure)
+;;
+*)
+echo "postinst called with unknown argument '$1'"
+exit 1
+;;
+esac
+
+#DEBHELPER#
+exit 0
diff -Nru aoetools-36/debian/changelog aoetools-36/debian/changelog
--- aoetools-36/debian/changelog2014-01-17 23:15:21.0 +0100
+++ aoetools-36/debian/changelog2016-07-08 12:57:54.0 +0200
@@ -1,3 +1,12 @@
+aoetools (36-1.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Install native systemd units, udev rules, and if-up.d hook to trigger
+discovery. This also installs a modules-load.d configuration and
+deprecates /etc/defaults/aoetools. (Closes: #796585)
+
+ -- Christian Hofstaedtler   Mon, 04 Jul 2016 19:29:07 +0200
+
 aoetools (36-1) unstable; urgency=low
 
   * New upstream release, released on 2013-08-07.  Changes since the last one:
diff -Nru aoetools-36/debian/control aoetools-36/debian/control
--- aoetools-36/debian/control  2014-01-15 11:50:14.0 +0100
+++ aoetools-36/debian/control  2016-07-04 16:11:40.0 +0200
@@ -4,7 +4,7 @@
 Maintainer: David Martínez Moreno 
 Standards-Version: 3.9.5
 Homepage: http://aoetools.sf.net
-Build-Depends:

Bug#804963: eeepc-acpi-scripts: diff for NMU version 1.1.12+nmu1

2016-07-04 Thread zeha 
Michael,

Right, that should have been --no-start. Thanks for reviewing.

New nmudiff below, sent to DELAYED/5.

Chris


diff -Nru eeepc-acpi-scripts-1.1.12/debian/changelog 
eeepc-acpi-scripts-1.1.12+nmu1/debian/changelog
--- eeepc-acpi-scripts-1.1.12/debian/changelog  2011-10-03 04:52:50.0 
+0200
+++ eeepc-acpi-scripts-1.1.12+nmu1/debian/changelog 2016-07-03 
21:47:28.0 +0200
@@ -1,3 +1,18 @@
+eeepc-acpi-scripts (1.1.12+nmu1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+
+  [ Martin Pitt ]
+  * Drop obsolete initscripts dependency. (Closes: #804963)
+
+  [ Christian Hofstaedtler ]
+  * Provide native unit for systemd wrapping the rcS script.
+(Closes: #796605)
+  * Remove long obsolete DM-Upload-Allowed from debian/control.
+  * Switch from dh_clean -k to dh_prep.
+
+ -- Christian Hofstaedtler   Fri, 01 Jul 2016 16:38:29 +0200
+
 eeepc-acpi-scripts (1.1.12) unstable; urgency=low
 
   [ Ben Armstrong ]
diff -Nru eeepc-acpi-scripts-1.1.12/debian/control 
eeepc-acpi-scripts-1.1.12+nmu1/debian/control
--- eeepc-acpi-scripts-1.1.12/debian/control2011-09-25 08:21:55.0 
+0200
+++ eeepc-acpi-scripts-1.1.12+nmu1/debian/control   2016-07-03 
21:47:28.0 +0200
@@ -6,16 +6,15 @@
  Nico Golde ,
  Darren Salt ,
  Raphael Geissert 
-Build-Depends: debhelper (>= 6)
+Build-Depends: debhelper (>= 6), dh-systemd
 Standards-Version: 3.9.2
 Vcs-Git: git://git.debian.org/git/debian-eeepc/eeepc-acpi-scripts.git
 Vcs-Browser: http://git.debian.org/?p=debian-eeepc/eeepc-acpi-scripts.git
-DM-Upload-Allowed: yes
 
 Package: eeepc-acpi-scripts
 Architecture: all
 Depends: acpid (>= 1:2.0.0-1), acpi-support-base, acpi-support,
- initscripts (>= 2.88dsf-13.3), pm-utils, rfkill (>= 0.3-3),
+ pm-utils, rfkill (>= 0.3-3),
  ${misc:Depends}
 Suggests: alsa-utils, libnotify-bin
 Description: Scripts to support suspend and hotkeys on the Asus Eee PC laptop
diff -Nru eeepc-acpi-scripts-1.1.12/debian/eeepc-acpi-scripts.service 
eeepc-acpi-scripts-1.1.12+nmu1/debian/eeepc-acpi-scripts.service
--- eeepc-acpi-scripts-1.1.12/debian/eeepc-acpi-scripts.service 1970-01-01 
01:00:00.0 +0100
+++ eeepc-acpi-scripts-1.1.12+nmu1/debian/eeepc-acpi-scripts.service
2016-07-03 21:47:28.0 +0200
@@ -0,0 +1,14 @@
+[Unit]
+Description=Load EeePC-specific settings
+DefaultDependencies=no
+Before=sysinit.target
+ConditionPathExistsGlob=/sys/devices/platform/eeepc*
+
+[Service]
+Type=oneshot
+RemainAfterExit=yes
+ExecStart=/etc/init.d/eeepc-acpi-scripts start
+ExecStop=/etc/init.d/eeepc-acpi-scripts stop
+
+[Install]
+WantedBy=sysinit.target
diff -Nru eeepc-acpi-scripts-1.1.12/debian/rules 
eeepc-acpi-scripts-1.1.12+nmu1/debian/rules
--- eeepc-acpi-scripts-1.1.12/debian/rules  2011-09-25 08:19:39.0 
+0200
+++ eeepc-acpi-scripts-1.1.12+nmu1/debian/rules 2016-07-03 21:47:28.0 
+0200
@@ -24,7 +24,7 @@
 install: build
dh_testdir
dh_testroot
-   dh_clean -k
+   dh_prep
dh_installdirs
install -m 0755 eeepc-acpi-scripts/* 
$(TMP)/usr/share/acpi-support/eeepc-acpi-scripts
install -m 0644 acpilib/* 
$(TMP)/usr/share/acpi-support/eeepc-acpi-scripts/lib
@@ -43,7 +43,9 @@
mkdir -p 
debian/eeepc-acpi-scripts/usr/share/doc/eeepc-acpi-scripts/examples
cat debian/eeepc-acpi-scripts.default.doc-head 
debian/eeepc-acpi-scripts.default.in 
>debian/eeepc-acpi-scripts/usr/share/doc/eeepc-acpi-scripts/examples/eeepc-acpi-scripts.default
(cat debian/eeepc-acpi-scripts.default.etc-head; sed -e '/^# / d; /^$$/ 
d; /^#$$/ d' debian/eeepc-acpi-scripts.default.in) 
>debian/eeepc-acpi-scripts/etc/default/eeepc-acpi-scripts
+   dh_systemd_enable
dh_installinit --no-start -u'start 20 S .'
+   dh_systemd_start
dh_compress
dh_link
dh_fixperms

Bug#796605: eeepc-acpi-scripts: diff for NMU version 1.1.12+nmu1

2016-07-03 Thread zeha 
Updated debdiff with previously missing dh-systemd attached.

diff -Nru eeepc-acpi-scripts-1.1.12/debian/changelog 
eeepc-acpi-scripts-1.1.12+nmu1/debian/changelog
--- eeepc-acpi-scripts-1.1.12/debian/changelog  2011-10-03 04:52:50.0 
+0200
+++ eeepc-acpi-scripts-1.1.12+nmu1/debian/changelog 2016-07-03 
21:47:28.0 +0200
@@ -1,3 +1,18 @@
+eeepc-acpi-scripts (1.1.12+nmu1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+
+  [ Martin Pitt ]
+  * Drop obsolete initscripts dependency. (Closes: #804963)
+
+  [ Christian Hofstaedtler ]
+  * Provide native unit for systemd wrapping the rcS script.
+(Closes: #796605)
+  * Remove long obsolete DM-Upload-Allowed from debian/control.
+  * Switch from dh_clean -k to dh_prep.
+
+ -- Christian Hofstaedtler   Fri, 01 Jul 2016 16:38:29 +0200
+
 eeepc-acpi-scripts (1.1.12) unstable; urgency=low
 
   [ Ben Armstrong ]
diff -Nru eeepc-acpi-scripts-1.1.12/debian/control 
eeepc-acpi-scripts-1.1.12+nmu1/debian/control
--- eeepc-acpi-scripts-1.1.12/debian/control2011-09-25 08:21:55.0 
+0200
+++ eeepc-acpi-scripts-1.1.12+nmu1/debian/control   2016-07-03 
21:47:28.0 +0200
@@ -6,16 +6,15 @@
  Nico Golde ,
  Darren Salt ,
  Raphael Geissert 
-Build-Depends: debhelper (>= 6)
+Build-Depends: debhelper (>= 6), dh-systemd
 Standards-Version: 3.9.2
 Vcs-Git: git://git.debian.org/git/debian-eeepc/eeepc-acpi-scripts.git
 Vcs-Browser: http://git.debian.org/?p=debian-eeepc/eeepc-acpi-scripts.git
-DM-Upload-Allowed: yes
 
 Package: eeepc-acpi-scripts
 Architecture: all
 Depends: acpid (>= 1:2.0.0-1), acpi-support-base, acpi-support,
- initscripts (>= 2.88dsf-13.3), pm-utils, rfkill (>= 0.3-3),
+ pm-utils, rfkill (>= 0.3-3),
  ${misc:Depends}
 Suggests: alsa-utils, libnotify-bin
 Description: Scripts to support suspend and hotkeys on the Asus Eee PC laptop
diff -Nru eeepc-acpi-scripts-1.1.12/debian/eeepc-acpi-scripts.service 
eeepc-acpi-scripts-1.1.12+nmu1/debian/eeepc-acpi-scripts.service
--- eeepc-acpi-scripts-1.1.12/debian/eeepc-acpi-scripts.service 1970-01-01 
01:00:00.0 +0100
+++ eeepc-acpi-scripts-1.1.12+nmu1/debian/eeepc-acpi-scripts.service
2016-07-03 21:47:28.0 +0200
@@ -0,0 +1,14 @@
+[Unit]
+Description=Load EeePC-specific settings
+DefaultDependencies=no
+Before=sysinit.target
+ConditionPathExistsGlob=/sys/devices/platform/eeepc*
+
+[Service]
+Type=oneshot
+RemainAfterExit=yes
+ExecStart=/etc/init.d/eeepc-acpi-scripts start
+ExecStop=/etc/init.d/eeepc-acpi-scripts stop
+
+[Install]
+WantedBy=sysinit.target
diff -Nru eeepc-acpi-scripts-1.1.12/debian/rules 
eeepc-acpi-scripts-1.1.12+nmu1/debian/rules
--- eeepc-acpi-scripts-1.1.12/debian/rules  2011-09-25 08:19:39.0 
+0200
+++ eeepc-acpi-scripts-1.1.12+nmu1/debian/rules 2016-07-03 21:47:28.0 
+0200
@@ -24,7 +24,7 @@
 install: build
dh_testdir
dh_testroot
-   dh_clean -k
+   dh_prep
dh_installdirs
install -m 0755 eeepc-acpi-scripts/* 
$(TMP)/usr/share/acpi-support/eeepc-acpi-scripts
install -m 0644 acpilib/* 
$(TMP)/usr/share/acpi-support/eeepc-acpi-scripts/lib
@@ -43,7 +43,9 @@
mkdir -p 
debian/eeepc-acpi-scripts/usr/share/doc/eeepc-acpi-scripts/examples
cat debian/eeepc-acpi-scripts.default.doc-head 
debian/eeepc-acpi-scripts.default.in 
>debian/eeepc-acpi-scripts/usr/share/doc/eeepc-acpi-scripts/examples/eeepc-acpi-scripts.default
(cat debian/eeepc-acpi-scripts.default.etc-head; sed -e '/^# / d; /^$$/ 
d; /^#$$/ d' debian/eeepc-acpi-scripts.default.in) 
>debian/eeepc-acpi-scripts/etc/default/eeepc-acpi-scripts
+   dh_systemd_enable
dh_installinit --no-start -u'start 20 S .'
+   dh_systemd_start
dh_compress
dh_link
dh_fixperms

Bug#796612: flashybrid: diff for NMU version 0.18+nmu2

2016-07-03 Thread zeha 
Control: tags 796612 + patch
Control: tags 796612 + pending

Dear maintainer,

I've prepared an NMU for flashybrid (versioned as 0.18+nmu2) and
uploaded it to DELAYED/5. Please feel free to tell me if I
should delay it longer.

(Sorry for that.)

Christian

diff -Nru flashybrid-0.18+nmu1/debian/changelog 
flashybrid-0.18+nmu2/debian/changelog
--- flashybrid-0.18+nmu1/debian/changelog   2016-07-01 21:02:21.0 
+0200
+++ flashybrid-0.18+nmu2/debian/changelog   2016-07-03 21:51:31.0 
+0200
@@ -1,3 +1,10 @@
+flashybrid (0.18+nmu2) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Actually build with dh_systemd, fixing my previous upload.
+
+ -- Christian Hofstaedtler   Sun, 03 Jul 2016 21:51:14 +0200
+
 flashybrid (0.18+nmu1) unstable; urgency=medium
 
   * Non-maintainer upload.
diff -Nru flashybrid-0.18+nmu1/debian/control 
flashybrid-0.18+nmu2/debian/control
--- flashybrid-0.18+nmu1/debian/control 2014-04-08 14:10:36.0 +0200
+++ flashybrid-0.18+nmu2/debian/control 2016-07-03 21:53:07.0 +0200
@@ -2,7 +2,7 @@
 Section: admin
 Priority: extra
 Maintainer: Thibaut VARENE 
-Build-Depends: debhelper (>= 5.0.0), po-debconf
+Build-Depends: debhelper (>= 5.0.0), dh-systemd, po-debconf
 Standards-Version: 3.9.5
 
 Package: flashybrid
diff -Nru flashybrid-0.18+nmu1/debian/rules flashybrid-0.18+nmu2/debian/rules
--- flashybrid-0.18+nmu1/debian/rules   2014-04-08 14:28:24.0 +0200
+++ flashybrid-0.18+nmu2/debian/rules   2016-07-03 21:52:18.0 +0200
@@ -33,9 +33,11 @@
dh_testroot
dh_installchangelogs
dh_installdocs README README.old TODO
+   dh_systemd_enable
 #  It's not a good idea to start flashybrid on install or upgrade.
 #  It's an rcS script..
dh_installinit --no-start
+   dh_systemd_start --no-start
dh_installman
dh_link
dh_compress

Bug#796608: espeakup: diff for NMU version 1:0.71-27.1

2016-07-03 Thread zeha 
Control: tags 796608 + patch
Control: tags 796608 + pending

Dear maintainer,

I've prepared an NMU for espeakup (versioned as 1:0.71-27.1) and
uploaded it to DELAYED/5. Please feel free to tell me if I
should delay it longer.

Best,
Christian


diff -Nru espeakup-0.71/debian/changelog espeakup-0.71/debian/changelog
--- espeakup-0.71/debian/changelog  2016-05-19 21:08:31.0 +0200
+++ espeakup-0.71/debian/changelog  2016-07-03 20:53:44.0 +0200
@@ -1,3 +1,10 @@
+espeakup (1:0.71-27.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Install espeakup.service. (Closes: #796608)
+
+ -- Christian Hofstaedtler   Sun, 03 Jul 2016 20:52:49 +0200
+
 espeakup (1:0.71-27) unstable; urgency=high
 
   [ Samuel Thibault ]
diff -Nru espeakup-0.71/debian/espeakup.service 
espeakup-0.71/debian/espeakup.service
--- espeakup-0.71/debian/espeakup.service   1970-01-01 01:00:00.0 
+0100
+++ espeakup-0.71/debian/espeakup.service   2016-07-03 20:52:40.0 
+0200
@@ -0,0 +1,17 @@
+[Unit]
+Description=Software speech output for Speakup
+Documentation=man:espeakup(8)
+Wants=systemd-udev-settle.service
+After=systemd-udev-settle.service sound.target
+
+[Service]
+Type=forking
+PIDFile=/run/espeakup.pid
+Environment=VOICE=
+EnvironmentFile=-/etc/default/espeakup
+ExecStart=/usr/bin/espeakup -V ${VOICE}
+ExecReload=/bin/kill -HUP $MAINPID
+Restart=always
+
+[Install]
+WantedBy=sound.target

Bug#730383: micro-httpd: diff for NMU version 20051212-15.1

2016-07-02 Thread zeha 
Control: tags 730383 + patch
Control: tags 730383 + pending
Control: tags 760819 + pending
Control: tags 782218 + pending

Dear maintainer,

I've prepared an NMU for micro-httpd (versioned as 20051212-15.1) and
uploaded it to DELAYED/2. Please feel free to tell me if I
should delay it longer.

Best,
Christian


diff -Nru micro-httpd-20051212/debian/changelog 
micro-httpd-20051212/debian/changelog
--- micro-httpd-20051212/debian/changelog   2012-03-24 08:54:48.0 
+0100
+++ micro-httpd-20051212/debian/changelog   2016-07-02 18:14:04.0 
+0200
@@ -1,3 +1,15 @@
+micro-httpd (20051212-15.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Update default web root to /var/www/html (Closes: #730383)
+  * Use last changelog date for manpage (Closes: #782218)
+  * Ship native systemd unit files.
+Thanks to Alexandre Detiste (Closes: #760819)
+  * Update Vcs-Git, Vcs-Browser to use https URLs
+  * Update Standards-Version to 3.9.8
+
+ -- Christian Hofstaedtler   Sat, 02 Jul 2016 18:02:42 +0200
+
 micro-httpd (20051212-15) unstable; urgency=low
 
   * debian/rules
diff -Nru micro-httpd-20051212/debian/control 
micro-httpd-20051212/debian/control
--- micro-httpd-20051212/debian/control 2012-03-23 19:05:39.0 +0100
+++ micro-httpd-20051212/debian/control 2016-07-02 18:14:04.0 +0200
@@ -2,15 +2,15 @@
 Section: httpd
 Priority: optional
 Maintainer: Jari Aalto 
-Build-Depends: debhelper (>= 9)
-Standards-Version: 3.9.3.1
-Vcs-Browser: http://git.debian.org/?p=collab-maint/micro-httpd.git
-Vcs-Git: git://git.debian.org/git/collab-maint/micro-httpd.git
+Build-Depends: debhelper (>= 9), dh-systemd
+Standards-Version: 3.9.8
+Vcs-Browser: https://anonscm.debian.org/cgit/collab-maint/micro-httpd.git
+Vcs-Git: https://anonscm.debian.org/git/collab-maint/micro-httpd.git
 Homepage: http://www.acme.com/software/micro_httpd
 
 Package: micro-httpd
 Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends}, openbsd-inetd | inet-superserver 
| micro-inetd | netcat-traditional
+Depends: ${misc:Depends}, ${shlibs:Depends}, openbsd-inetd | inet-superserver 
| micro-inetd | netcat-traditional | systemd-sysv
 Suggests: micro-proxy
 Provides: httpd
 Description: really small HTTP server
diff -Nru micro-httpd-20051212/debian/dirs micro-httpd-20051212/debian/dirs
--- micro-httpd-20051212/debian/dirs1970-01-01 01:00:00.0 +0100
+++ micro-httpd-20051212/debian/dirs2016-07-02 18:14:04.0 +0200
@@ -0,0 +1 @@
+/var/www/html
diff -Nru micro-httpd-20051212/debian/micro-httpd.lintian-overrides 
micro-httpd-20051212/debian/micro-httpd.lintian-overrides
--- micro-httpd-20051212/debian/micro-httpd.lintian-overrides   1970-01-01 
01:00:00.0 +0100
+++ micro-httpd-20051212/debian/micro-httpd.lintian-overrides   2016-07-02 
18:14:04.0 +0200
@@ -0,0 +1,3 @@
+# Using var/www/html/ as a new default document root
+# See #730372 and https://lists.debian.org/debian-devel/2012/04/msg00301.html
+micro-httpd: dir-or-file-in-var-www var/www/html/
diff -Nru micro-httpd-20051212/debian/micro-httpd.postinst 
micro-httpd-20051212/debian/micro-httpd.postinst
--- micro-httpd-20051212/debian/micro-httpd.postinst2012-02-13 
12:20:20.0 +0100
+++ micro-httpd-20051212/debian/micro-httpd.postinst2016-07-02 
18:14:04.0 +0200
@@ -4,7 +4,7 @@
 
 PATH="/sbin:/bin:/usr/sbin:/usr/bin"
 PACKAGE=$(basename $0 | sed 's/\..*//')
-WWWDIR=/var/www
+WWWDIR=/var/www/html
 conf=/etc/inetd.conf
 pkgdir=/usr/share/$PACKAGE
 port="www"
diff -Nru micro-httpd-20051212/debian/micro-httpd@.service 
micro-httpd-20051212/debian/micro-httpd@.service
--- micro-httpd-20051212/debian/micro-httpd@.service1970-01-01 
01:00:00.0 +0100
+++ micro-httpd-20051212/debian/micro-httpd@.service2016-07-02 
18:14:04.0 +0200
@@ -0,0 +1,10 @@
+[Unit]
+Description=micro-httpd
+Documentation=man:micro-httpd(8)
+
+[Service]
+User=nobody
+Group=www-data
+ExecStart=-/usr/sbin/micro-httpd /var/www/html
+StandardInput=socket
+
diff -Nru micro-httpd-20051212/debian/micro-httpd.socket 
micro-httpd-20051212/debian/micro-httpd.socket
--- micro-httpd-20051212/debian/micro-httpd.socket  1970-01-01 
01:00:00.0 +0100
+++ micro-httpd-20051212/debian/micro-httpd.socket  2016-07-02 
18:14:04.0 +0200
@@ -0,0 +1,10 @@
+[Unit]
+Description=micro-httpd
+Documentation=man:micro-httpd(8)
+
+[Socket]
+ListenStream=0.0.0.0:80
+Accept=true
+
+[Install]
+WantedBy=sockets.target
diff -Nru micro-httpd-20051212/debian/pod2man.mk 
micro-httpd-20051212/debian/pod2man.mk
--- micro-httpd-20051212/debian/pod2man.mk  2012-02-13 12:21:58.0 
+0100
+++ micro-httpd-20051212/debian/pod2man.mk  2016-07-02 18:14:04.0 
+0200
@@ -38,9 +38,10 @@
 PACKAGE?= package
 
 # Optional variables to set
+BUILD_DATE ?= $$(dpkg-parsechangelog -S Date -lchangelog)
 MANSECT?= 1
 PODCENTER  ?= User Commands

Bug#720606: up-imapproxy: diff for NMU version 1.2.7-1.2

2016-07-02 Thread zeha 
Control: tags 720606 + pending
Control: tags 829310 + patch
Control: tags 829310 + pending

Dear maintainer,

I've prepared an NMU for up-imapproxy (versioned as 1.2.7-1.2) and
uploaded it to DELAYED/5. Please feel free to tell me if I
should delay it longer.

Best,
Christian


diff -Nru up-imapproxy-1.2.7/debian/changelog 
up-imapproxy-1.2.7/debian/changelog
--- up-imapproxy-1.2.7/debian/changelog 2012-02-14 07:22:41.0 +0100
+++ up-imapproxy-1.2.7/debian/changelog 2016-07-02 17:38:54.0 +0200
@@ -1,3 +1,17 @@
+up-imapproxy (1.2.7-1.2) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Install native systemd unit (Closes: #720606)
+  * Disable start of service during postinst, as the upstream imapd
+may not be available (or even on localhost). (Closes: #829310)
+  * Remove remains of quilt, source format is 3.0 (quilt) already
+and all patches were applied upstream.
+  * Enable hardening build flags.
+  * Replace dh_clean -k with dh_prep.
+  * Remove unused lintian override.
+
+ -- Christian Hofstaedtler   Sat, 02 Jul 2016 16:22:31 +0200
+
 up-imapproxy (1.2.7-1.1) unstable; urgency=low
 
   * Non-maintainer upload.
diff -Nru up-imapproxy-1.2.7/debian/control up-imapproxy-1.2.7/debian/control
--- up-imapproxy-1.2.7/debian/control   2010-02-21 14:00:48.0 +0100
+++ up-imapproxy-1.2.7/debian/control   2016-07-02 16:53:40.0 +0200
@@ -2,8 +2,8 @@
 Section: mail
 Priority: optional
 Maintainer: Jose Luis Tallon 
-Build-Depends: autotools-dev, debhelper (>= 5), quilt, po-debconf (>= 0.8.2), 
-   libwrap0-dev, libncurses-dev, libssl-dev
+Build-Depends: autotools-dev, debhelper (>= 5), po-debconf (>= 0.8.2), 
+   libwrap0-dev, libncurses-dev, libssl-dev, dh-systemd
 Homepage: http://www.imapproxy.org
 Standards-Version: 3.8.4
 
diff -Nru up-imapproxy-1.2.7/debian/imapproxy.service 
up-imapproxy-1.2.7/debian/imapproxy.service
--- up-imapproxy-1.2.7/debian/imapproxy.service 1970-01-01 01:00:00.0 
+0100
+++ up-imapproxy-1.2.7/debian/imapproxy.service 2016-07-02 16:15:08.0 
+0200
@@ -0,0 +1,9 @@
+[Unit]
+Documentation=man:imapproxyd(8)
+Description=IMAP proxy
+After=network-online.target
+Wants=network-online.target
+
+[Service]
+Type=forking
+ExecStart=/usr/sbin/imapproxyd -f /etc/imapproxy.conf
diff -Nru up-imapproxy-1.2.7/debian/patches/config_defaults.diff 
up-imapproxy-1.2.7/debian/patches/config_defaults.diff
--- up-imapproxy-1.2.7/debian/patches/config_defaults.diff  2009-10-16 
12:52:42.0 +0200
+++ up-imapproxy-1.2.7/debian/patches/config_defaults.diff  1970-01-01 
01:00:00.0 +0100
@@ -1,75 +0,0 @@
-Index: up-imapproxy-1.2.7rc2/include/imapproxy.h
-===
 up-imapproxy-1.2.7rc2.orig/include/imapproxy.h 2009-10-16 
12:49:51.0 +0200
-+++ up-imapproxy-1.2.7rc2/include/imapproxy.h  2009-10-16 12:52:34.0 
+0200
-@@ -196,6 +196,10 @@
- #define LOGIN_DISABLED  1
- #define LOGIN_NOT_DISABLED  0
- 
-+
-+#define DEFAULT_SERVER_CONNECT_RETRIES10
-+#define DEFAULT_SERVER_CONNECT_DELAY  5
-+
- /*
-  * One IMAPServerDescriptor will be globally allocated such that each thread
-  * can save the time of doing host lookups, service lookups, and filling
-@@ -361,6 +365,7 @@
- extern void ICC_Recycle_Loop( void );
- extern void LockMutex( pthread_mutex_t * );
- extern void UnLockMutex( pthread_mutex_t * );
-+extern void SetDefaultConfigValues(ProxyConfig_Struct *);
- extern void SetConfigOptions( char * );
- extern void SetLogOptions( void );
- extern int Handle_Select_Command( ITD_Struct *, ITD_Struct *, ISC_Struct *, 
char *, int );
-Index: up-imapproxy-1.2.7rc2/src/config.c
-===
 up-imapproxy-1.2.7rc2.orig/src/config.c2009-10-16 12:49:51.0 
+0200
-+++ up-imapproxy-1.2.7rc2/src/config.c 2009-10-16 12:51:35.0 +0200
-@@ -125,7 +125,6 @@
- static void SetNumericValue( char *, int *, unsigned int );
- static void SetBooleanValue( char *, unsigned int *, unsigned int );
- 
--
- /*
-  * An array of Config_Structs will need to be allocated, one for
-  * every possible keyword/value combination (plus a NULL).  Note that
-@@ -320,7 +319,25 @@
- }
- 
- 
-+/*++
-+ * Function:  SetDefaultConfigValues
-+ *
-+ * Purpose:   Set global configuration default values
-+ *
-+ * Parameters:pointer to global config struct
-+ *
-+ * Returns:   nada.
-+ *
-+ * Authors:   Jose Luis Tallon 
-+ *--
-+ */
-+void SetDefaultConfigValues(ProxyConfig_Struct *PC_Struct)
-+{
-+PC_Struct->server_connect_retries = DEFAULT_SERVER_CONNECT_RETRIES;
-+PC_Struct->server_connect_delay = DEFAULT_SERVER_CONNECT_DELAY;
- 
-+return;
-+}
- 
- /*++
-  * Function:  SetConfigOptions
-Index: up-imapproxy-1.2.7rc2/src/main.c
-===

Bug#760041: nullmailer: diff for NMU version 1:1.13-1.1

2016-07-02 Thread zeha 
Control: tags 760041 + patch
Control: tags 760041 + pending
Control: tags 820661 + pending

Dear maintainer,

I've prepared an NMU for nullmailer (versioned as 1:1.13-1.1) and
uploaded it to DELAYED/10. Please feel free to tell me if I
should delay it longer.

This also includes a wrap-and-sort -a run.

Best,
Christian


diff -Nru nullmailer-1.13/debian/changelog nullmailer-1.13/debian/changelog
--- nullmailer-1.13/debian/changelog2014-08-08 02:19:32.0 +0200
+++ nullmailer-1.13/debian/changelog2016-07-02 15:43:06.0 +0200
@@ -1,3 +1,18 @@
+nullmailer (1:1.13-1.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+
+  [ Alexis Bienvenüe ]
+  * Deterministic file order in archives. (Closes: #820661)
+
+  [ Viktar Vauchkevich ]
+  * Add native systemd units. (Closes: #760041)
+
+  [ Christian Hofstaedtler ]
+  * Bump Standards-Version to 3.9.8.
+
+ -- Christian Hofstaedtler   Sat, 02 Jul 2016 15:42:33 +0200
+
 nullmailer (1:1.13-1) unstable; urgency=low
 
   * Ack NMU, thankyou for your help with this package.
diff -Nru nullmailer-1.13/debian/control nullmailer-1.13/debian/control
--- nullmailer-1.13/debian/control  2014-08-06 22:42:09.0 +0200
+++ nullmailer-1.13/debian/control  2016-07-02 15:33:56.0 +0200
@@ -2,14 +2,21 @@
 Section: mail
 Priority: extra
 Maintainer: Nick Leverton 
-Build-Depends: debhelper (>= 9), po-debconf, automake, autoconf,
- dh-autoreconf, libgnutls28-dev | libgnutls-dev
-Standards-Version: 3.9.5
+Build-Depends: autoconf,
+   automake,
+   debhelper (>= 9),
+   dh-autoreconf,
+   dh-systemd,
+   libgnutls28-dev | libgnutls-dev,
+   po-debconf
+Standards-Version: 3.9.8
 Homepage: http://untroubled.org/nullmailer/
 
 Package: nullmailer
 Architecture: any
-Depends: lsb-base, ${misc:Depends}, ${shlibs:Depends}
+Depends: lsb-base,
+ ${misc:Depends},
+ ${shlibs:Depends}
 Recommends: rsyslog | system-log-daemon
 Conflicts: mail-transport-agent
 Provides: mail-transport-agent
diff -Nru nullmailer-1.13/debian/links nullmailer-1.13/debian/links
--- nullmailer-1.13/debian/links2011-03-01 22:23:44.0 +0100
+++ nullmailer-1.13/debian/links2016-07-02 15:33:53.0 +0200
@@ -1,9 +1,9 @@
 bin/true usr/bin/newaliases
 usr/sbin/sendmail usr/lib/sendmail
-usr/share/man/man7/nullmailer.7.gz usr/share/man/man1/mailq.1.gz
-usr/share/man/man8/nullmailer-queue.8.gz usr/share/man/man5/adminaddr.5.gz
 usr/share/man/man1/nullmailer-inject.1.gz usr/share/man/man5/defaultdomain.5.gz
 usr/share/man/man1/nullmailer-inject.1.gz usr/share/man/man5/defaulthost.5.gz
 usr/share/man/man1/nullmailer-inject.1.gz usr/share/man/man5/idhost.5.gz
+usr/share/man/man7/nullmailer.7.gz usr/share/man/man1/mailq.1.gz
+usr/share/man/man8/nullmailer-queue.8.gz usr/share/man/man5/adminaddr.5.gz
 usr/share/man/man8/nullmailer-send.8.gz usr/share/man/man5/pausetime.5.gz
 usr/share/man/man8/nullmailer-send.8.gz usr/share/man/man5/remotes.5.gz
diff -Nru nullmailer-1.13/debian/manpages nullmailer-1.13/debian/manpages
--- nullmailer-1.13/debian/manpages 2012-05-16 21:45:16.0 +0200
+++ nullmailer-1.13/debian/manpages 2016-07-02 15:33:53.0 +0200
@@ -1,2 +1,2 @@
-doc/sendmail.1
 debian/man/*
+doc/sendmail.1
diff -Nru nullmailer-1.13/debian/patches/15_sort_files_in_archive.diff 
nullmailer-1.13/debian/patches/15_sort_files_in_archive.diff
--- nullmailer-1.13/debian/patches/15_sort_files_in_archive.diff
1970-01-01 01:00:00.0 +0100
+++ nullmailer-1.13/debian/patches/15_sort_files_in_archive.diff
2016-07-02 15:32:32.0 +0200
@@ -0,0 +1,16 @@
+Description: Sort files in archive
+ Sort files when using mergelib to create libnullmailer.a, to get
+ reproducible build
+Author: Alexis Bienvenüe 
+
+Index: nullmailer-1.13/lib/mergelib.sh
+===
+--- nullmailer-1.13.orig/lib/mergelib.sh
 nullmailer-1.13/lib/mergelib.sh
+@@ -12,5 +12,5 @@ for input in "$@"; do
+   ar x ../../"$input"
+   cd ..
+ done
+-ar rc ../"$archive" */*
++ar rc ../"$archive" `LC_ALL=C ls */*`
+ ranlib ../"$archive"
diff -Nru nullmailer-1.13/debian/patches/series 
nullmailer-1.13/debian/patches/series
--- nullmailer-1.13/debian/patches/series   2014-08-07 10:01:55.0 
+0200
+++ nullmailer-1.13/debian/patches/series   2016-07-02 15:32:32.0 
+0200
@@ -8,3 +8,4 @@
 12_allow_no_dots.diff
 13_fix_automake.diff
 14_more_manpages.diff
+15_sort_files_in_archive.diff
diff -Nru nullmailer-1.13/debian/rules nullmailer-1.13/debian/rules
--- nullmailer-1.13/debian/rules2014-08-07 10:13:12.0 +0200
+++ nullmailer-1.13/debian/rules2016-07-02 15:32:25.0 +0200
@@ -13,7 +13,7 @@
 export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 
 %:
-   dh $@ --with autoreconf
+   dh $@ --with autoreconf --with

Bug#826243: bind9: diff for NMU version 1:9.10.3.dfsg.P4-10.1

2016-07-02 Thread zeha 
Control: tags 826243 + pending
Control: tags 826245 + pending

Dear maintainer,

I've prepared an NMU for bind9 (versioned as 1:9.10.3.dfsg.P4-10.1) and
uploaded it to DELAYED/10. Please feel free to tell me if I
should delay it longer.

Best,
Christian


diff -Nru bind9-9.10.3.dfsg.P4/debian/bind9.service 
bind9-9.10.3.dfsg.P4/debian/bind9.service
--- bind9-9.10.3.dfsg.P4/debian/bind9.service   2016-05-04 01:40:36.0 
+0200
+++ bind9-9.10.3.dfsg.P4/debian/bind9.service   2016-07-02 14:32:35.0 
+0200
@@ -2,6 +2,8 @@
 Description=BIND Domain Name Server
 Documentation=man:named(8)
 After=network.target
+Wants=nss-lookup.target
+Before=nss-lookup.target
 
 [Service]
 ExecStart=/usr/sbin/named -f -u bind
diff -Nru bind9-9.10.3.dfsg.P4/debian/changelog 
bind9-9.10.3.dfsg.P4/debian/changelog
--- bind9-9.10.3.dfsg.P4/debian/changelog   2016-05-04 01:40:36.0 
+0200
+++ bind9-9.10.3.dfsg.P4/debian/changelog   2016-07-02 14:34:12.0 
+0200
@@ -1,3 +1,12 @@
+bind9 (1:9.10.3.dfsg.P4-10.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Add explicit ordering for nss-lookup.target in bind9.service,
+lwresd.service. Patches by Michael Biebl .
+(Closes: #826243, #826245)
+
+ -- Christian Hofstaedtler   Sat, 02 Jul 2016 14:32:50 +0200
+
 bind9 (1:9.10.3.dfsg.P4-10) unstable; urgency=medium
 
   * Use python3
diff -Nru bind9-9.10.3.dfsg.P4/debian/lwresd.service 
bind9-9.10.3.dfsg.P4/debian/lwresd.service
--- bind9-9.10.3.dfsg.P4/debian/lwresd.service  2016-05-04 01:40:36.0 
+0200
+++ bind9-9.10.3.dfsg.P4/debian/lwresd.service  2016-07-02 14:32:39.0 
+0200
@@ -2,6 +2,8 @@
 Description=Lightweight Resolver Daemon
 Documentation=man:lwresd(8)
 After=network.target
+Wants=nss-lookup.target
+Before=nss-lookup.target
 
 [Service]
 ExecStart=/usr/sbin/lwresd -f

Bug#804975: ddclient: diff for NMU version 3.8.3-1.1

2016-07-02 Thread zeha 

Dear maintainer,

I've prepared an NMU for ddclient (versioned as 3.8.3-1.1) and
uploaded it to DELAYED/5. Please feel free to tell me if I
should delay it longer.

The changes are pushed to the collab-maint git.

Best,
Christian


diff -Nru ddclient-3.8.3/debian/changelog ddclient-3.8.3/debian/changelog
--- ddclient-3.8.3/debian/changelog 2016-01-26 06:18:20.0 +0100
+++ ddclient-3.8.3/debian/changelog 2016-07-02 13:17:20.0 +0200
@@ -1,3 +1,17 @@
+ddclient (3.8.3-1.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+
+  [ Martin Pitt ]
+  * Drop obsolete initscripts dependency. /lib/init/vars.sh is now in the
+(required) sysvinit-utils. (Closes: #804975)
+
+  [ Christian Hofstaedtler ]
+  * Bump Standards-Version to 3.9.8 (no changes required)
+  * Update Vcs-Browser, Vcd-Git to use https URLs
+
+ -- Christian Hofstaedtler   Sat, 02 Jul 2016 13:16:57 +0200
+
 ddclient (3.8.3-1) unstable; urgency=medium
 
   * debian/control: Bumped Standards-Version (lintian, no changes required).
diff -Nru ddclient-3.8.3/debian/control ddclient-3.8.3/debian/control
--- ddclient-3.8.3/debian/control   2016-01-26 06:18:20.0 +0100
+++ ddclient-3.8.3/debian/control   2016-07-02 13:17:20.0 +0200
@@ -3,14 +3,14 @@
 Priority: extra
 Maintainer: Torsten Landschoff 
 Build-Depends: debhelper (>= 5), po-debconf, xmlto, quilt
-Standards-Version: 3.9.6
+Standards-Version: 3.9.8
 Homepage: http://ddclient.sf.net
-Vcs-Git: git://anonscm.debian.org/collab-maint/ddclient.git
-Vcs-Browser: http://anonscm.debian.org/gitweb/?p=collab-maint/ddclient.git
+Vcs-Git: https://anonscm.debian.org/git/collab-maint/ddclient.git
+Vcs-Browser: https://anonscm.debian.org/cgit/collab-maint/ddclient.git
 
 Package: ddclient
 Architecture: all
-Depends: perl, ${misc:Depends}, lsb-base (>= 3.1), initscripts (>= 2.86)
+Depends: perl, ${misc:Depends}, lsb-base (>= 3.1)
 Recommends: libio-socket-ssl-perl
 Provides: dyndns-client
 Description: address updating utility for dynamic DNS services

Bug#804964: setserial: diff for NMU version 2.17-49.1

2016-07-02 Thread zeha 
Control: tags 804964 + pending

Dear maintainer,

I've prepared an NMU for setserial (versioned as 2.17-49.1) and
uploaded it to DELAYED/5. Please feel free to tell me if I
should delay it longer.

Regards.
diff -Nru setserial-2.17/debian/changelog setserial-2.17/debian/changelog
--- setserial-2.17/debian/changelog 2015-09-22 23:32:05.0 +0200
+++ setserial-2.17/debian/changelog 2016-07-02 11:27:20.0 +0200
@@ -1,3 +1,18 @@
+setserial (2.17-49.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+
+  [ Martin Pitt ]
+  * 10_rc_etc_setserial.patch: Change etc-setserial's "checkfs" dependency to
+$local_fs, and drop initscripts dependency. (Closes: #804964)
+
+  [ Christian Hofstaedtler ]
+  * Drop empty /etc/modutils directory.
+  * Install etc-setserial.service wrapping the etc-setserial init script.
+(Closes: #826132)
+
+ -- Christian Hofstaedtler   Sat, 02 Jul 2016 11:11:55 +0200
+
 setserial (2.17-49) unstable; urgency=medium
 
   * as upstream archive vanished, watch file is useless
diff -Nru setserial-2.17/debian/control setserial-2.17/debian/control
--- setserial-2.17/debian/control   2015-09-22 23:20:55.0 +0200
+++ setserial-2.17/debian/control   2016-07-02 10:37:02.0 +0200
@@ -7,7 +7,7 @@
 
 Package: setserial
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, initscripts
+Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: controls configuration of serial ports
  Set and/or report the configuration information associated with
  a serial port. This information includes what I/O port and which IRQ
diff -Nru setserial-2.17/debian/dirs setserial-2.17/debian/dirs
--- setserial-2.17/debian/dirs  2015-09-22 23:01:22.0 +0200
+++ setserial-2.17/debian/dirs  2016-07-02 11:06:32.0 +0200
@@ -1,6 +1,5 @@
 bin
 etc/init.d
-etc/modutils
 usr/share/doc/setserial
 usr/share/man/man8
 var/lib/setserial
diff -Nru setserial-2.17/debian/patches/10_rc_etc_setserial.patch 
setserial-2.17/debian/patches/10_rc_etc_setserial.patch
--- setserial-2.17/debian/patches/10_rc_etc_setserial.patch 2015-09-22 
23:30:40.0 +0200
+++ setserial-2.17/debian/patches/10_rc_etc_setserial.patch 2016-07-02 
10:37:02.0 +0200
@@ -11,7 +11,7 @@
 +#
 +### BEGIN INIT INFO
 +# Provides: etc-setserial
-+# Required-Start:   checkfs
++# Required-Start:   $local_fs
 +# Required-Stop:$remote_fs
 +# Default-Start:S
 +# Default-Stop: 0 1 6
diff -Nru setserial-2.17/debian/rules setserial-2.17/debian/rules
--- setserial-2.17/debian/rules 2015-09-22 23:40:37.0 +0200
+++ setserial-2.17/debian/rules 2016-07-02 11:09:26.0 +0200
@@ -85,6 +85,7 @@
dh_installchangelogs
dh_installdebconf
dh_systemd_enable
+   dh_systemd_enable --name=etc-setserial
dh_strip
dh_compress
dh_fixperms
diff -Nru setserial-2.17/debian/setserial.etc-setserial.service 
setserial-2.17/debian/setserial.etc-setserial.service
--- setserial-2.17/debian/setserial.etc-setserial.service   1970-01-01 
01:00:00.0 +0100
+++ setserial-2.17/debian/setserial.etc-setserial.service   2016-07-02 
11:09:51.0 +0200
@@ -0,0 +1,13 @@
+[Unit]
+Documentation=man:setserial(8)
+Description=controls configuration of serial ports
+Before=system-getty.slice
+
+[Service]
+Type=oneshot
+RemainAfterExit=yes
+ExecStart=/etc/init.d/etc-setserial start
+ExecStop=/etc/init.d/etc-setserial stop
+
+[Install]
+WantedBy=multi-user.target

Bug#804977: psad: diff for NMU version 2.2.3-1.1

2016-07-02 Thread zeha 
Control: tags 804977 + pending

Dear maintainer,

I've prepared an NMU for psad (versioned as 2.2.3-1.1) and
uploaded it to DELAYED/10. Please feel free to tell me if I
should delay it longer.

Best,
Christian


diff -Nru psad-2.2.3/debian/changelog psad-2.2.3/debian/changelog
--- psad-2.2.3/debian/changelog 2014-08-25 22:03:05.0 +0200
+++ psad-2.2.3/debian/changelog 2016-07-02 11:21:42.0 +0200
@@ -1,3 +1,13 @@
+psad (2.2.3-1.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Drop obsolete initscripts dependency.
+It was introduced in commit 445de4eda7 for the /run transition, but
+this only applied to pre-wheezy upgrades. (Closes: #804977)
+Patch by Martin Pitt .
+
+ -- Christian Hofstaedtler   Sat, 02 Jul 2016 11:21:37 +0200
+
 psad (2.2.3-1) unstable; urgency=low
 
   * Imported Upstream version 2.2.3
diff -Nru psad-2.2.3/debian/control psad-2.2.3/debian/control
--- psad-2.2.3/debian/control   2014-08-25 22:03:05.0 +0200
+++ psad-2.2.3/debian/control   2016-07-02 11:20:01.0 +0200
@@ -16,7 +16,7 @@
  libnet-ip-perl, libdate-calc-perl, libcarp-clan-perl,
  whois, psmisc, libiptables-parse-perl, libiptables-chainmgr-perl,
  default-mta | mail-transport-agent, bsd-mailx | mailx | mailutils,
- lsb-base, initscripts (>= 2.88dsf-13.3)
+ lsb-base
 Suggests: fwsnort, bastille
 Description: Port Scan Attack Detector
  PSAD is a collection of four lightweight system daemons (in Perl and

Bug#826132: setserial: diff for NMU version 2.17-49.1

2016-07-02 Thread zeha 
Control: tags 734496 + patch
Control: tags 734496 + pending
Control: tags 826132 + patch
Control: tags 826132 + pending

Dear maintainer,

I've prepared an NMU for setserial (versioned as 2.17-49.1) and
uploaded it to DELAYED/5. Please feel free to tell me if I
should delay it longer.

Best,
Christian


diff -Nru setserial-2.17/debian/changelog setserial-2.17/debian/changelog
--- setserial-2.17/debian/changelog 2015-09-22 23:32:05.0 +0200
+++ setserial-2.17/debian/changelog 2016-07-02 11:12:49.0 +0200
@@ -1,3 +1,18 @@
+setserial (2.17-49.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+
+  [ Martin Pitt ]
+  * 10_rc_etc_setserial.patch: Change etc-setserial's "checkfs" dependency to
+$local_fs, and drop initscripts dependency. (Closes: #734496)
+
+  [ Christian Hofstaedtler ]
+  * Drop empty /etc/modutils directory.
+  * Install etc-setserial.service wrapping the etc-setserial init script.
+(Closes: #826132))
+
+ -- Christian Hofstaedtler   Sat, 02 Jul 2016 11:11:55 +0200
+
 setserial (2.17-49) unstable; urgency=medium
 
   * as upstream archive vanished, watch file is useless
diff -Nru setserial-2.17/debian/control setserial-2.17/debian/control
--- setserial-2.17/debian/control   2015-09-22 23:20:55.0 +0200
+++ setserial-2.17/debian/control   2016-07-02 10:37:02.0 +0200
@@ -7,7 +7,7 @@
 
 Package: setserial
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, initscripts
+Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: controls configuration of serial ports
  Set and/or report the configuration information associated with
  a serial port. This information includes what I/O port and which IRQ
diff -Nru setserial-2.17/debian/dirs setserial-2.17/debian/dirs
--- setserial-2.17/debian/dirs  2015-09-22 23:01:22.0 +0200
+++ setserial-2.17/debian/dirs  2016-07-02 11:06:32.0 +0200
@@ -1,6 +1,5 @@
 bin
 etc/init.d
-etc/modutils
 usr/share/doc/setserial
 usr/share/man/man8
 var/lib/setserial
diff -Nru setserial-2.17/debian/patches/10_rc_etc_setserial.patch 
setserial-2.17/debian/patches/10_rc_etc_setserial.patch
--- setserial-2.17/debian/patches/10_rc_etc_setserial.patch 2015-09-22 
23:30:40.0 +0200
+++ setserial-2.17/debian/patches/10_rc_etc_setserial.patch 2016-07-02 
10:37:02.0 +0200
@@ -11,7 +11,7 @@
 +#
 +### BEGIN INIT INFO
 +# Provides: etc-setserial
-+# Required-Start:   checkfs
++# Required-Start:   $local_fs
 +# Required-Stop:$remote_fs
 +# Default-Start:S
 +# Default-Stop: 0 1 6
diff -Nru setserial-2.17/debian/rules setserial-2.17/debian/rules
--- setserial-2.17/debian/rules 2015-09-22 23:40:37.0 +0200
+++ setserial-2.17/debian/rules 2016-07-02 11:09:26.0 +0200
@@ -85,6 +85,7 @@
dh_installchangelogs
dh_installdebconf
dh_systemd_enable
+   dh_systemd_enable --name=etc-setserial
dh_strip
dh_compress
dh_fixperms
diff -Nru setserial-2.17/debian/setserial.etc-setserial.service 
setserial-2.17/debian/setserial.etc-setserial.service
--- setserial-2.17/debian/setserial.etc-setserial.service   1970-01-01 
01:00:00.0 +0100
+++ setserial-2.17/debian/setserial.etc-setserial.service   2016-07-02 
11:09:51.0 +0200
@@ -0,0 +1,13 @@
+[Unit]
+Documentation=man:setserial(8)
+Description=controls configuration of serial ports
+Before=system-getty.slice
+
+[Service]
+Type=oneshot
+RemainAfterExit=yes
+ExecStart=/etc/init.d/etc-setserial start
+ExecStop=/etc/init.d/etc-setserial stop
+
+[Install]
+WantedBy=multi-user.target

Bug#804987: pioneers: diff for NMU version 15.3-2.1

2016-07-02 Thread zeha 
Control: tags 804987 + pending

Dear maintainer,

I've prepared an NMU for pioneers (versioned as 15.3-2.1) and
uploaded it to DELAYED/10. Please feel free to tell me if I
should delay it longer.

Best,
Christian


diff -Nru pioneers-15.3/debian/changelog pioneers-15.3/debian/changelog
--- pioneers-15.3/debian/changelog  2014-10-26 15:30:45.0 +0100
+++ pioneers-15.3/debian/changelog  2016-07-02 10:17:53.0 +0200
@@ -1,3 +1,13 @@
+pioneers (15.3-2.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+
+  [ Martin Pitt ]
+  * Drop obsolete initscripts dependency. This was only added for the /run
+transition, but this only affected pre-wheezy upgrades. (Closes: #804987)
+
+ -- Christian Hofstaedtler   Sat, 02 Jul 2016 10:17:12 +0200
+
 pioneers (15.3-1) unstable; urgency=medium
 
   * New upstream release.
diff -Nru pioneers-15.3/debian/control pioneers-15.3/debian/control
--- pioneers-15.3/debian/control2014-10-26 14:40:35.0 +0100
+++ pioneers-15.3/debian/control2016-07-02 10:16:30.0 +0200
@@ -68,8 +68,7 @@
 Replaces: pioneers-meta-server (<< 14.2-1~)
 Breaks: pioneers-meta-server (<< 14.2-1~)
 Architecture: any
-Depends: initscripts (>= 2.88dsf-13.3),
- lsb-base,
+Depends: lsb-base,
  ${misc:Depends},
  ${shlibs:Depends}
 Description: Settlers of Catan board game - metaserver

Bug#826242: dnsmasq: diff for NMU version 2.76-1.1

2016-07-01 Thread zeha 
Control: tags 826242 + pending

Dear maintainer,

I've prepared an NMU for dnsmasq (versioned as 2.76-1.1) and
uploaded it to DELAYED/10. Please feel free to tell me if I
should delay it longer.

Best,
Christian


diff -u dnsmasq-2.76/debian/changelog dnsmasq-2.76/debian/changelog
--- dnsmasq-2.76/debian/changelog
+++ dnsmasq-2.76/debian/changelog
@@ -1,3 +1,11 @@
+dnsmasq (2.76-1.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Provide nss-lookup.target for systemd, without relying on insserv.
+Patch from Michael Biebl . (Closes: #826242)
+
+ -- Christian Hofstaedtler   Fri, 01 Jul 2016 13:41:11 +
+
 dnsmasq (2.76-1) unstable; urgency=low
 
* New upstream. (closes: #798586)
diff -u dnsmasq-2.76/debian/systemd.service dnsmasq-2.76/debian/systemd.service
--- dnsmasq-2.76/debian/systemd.service
+++ dnsmasq-2.76/debian/systemd.service
@@ -1,6 +1,8 @@
 [Unit]
 Description=dnsmasq - A lightweight DHCP and caching DNS server
 Requires=network.target
+Wants=nss-lookup.target
+Before=nss-lookup.target
 
 [Service]
 Type=forking

Bug#791846: treil: diff for NMU version 1.8-2.2

2015-11-03 Thread zeha 
Control: tags 791846 + patch
Control: tags 791846 + pending

Dear maintainer,

I've prepared an NMU for treil (versioned as 1.8-2.2) and
uploaded it to DELAYED/5. Please feel free to tell me if I
should delay it longer.

Best,
Christian

diff -Nru treil-1.8/debian/changelog treil-1.8/debian/changelog
--- treil-1.8/debian/changelog  2014-04-17 02:43:11.0 +
+++ treil-1.8/debian/changelog  2015-11-03 19:42:58.0 +
@@ -1,3 +1,11 @@
+treil (1.8-2.2) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Use RbConfig instead of now removed Config to fix build with ruby 2.2.
+(Closes: #791846)
+
+ -- Christian Hofstaedtler   Tue, 03 Nov 2015 19:42:14 +
+
 treil (1.8-2.1) unstable; urgency=medium
 
   * Non-maintainer upload.
diff -Nru treil-1.8/debian/control treil-1.8/debian/control
--- treil-1.8/debian/control2014-04-17 02:19:25.0 +
+++ treil-1.8/debian/control2015-11-03 19:46:08.0 +
@@ -2,7 +2,7 @@
 Section: utils
 Priority: extra
 Maintainer: NIIBE Yutaka 
-Build-Depends: debhelper (>= 9), ruby, ruby-dev, ruby-cairo, autotools-dev
+Build-Depends: debhelper (>= 9), ruby, ruby-dev, ruby-cairo, autotools-dev, 
dh-autoreconf
 Standards-Version: 3.9.4
 Homepage: http://www.unixuser.org/~ueno/software/treil/index.html
 
diff -Nru treil-1.8/debian/patches/03-rbconfig-configure.diff 
treil-1.8/debian/patches/03-rbconfig-configure.diff
--- treil-1.8/debian/patches/03-rbconfig-configure.diff 1970-01-01 
00:00:00.0 +
+++ treil-1.8/debian/patches/03-rbconfig-configure.diff 2015-11-03 
19:44:08.0 +
@@ -0,0 +1,26 @@
+Index: treil-1.8/configure.ac
+===
+--- treil-1.8.orig/configure.ac
 treil-1.8/configure.ac
+@@ -14,18 +14,18 @@ else
+ fi
+ test -z "$RUBY" && AC_MSG_ERROR([ruby not installed])
+ 
+-RUBYARCH=`"$RUBY" -rrbconfig -e "puts(Config::CONFIG.fetch('arch'))"`
++RUBYARCH=`"$RUBY" -rrbconfig -e "puts(RbConfig::CONFIG.fetch('arch'))"`
+ AC_SUBST(RUBYARCH, "$RUBYARCH")
+ 
+ AC_ARG_WITH(rubylibdir, AC_HELP_STRING([--with-rubylibdir=PATH], [install 
ruby files in PATH]), RUBYLIBDIR="$withval")
+ if test -z "$RUBYLIBDIR"; then
+-  RUBYLIBDIR=`"$RUBY" -rrbconfig -e 
"puts(Config::CONFIG.fetch('sitelibdir'))"`
++  RUBYLIBDIR=`"$RUBY" -rrbconfig -e 
"puts(RbConfig::CONFIG.fetch('sitelibdir'))"`
+ fi
+ AC_SUBST(RUBYLIBDIR, "$RUBYLIBDIR")
+ 
+ AC_ARG_WITH(rubyarchdir, AC_HELP_STRING([--with-rubyarchdir=PATH], [install 
ruby extension libraries in PATH]), RUBYARCHDIR="$withval")
+ if test -z "$RUBYARCHDIR"; then
+-  RUBYARCHDIR=`"$RUBY" -rrbconfig -e 
"puts(Config::CONFIG.fetch('sitearchdir'))"`
++  RUBYARCHDIR=`"$RUBY" -rrbconfig -e 
"puts(RbConfig::CONFIG.fetch('sitearchdir'))"`
+ fi
+ AC_SUBST(RUBYARCHDIR, "$RUBYARCHDIR")
+ 
diff -Nru treil-1.8/debian/patches/series treil-1.8/debian/patches/series
--- treil-1.8/debian/patches/series 2014-04-17 02:21:21.0 +
+++ treil-1.8/debian/patches/series 2015-11-03 19:43:38.0 +
@@ -1,2 +1,3 @@
 01-makefiles.diff
 02-rbconfig.diff
+03-rbconfig-configure.diff
diff -Nru treil-1.8/debian/rules treil-1.8/debian/rules
--- treil-1.8/debian/rules  2014-04-17 02:26:33.0 +
+++ treil-1.8/debian/rules  2015-11-03 19:46:16.0 +
@@ -9,7 +9,7 @@
 RUBYARCHDIR = $(shell ruby -rrbconfig -e 'puts RbConfig::CONFIG["archdir"]')
 
 %:
-   dh $@
+   dh $@ --with autoreconf
 
 override_dh_auto_clean:
dh_auto_clean

Bug#743993: redland-bindings: diff for NMU version 1.0.16.1-2.1

2014-04-20 Thread zeha 
tags 743993 + patch
thanks

Dear maintainer,

I've prepared an NMU for redland-bindings (versioned as 1.0.16.1-2.1). The diff
is attached to this message.

Regards.
diff -Nru redland-bindings-1.0.16.1/debian/changelog 
redland-bindings-1.0.16.1/debian/changelog
--- redland-bindings-1.0.16.1/debian/changelog  2014-03-08 06:34:38.0 
+0100
+++ redland-bindings-1.0.16.1/debian/changelog  2014-04-20 15:54:59.0 
+0200
@@ -1,3 +1,10 @@
+redland-bindings (1.0.16.1-2.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Fix build for Ruby 2.0. (Closes: #743993)
+
+ -- Christian Hofstaedtler z...@debian.org  Sun, 20 Apr 2014 15:54:31 +0200
+
 redland-bindings (1.0.16.1-2) unstable; urgency=medium
 
   * Acknowlege NMU - thanks Christian.
diff -Nru redland-bindings-1.0.16.1/debian/patches/ruby-header-dir.patch 
redland-bindings-1.0.16.1/debian/patches/ruby-header-dir.patch
--- redland-bindings-1.0.16.1/debian/patches/ruby-header-dir.patch  
1970-01-01 01:00:00.0 +0100
+++ redland-bindings-1.0.16.1/debian/patches/ruby-header-dir.patch  
2014-04-20 15:53:58.0 +0200
@@ -0,0 +1,56 @@
+diff --git a/configure b/configure
+index 5593952..1c8cc27 100755
+--- a/configure
 b/configure
+@@ -12311,7 +12311,7 @@ if test X$RUBY != X; then
+   RUBY_ARCHDIR=`$RUBY -rrbconfig -e print RbConfig::CONFIG['archdir']`
+   ruby_install_dir_config=`$RUBY -rrbconfig -e puts 
RbConfig::CONFIG['$ruby_install_dir_variable']`
+   ruby_header_dir_config=`$RUBY -rrbconfig -e puts 
RbConfig::CONFIG['rubyhdrdir']`
+-  ruby_arch_config=`$RUBY -rrbconfig -e puts RbConfig::CONFIG['arch']`
++  ruby_arch_header_dir_config=`$RUBY -rrbconfig -e puts 
RbConfig::CONFIG['rubyarchhdrdir']`
+   ruby_arch_install_dir_config=`$RUBY -rrbconfig -e puts 
RbConfig::CONFIG['$ruby_arch_install_dir_variable']`
+   librubyarg_shared=`$RUBY -rrbconfig -e puts 
RbConfig::CONFIG['LIBRUBYARG_SHARED']`
+ 
+@@ -12342,13 +12342,7 @@ $as_echo $RUBY_ARCH_INSTALLDIR from RbConfig::CONFIG 
$ruby_arch_install_dir_var
+   { $as_echo $as_me:${as_lineno-$LINENO}: checking Ruby headers dir 5
+ $as_echo_n checking Ruby headers dir...  6; }
+   if test X$ruby_header_dir_config != Xnil -a X$ruby_header_dir_config 
!= X; then
+-RUBY_INCLUDES=$RUBY_INCLUDES -I$ruby_header_dir_config
+-if test X$ruby_arch_config != Xnil -a X$ruby_arch_config != X; 
then
+-  ruby_arch_hdrdir=$ruby_header_dir_config/$ruby_arch_config
+-  if test -d $ruby_arch_hdrdir; then
+-RUBY_INCLUDES=$RUBY_INCLUDES -I$ruby_arch_hdrdir
+-  fi
+-fi
++RUBY_INCLUDES=$RUBY_INCLUDES -I$ruby_header_dir_config 
-I$ruby_arch_header_dir_config
+ { $as_echo $as_me:${as_lineno-$LINENO}: result: $RUBY_INCLUDES from 
RbConfig::CONFIG rubyhdrdir 5
+ $as_echo $RUBY_INCLUDES from RbConfig::CONFIG rubyhdrdir 6; }
+   else
+diff --git a/configure.ac b/configure.ac
+index b285c3b..d9712e1 100644
+--- a/configure.ac
 b/configure.ac
+@@ -364,7 +364,7 @@ if test X$RUBY != X; then
+   RUBY_ARCHDIR=`$RUBY -rrbconfig -e print RbConfig::CONFIG['archdir']`
+   ruby_install_dir_config=`$RUBY -rrbconfig -e puts 
RbConfig::CONFIG['$ruby_install_dir_variable']`
+   ruby_header_dir_config=`$RUBY -rrbconfig -e puts 
RbConfig::CONFIG['rubyhdrdir']`
+-  ruby_arch_config=`$RUBY -rrbconfig -e puts RbConfig::CONFIG['arch']`
++  ruby_arch_header_dir_config=`$RUBY -rrbconfig -e puts 
RbConfig::CONFIG['rubyarchhdrdir']`
+   ruby_arch_install_dir_config=`$RUBY -rrbconfig -e puts 
RbConfig::CONFIG['$ruby_arch_install_dir_variable']`
+   librubyarg_shared=`$RUBY -rrbconfig -e puts 
RbConfig::CONFIG['LIBRUBYARG_SHARED']`
+   changequote([, ])dnl
+@@ -389,13 +389,7 @@ if test X$RUBY != X; then
+ 
+   AC_MSG_CHECKING(Ruby headers dir)
+   if test X$ruby_header_dir_config != Xnil -a X$ruby_header_dir_config 
!= X; then
+-RUBY_INCLUDES=$RUBY_INCLUDES -I$ruby_header_dir_config
+-if test X$ruby_arch_config != Xnil -a X$ruby_arch_config != X; 
then
+-  ruby_arch_hdrdir=$ruby_header_dir_config/$ruby_arch_config
+-  if test -d $ruby_arch_hdrdir; then
+-RUBY_INCLUDES=$RUBY_INCLUDES -I$ruby_arch_hdrdir
+-  fi
+-fi
++RUBY_INCLUDES=$RUBY_INCLUDES -I$ruby_header_dir_config 
-I$ruby_arch_header_dir_config
+ AC_MSG_RESULT($RUBY_INCLUDES from RbConfig::CONFIG rubyhdrdir)
+   else
+ if test -r $RUBY_ARCHDIR/ruby.h; then
diff -Nru redland-bindings-1.0.16.1/debian/patches/series 
redland-bindings-1.0.16.1/debian/patches/series
--- redland-bindings-1.0.16.1/debian/patches/series 1970-01-01 
01:00:00.0 +0100
+++ redland-bindings-1.0.16.1/debian/patches/series 2014-04-20 
15:54:13.0 +0200
@@ -0,0 +1 @@
+ruby-header-dir.patch


-- 
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org

Bug#734954: screenruler: diff for NMU version 0.960+bzr41-1.2

2014-01-16 Thread zeha 
tags 734954 + patch
tags 734954 + pending
thanks

Dear maintainer,

I've prepared an NMU for screenruler (versioned as 0.960+bzr41-1.2) and
uploaded it to DELAYED/3. Please feel free to tell me if I
should delay it longer.

Regards.
diff -Nru screenruler-0.960+bzr41/debian/changelog 
screenruler-0.960+bzr41/debian/changelog
--- screenruler-0.960+bzr41/debian/changelog2013-06-03 18:21:19.0 
+0200
+++ screenruler-0.960+bzr41/debian/changelog2014-01-16 11:09:08.0 
+0100
@@ -1,3 +1,10 @@
+screenruler (0.960+bzr41-1.2) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Apply patch for Ruby 1.9 support, drop hardcoding of 1.8 (Closes: #734954)
+
+ -- Christian Hofstaedtler z...@debian.org  Thu, 16 Jan 2014 11:08:20 +0100
+
 screenruler (0.960+bzr41-1.1) unstable; urgency=low
 
   * Non-maintainer upload.
diff -Nru screenruler-0.960+bzr41/debian/control 
screenruler-0.960+bzr41/debian/control
--- screenruler-0.960+bzr41/debian/control  2013-06-03 18:20:23.0 
+0200
+++ screenruler-0.960+bzr41/debian/control  2014-01-16 10:55:44.0 
+0100
@@ -8,7 +8,7 @@
 
 Package: screenruler
 Architecture: all
-Depends: ${misc:Depends}, ruby1.8, ruby-gtk2, ruby-cairo, ruby-gettext
+Depends: ${misc:Depends}, ruby | ruby-interpreter, ruby-gtk2, ruby-cairo, 
ruby-gettext
 Description: measure objects on screen with a variety of metrics
  ScreenRuler will display a ruler on screen which allows you to measure the
  other objects that you've there. It has the following features:
diff -Nru screenruler-0.960+bzr41/debian/patches/debian-changes-0.960+bzr41-1 
screenruler-0.960+bzr41/debian/patches/debian-changes-0.960+bzr41-1
--- screenruler-0.960+bzr41/debian/patches/debian-changes-0.960+bzr41-1 
2012-01-25 00:34:33.0 +0100
+++ screenruler-0.960+bzr41/debian/patches/debian-changes-0.960+bzr41-1 
1970-01-01 01:00:00.0 +0100
@@ -1,50 +0,0 @@
-Description: Upstream changes introduced in version 0.960+bzr41-1
- This patch has been created by dpkg-source during the package build.
- Here's the last changelog entry, hopefully it gives details on why
- those changes were made:
- .
- screenruler (0.960+bzr41-1) unstable; urgency=low
- .
-   * New upstream version + modifications from trunk:
-  - Port to GtkBuilder and replace GConf with a YAML file (Closes: #639437,
-#654710).
-  - Handle symlinks in screenruler.rb.
-  - Added a help window and internationalization support.
-  - Various bug fixes.
-   * debian/control:
-  - Update dependencies.
-   * debian/screenruler.xpm:
-  - Fix typo in Catalan translation and add a German translation.
-   * debian/watch:
-  - Delete it (no point, upstream version numbers are inconsistent).
-   * screenruler.rb:
-  - Hardcode Ruby 1.8.
-   * Change to source format 3.0 (quilt) and debhelper compatibility
- version 7, switch from CDBS to dh and bump Standards-Version to 3.9.2.
- .
- The person named in the Author field signed this changelog entry.
-Author: Siegfried-Angel Gevatter Pujals rai...@ubuntu.com
-Bug-Debian: http://bugs.debian.org/639437
-Bug-Debian: http://bugs.debian.org/654710
-

-The information above should follow the Patch Tagging Guidelines, please
-checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
-are templates for supplementary fields that you might want to add:
-
-Origin: vendor|upstream|other, url of original patch
-Bug: url in upstream bugtracker
-Bug-Debian: http://bugs.debian.org/bugnumber
-Bug-Ubuntu: https://launchpad.net/bugs/bugnumber
-Forwarded: no|not-needed|url proving that it has been forwarded
-Reviewed-By: name and email of someone who approved the patch
-Last-Update: -MM-DD
-
 screenruler-0.960+bzr41.orig/screenruler.rb
-+++ screenruler-0.960+bzr41/screenruler.rb
-@@ -1,4 +1,4 @@
--#!/usr/bin/env ruby
-+#!/usr/bin/ruby1.8
- #coding: utf-8
- 
-  
###
diff -Nru screenruler-0.960+bzr41/debian/patches/hardcode-data-path.patch 
screenruler-0.960+bzr41/debian/patches/hardcode-data-path.patch
--- screenruler-0.960+bzr41/debian/patches/hardcode-data-path.patch 
2012-01-25 00:29:57.0 +0100
+++ screenruler-0.960+bzr41/debian/patches/hardcode-data-path.patch 
2014-01-16 11:05:23.0 +0100
@@ -1,7 +1,7 @@
 Index: screenruler-0.960+bzr41/screenruler.rb
 ===
 screenruler-0.960+bzr41.orig/screenruler.rb2012-01-25 
00:28:43.160859576 +0100
-+++ screenruler-0.960+bzr41/screenruler.rb 2012-01-25 00:28:39.960859677 
+0100
+--- screenruler-0.960+bzr41.orig/screenruler.rb2014-01-16 
11:04:00.063701352 +0100
 screenruler-0.960+bzr41/screenruler.rb 2014-01-16 11:04:47.919408300 
+0100
 @@ -19,7 +19,7 @@
   #  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.

Bug#735435: gnoemoe: diff for NMU version 2.2.0+dfsg-2.3

2014-01-15 Thread zeha 
Package: gnoemoe
Version: 2.2.0+dfsg-2.2
Severity: normal
Tags: patch pending

Dear maintainer,

I've prepared an NMU for gnoemoe (versioned as 2.2.0+dfsg-2.3) and
uploaded it to DELAYED/3. Please feel free to tell me if I
should delay it longer.

Regards.
diff -Nru gnoemoe-2.2.0+dfsg/debian/changelog 
gnoemoe-2.2.0+dfsg/debian/changelog
--- gnoemoe-2.2.0+dfsg/debian/changelog 2014-01-15 12:39:09.0 +0100
+++ gnoemoe-2.2.0+dfsg/debian/changelog 2014-01-15 12:29:31.0 +0100
@@ -1,3 +1,11 @@
+gnoemoe (2.2.0+dfsg-2.3) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Convert to Source Format 3.0 (quilt)
+  * Disable Ruby scripting, as it's 1.8-only
+
+ -- Christian Hofstaedtler z...@debian.org  Wed, 15 Jan 2014 12:25:58 +0100
+
 gnoemoe (2.2.0+dfsg-2.2) unstable; urgency=low
 
   * Non-maintainer upload.
diff -Nru gnoemoe-2.2.0+dfsg/debian/control gnoemoe-2.2.0+dfsg/debian/control
--- gnoemoe-2.2.0+dfsg/debian/control   2014-01-15 12:39:09.0 +0100
+++ gnoemoe-2.2.0+dfsg/debian/control   2014-01-15 12:19:33.0 +0100
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Jesse van den Kieboom je...@icecrew.nl
 Uploaders: Paul van Tilburg pau...@debian.org
-Build-Depends: debhelper (= 5), cdbs, libglib2.0-dev (= 2.8.0), 
libgtk2.0-dev (= 2.8.0), libgtksourceview2.0-dev, libgnomevfs2-dev, 
libgnomeui-dev, libvte-dev (= 0.16.2), libglade2-dev, ruby1.8-dev, ruby, 
libxml2-dev, intltool, libnotify-dev (= 0.7.0)
+Build-Depends: debhelper (= 5), cdbs, libglib2.0-dev (= 2.8.0), 
libgtk2.0-dev (= 2.8.0), libgtksourceview2.0-dev, libgnomevfs2-dev, 
libgnomeui-dev, libvte-dev (= 0.16.2), libglade2-dev, libxml2-dev, intltool, 
libnotify-dev (= 0.7.0)
 Standards-Version: 3.8.3
 
 Package: gnoemoe
diff -Nru gnoemoe-2.2.0+dfsg/debian/patches/series 
gnoemoe-2.2.0+dfsg/debian/patches/series
--- gnoemoe-2.2.0+dfsg/debian/patches/series1970-01-01 01:00:00.0 
+0100
+++ gnoemoe-2.2.0+dfsg/debian/patches/series2014-01-15 12:21:12.0 
+0100
@@ -0,0 +1,6 @@
+01_remove-_-undefs.diff
+02_gtksourceview2.diff
+03_mcp_edit_crash.diff
+04_unused-but-set-variable.diff
+05_libnotify-0.7.diff
+06_add_X11_link.diff
diff -Nru gnoemoe-2.2.0+dfsg/debian/rules gnoemoe-2.2.0+dfsg/debian/rules
--- gnoemoe-2.2.0+dfsg/debian/rules 2014-01-15 12:39:09.0 +0100
+++ gnoemoe-2.2.0+dfsg/debian/rules 2014-01-15 11:10:14.0 +0100
@@ -1,7 +1,6 @@
 #!/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
 
 binary-install/gnoemoe::
diff -Nru gnoemoe-2.2.0+dfsg/debian/source/format 
gnoemoe-2.2.0+dfsg/debian/source/format
--- gnoemoe-2.2.0+dfsg/debian/source/format 1970-01-01 01:00:00.0 
+0100
+++ gnoemoe-2.2.0+dfsg/debian/source/format 2014-01-15 11:11:04.0 
+0100
@@ -0,0 +1 @@
+3.0 (quilt)


-- 
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org

Bug#730719: xmms2: diff for NMU version 0.8+dfsg-8.1

2014-01-15 Thread zeha 
tags 730719 + patch
tags 730719 + pending
thanks

Dear maintainer,

I've prepared an NMU for xmms2 (versioned as 0.8+dfsg-8.1) and
uploaded it to DELAYED/7. Please feel free to tell me if I
should delay it longer.

Regards.
diff -Nru xmms2-0.8+dfsg/debian/changelog xmms2-0.8+dfsg/debian/changelog
--- xmms2-0.8+dfsg/debian/changelog 2013-10-16 14:55:20.0 +0200
+++ xmms2-0.8+dfsg/debian/changelog 2014-01-15 14:06:23.0 +0100
@@ -1,3 +1,11 @@
+xmms2 (0.8+dfsg-8.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Build for supported versions of Ruby. (Closes: #730719)
+  * Drop transitional packages libxmmsclient0-ruby, libxmmsclient0-ruby1.8.
+
+ -- Christian Hofstaedtler z...@debian.org  Wed, 15 Jan 2014 14:04:54 +0100
+
 xmms2 (0.8+dfsg-8) unstable; urgency=low
 
   * Tell waf to use pkg-config to find smbclient.h, thanks to
diff -Nru xmms2-0.8+dfsg/debian/control xmms2-0.8+dfsg/debian/control
--- xmms2-0.8+dfsg/debian/control   2013-10-16 14:22:57.0 +0200
+++ xmms2-0.8+dfsg/debian/control   2014-01-15 13:44:32.0 +0100
@@ -47,10 +47,7 @@
python-all-dev (= 2.6.6-3~),
python-pyrex,
ruby | ruby-interpreter,
-   ruby1.8,
-   ruby1.8-dev,
-   ruby1.9.1,
-   ruby1.9.1-dev
+   gem2deb
 Vcs-Git: git://anonscm.debian.org/pkg-xmms2/xmms2
 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-xmms2/xmms2.git
 Homepage: http://xmms2.org/
@@ -173,29 +170,10 @@
  .
  This package contains a glib based client library written in c.
 
-Package: libxmmsclient-ruby
-Architecture: all
-Section: oldlibs
-Priority: extra
-Depends: ruby-xmmsclient, ${misc:Depends}
-Description: Transitional package for ruby-xmmsclient
- This is a transitional package to ease upgrades to the ruby-xmmsclient
- package. It can safely be removed.
-
-Package: libxmmsclient-ruby1.8
-Architecture: all
-Section: oldlibs
-Priority: extra
-Depends: ruby1.8, ${misc:Depends}
-Description: Transitional package for ruby-xmmsclient
- This is a transitional package to ease upgrades to the ruby-xmmsclient
- package. It can safely be removed.
-
 Package: ruby-xmmsclient
 Architecture: any
 Section: ruby
 Depends: ruby | ruby-interpreter, ${misc:Depends}, ${shlibs:Depends}
-Replaces: libxmmsclient-ruby1.8 ( 0.8+dfsg-4)
 Description: XMMS2 - Ruby bindings
  XMMS2 is a redesign of the XMMS music player. It features a client-server
  model, allowing multiple (even simultaneous!) user interfaces, both textual
diff -Nru xmms2-0.8+dfsg/debian/patches/ruby2-multiarch.patch 
xmms2-0.8+dfsg/debian/patches/ruby2-multiarch.patch
--- xmms2-0.8+dfsg/debian/patches/ruby2-multiarch.patch 1970-01-01 
01:00:00.0 +0100
+++ xmms2-0.8+dfsg/debian/patches/ruby2-multiarch.patch 2014-01-15 
13:56:04.0 +0100
@@ -0,0 +1,26 @@
+Index: xmms2-0.8+dfsg/waflib/Tools/ruby.py
+===
+--- xmms2-0.8+dfsg.orig/waflib/Tools/ruby.py   2014-01-15 13:45:45.695654979 
+0100
 xmms2-0.8+dfsg/waflib/Tools/ruby.py2014-01-15 13:56:00.184162150 
+0100
+@@ -49,10 +49,13 @@ def check_ruby_ext_devel(self):
+   ruby=self.env['RUBY']
+   archdir=read_config('archdir')
+   cpppath=archdir
+-  if version=(1,9,0):
++  if version=(1,9,0) or version[0]=2:
+   ruby_hdrdir=read_config('rubyhdrdir')
+   cpppath+=ruby_hdrdir
+   cpppath+=[os.path.join(ruby_hdrdir[0],read_config('arch')[0])]
++if version[0]=2:
++ruby_archhdrdir=read_config('rubyarchhdrdir')
++cpppath+=ruby_archhdrdir
+   self.check(header_name='ruby.h',includes=cpppath,errmsg='could not find 
ruby header file')
+   self.env.LIBPATH_RUBYEXT=read_config('libdir')
+   self.env.LIBPATH_RUBYEXT+=archdir
+@@ -85,4 +88,4 @@ before_method('apply_incpaths','apply_li
+ feature('rubyext')(apply_ruby_so_name)
+ before_method('apply_link','propagate_uselib')(apply_ruby_so_name)
+ conf(check_ruby_version)
+-conf(check_ruby_ext_devel)
+\ No newline at end of file
++conf(check_ruby_ext_devel)
diff -Nru xmms2-0.8+dfsg/debian/patches/series 
xmms2-0.8+dfsg/debian/patches/series
--- xmms2-0.8+dfsg/debian/patches/series2013-10-16 14:31:41.0 
+0200
+++ xmms2-0.8+dfsg/debian/patches/series2014-01-15 13:44:07.0 
+0100
@@ -11,3 +11,4 @@
 hardening-flags.patch
 fix-libmodplug-include.patch
 samba-with-pkg-cfg.patch
+ruby2-multiarch.patch
diff -Nru xmms2-0.8+dfsg/debian/ruby-xmmsclient.install 
xmms2-0.8+dfsg/debian/ruby-xmmsclient.install
--- xmms2-0.8+dfsg/debian/ruby-xmmsclient.install   2012-12-01 
10:45:24.0 +0100
+++ xmms2-0.8+dfsg/debian/ruby-xmmsclient.install   2014-01-15 
14:09:35.0 +0100
@@ -1 +1,2 @@
 usr/lib/ruby/vendor_ruby/*
+usr/lib/*/ruby/vendor_ruby/*
diff -Nru xmms2-0.8+dfsg/debian/rules xmms2-0.8+dfsg/debian/rules
--- xmms2-0.8+dfsg/debian/rules