Bug#819386: csmash: Fix missing format arguments

[Artur Rona]

Package: src:csmash
Version: 0.6.6-6.7
Tags: patch
Usertags: origin-ubuntu ubuntu-patch xenial

In Ubuntu, we've applied the attached patch to achieve the following:

  * debian/patches/missing-format-arguments.patch:
 - Fix missing format arguments. Fixing FTBFS.


loadparts.cpp: In static member function 'static bool parts::loadobjects(const 
char*)':
loadparts.cpp:221:17: warning: format not a string literal and no format 
arguments [-Wformat-security]
  printf(e.what());
 ^
loadparts.cpp: In static member function 'static bool parts::loadfile(const 
char*)':
loadparts.cpp:251:60: error: no matching function for call to 'clamp(unsigned 
int, long unsigned int, long unsigned int)'
  int bufsize = clamp(0U, sizeof(line)-l, sizeof(line)-1);
^
loadparts.cpp:251:60: note: candidate is:
loadparts.cpp:73:17: note: template const T& {anonymous}::clamp(const T&, 
const T&, const T&)
 inline const T& clamp(const T& a, const T& x, const T& b) {
 ^
loadparts.cpp:73:17: note:   template argument deduction/substitution failed:
loadparts.cpp:251:60: note:   deduced conflicting types for parameter 'const T' 
('unsigned int' and 'long unsigned int')
  int bufsize = clamp(0U, sizeof(line)-l, sizeof(line)-1);
^
loadparts.cpp: In member function 'virtual bool texture_parts::realize()':
loadparts.cpp:541:12: warning: format not a string literal and no format 
arguments [-Wformat-security]
  printf(buf);
^
loadparts.cpp: In member function 'void polyhedron_parts::render() const':
loadparts.cpp:578:11: warning: unused variable 'NanTheBLACK' [-Wunused-variable]
 float NanTheBLACK[4] = { 0, 0, 0, 1 };
   ^
loadparts.cpp:579:11: warning: unused variable 'ManOfVirtue' [-Wunused-variable]
 float ManOfVirtue[4] = { 1, 1, 1, 1 };
   ^
make[3]: *** [loadparts.o] Error 1
make[3]: Leaving directory `/build/buildd/csmash-0.6.6'
make[2]: *** [all-recursive] Error 1
make[2]: Leaving directory `/build/buildd/csmash-0.6.6'
make[1]: *** [all] Error 2
make[1]: Leaving directory `/build/buildd/csmash-0.6.6'
make: *** [build-stamp] Error 2


We thought you might be interested in doing the same.
Description: Fix missing format arguments, resolving FTBFS.
Author: Daniel T Chen 

Index: csmash-0.6.6/loadparts.cpp
===
--- csmash-0.6.6.orig/loadparts.cpp	2014-04-02 09:00:08.0 -0400
+++ csmash-0.6.6/loadparts.cpp	2014-04-02 09:04:11.568523265 -0400
@@ -218,7 +218,7 @@
 }
 catch (const error ) {
 	printf("loadfile failed\n");
-	printf(e.what());
+	printf("%s", e.what());
 	return false;
 }
 return true;
@@ -538,7 +538,7 @@
 	char buf[256];
 	snprintf(buf, sizeof(buf), "texture %s cannot be realized\n",
  filename.c_str());
-	printf(buf);
+	printf("%s", buf);
 	throw error(buf);
 return false;
 } else {

Bug#819373: libfiu: FTBFS with ld --as-needed

[Artur Rona]

Package: src:libfiu
Version: 0.94-3
Tags: patch
Usertags: origin-ubuntu ubuntu-patch xenial

In Ubuntu, we've applied the attached patch to achieve the following:

  * debian/patches/0002-ld-as-needed.patch: Move libraries after files that
need them to fix FTBFS with ld --as-needed.

We thought you might be interested in doing the same.
Description: Move libraries after files that need them to fix FTBFS with ld --as-needed.
Author: Logan Rosen 

--- a/tests/Makefile
+++ b/tests/Makefile
@@ -64,8 +64,8 @@
 #direct jumps, which leaves caller information out of the stack frame and
 #makes functions not appear in the backtrace. We disable it.
 test-enable_stac%: test-enable_stac%.c build-flags
-	$(NICE_CC) $(ALL_CFLAGS) -lfiu -lpthread \
-		-rdynamic -fno-optimize-sibling-calls $< -o $@
+	$(NICE_CC) $(ALL_CFLAGS) \
+		-rdynamic -fno-optimize-sibling-calls $< -lfiu -lpthread -o $@
 
 c-run-%: %
 	$(NICE_RUN) ./$<

Bug#819339: qd: Rename library packages for g++5 ABI transition

[Artur Rona]

Package: src:qd
Version: 2.3.11.dfsg-2.3
Tags: patch
Usertags: origin-ubuntu ubuntu-patch xenial

In Ubuntu, we've applied the attached patch to achieve the following:

  * Rename library packages for g++5 ABI transition.

We thought you might be interested in doing the same.
diff -pruN 2.3.11.dfsg-2.2/debian/changelog 2.3.11.dfsg-2.2ubuntu1/debian/changelog
--- 2.3.11.dfsg-2.2/debian/changelog	2015-08-11 21:46:01.0 +
+++ 2.3.11.dfsg-2.2ubuntu1/debian/changelog	2015-08-11 21:46:01.0 +
@@ -1,3 +1,9 @@
+qd (2.3.11.dfsg-2.2ubuntu1) wily; urgency=medium
+
+  * Rename library packages for g++5 ABI transition.
+
+ -- Iain Lane   Tue, 04 Aug 2015 11:37:46 +0100
+
 qd (2.3.11.dfsg-2.2) unstable; urgency=low
 
   * Convert to dh-autoreconf, which is more robust than CDBS
diff -pruN 2.3.11.dfsg-2.2/debian/control 2.3.11.dfsg-2.2ubuntu1/debian/control
--- 2.3.11.dfsg-2.2/debian/control	2015-08-11 21:46:01.0 +
+++ 2.3.11.dfsg-2.2ubuntu1/debian/control	2015-08-11 21:46:01.0 +
@@ -1,7 +1,8 @@
 Source: qd
 Section: libs
 Priority: optional
-Maintainer: Debian Science Maintainers 
+Maintainer: Ubuntu Developers 
+XSBC-Original-Maintainer: Debian Science Maintainers 
 Uploaders: Christophe Prud'homme 
 Build-Depends: cdbs, debhelper (>= 7), quilt, dh-autoreconf, g++ (>= 4.1), gfortran (>= 4.1)
 Standards-Version: 3.9.1
@@ -12,7 +13,7 @@ Vcs-Browser: http://svn.debian.org/wsvn/
 Package: libqd-dev
 Section: libdevel
 Architecture: any
-Depends: libqd0 (= ${binary:Version}), ${misc:Depends}
+Depends: libqd0v5 (= ${binary:Version}), ${misc:Depends}
 Description: Double-double and quad double types in C++ and F90
  This package supports both a double-double datatype (approx. 32
  decimal digits) and a quad-double datatype (approx. 64 decimal
@@ -21,12 +22,12 @@ Description: Double-double and quad doub
  to convert an existing C++ or Fortran-90 program to use the library
  with only minor changes to the source code.
 
-Package: libqd0
+Package: libqd0v5
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Replaces: libqd2c2a
-Conflicts: libqd2c2a
+Replaces: libqd0, libqd2c2a
+Conflicts: libqd0, libqd2c2a
 Description: Double-double and quad double types in C++ and F90
  This package supports both a double-double datatype (approx. 32
  decimal digits) and a quad-double datatype (approx. 64 decimal
diff -pruN 2.3.11.dfsg-2.2/debian/libqd0.install 2.3.11.dfsg-2.2ubuntu1/debian/libqd0.install
--- 2.3.11.dfsg-2.2/debian/libqd0.install	2015-08-11 21:46:01.0 +
+++ 2.3.11.dfsg-2.2ubuntu1/debian/libqd0.install	1970-01-01 00:00:00.0 +
@@ -1,2 +0,0 @@
-debian/tmp/usr/lib/libqd*.so.* /usr/lib
-
diff -pruN 2.3.11.dfsg-2.2/debian/libqd0v5.install 2.3.11.dfsg-2.2ubuntu1/debian/libqd0v5.install
--- 2.3.11.dfsg-2.2/debian/libqd0v5.install	1970-01-01 00:00:00.0 +
+++ 2.3.11.dfsg-2.2ubuntu1/debian/libqd0v5.install	2015-08-11 21:46:01.0 +
@@ -0,0 +1,2 @@
+debian/tmp/usr/lib/libqd*.so.* /usr/lib
+
diff -pruN 2.3.11.dfsg-2.2/debian/libqd0v5.lintian-overrides 2.3.11.dfsg-2.2ubuntu1/debian/libqd0v5.lintian-overrides
--- 2.3.11.dfsg-2.2/debian/libqd0v5.lintian-overrides	1970-01-01 00:00:00.0 +
+++ 2.3.11.dfsg-2.2ubuntu1/debian/libqd0v5.lintian-overrides	2015-08-11 21:46:01.0 +
@@ -0,0 +1,2 @@
+# G++5 ABI transition
+libqd0v5: package-name-doesnt-match-sonames libqd0

Bug#811329: mstflint: Please use dh_autotools-dev to update config.{sub,guess} for new ports

[Artur Rona]

Package: src:mstflint
Version: 4.1.0+1.46.gb1cdaf7-1
Tags: patch
Usertags: origin-ubuntu ubuntu-patch xenial

In Ubuntu, we've applied the attached patch to achieve the following:

  * debian/rules: Update config.{sub,guess} correctly with 
dh_autotools-dev.


We thought you might be interested in doing the same.
diff -Nru mstflint-4.1.0+1.46.gb1cdaf7/debian/rules mstflint-4.1.0+1.46.gb1cdaf7/debian/rules
--- mstflint-4.1.0+1.46.gb1cdaf7/debian/rules	2015-12-31 01:25:47.0 +0100
+++ mstflint-4.1.0+1.46.gb1cdaf7/debian/rules	2015-12-31 05:14:17.0 +0100
@@ -1,4 +1,4 @@
 #!/usr/bin/make -f
 
 %:
-	dh $@
+	dh $@ --with autotools_dev

Bug#811271: bppsuite: Remove hardcoded library dependencies

[Artur Rona]

Package: src:bppsuite
Version: 0.8.0-1+build1
Tags: patch
Usertags: origin-ubuntu ubuntu-patch xenial

In Ubuntu, we've applied the attached patch to achieve the following:

  * debian/control: Remove hardcoded library dependencies.

We thought you might be interested in doing the same.
diff -Nru bppsuite-0.8.0/debian/changelog bppsuite-0.8.0/debian/changelog
--- bppsuite-0.8.0/debian/changelog	2013-07-17 14:33:48.0 +
+++ bppsuite-0.8.0/debian/changelog	2015-08-11 16:47:36.0 +
@@ -1,3 +1,9 @@
+bppsuite (0.8.0-1+ubuntu1) wily; urgency=medium
+
+  * Remove hardcoded library dependencies.
+
+ -- Iain Lane   Tue, 11 Aug 2015 17:47:36 +0100
+
 bppsuite (0.8.0-1+build1) unstable; urgency=low
 
   * New models for proteins (COaLA)
diff -Nru bppsuite-0.8.0/debian/control bppsuite-0.8.0/debian/control
--- bppsuite-0.8.0/debian/control	2013-07-17 13:38:51.0 +
+++ bppsuite-0.8.0/debian/control	2015-08-11 16:46:56.0 +
@@ -9,7 +9,7 @@
 
 Package: bppsuite
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, libbpp-phyl9 (>= 2.0.3)
+Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: Bio++ program suite
  Includes programs:
   - BppML for maximum likelihood analysis,

Bug#809065: capnproto: MultiArch support

[Artur Rona]

Package: src:capnproto
Version:
Tags: patch
Usertags: origin-ubuntu ubuntu-patch xenial

In Ubuntu, we've applied the attached patch to achieve the following:

- debian/compat, debian/control:
  + Bump to debhelper 9 (needed for MultiArch).
- debian/{control, *.install}:
  + Convert to MutliArch support.

We thought you might be interested in doing the same.
diff -pruN -x '*~' capnproto-0.5.3.orig/debian/compat 
capnproto-0.5.3/debian/compat
--- capnproto-0.5.3.orig/debian/compat  2015-10-31 07:52:49.0 +0100
+++ capnproto-0.5.3/debian/compat   2015-12-26 20:27:54.0 +0100
@@ -1 +1 @@
-8
+9
diff -pruN -x '*~' capnproto-0.5.3.orig/debian/control 
capnproto-0.5.3/debian/control
--- capnproto-0.5.3.orig/debian/control 2015-10-31 07:52:49.0 +0100
+++ capnproto-0.5.3/debian/control  2015-12-26 21:33:43.782543436 +0100
@@ -2,7 +2,7 @@ Source: capnproto
 Section: devel
 Priority: optional
 Maintainer: Tom Lee 
-Build-Depends: debhelper (>= 8.0.0), gcc (>= 4.7),
+Build-Depends: debhelper (>= 9), gcc (>= 4.7),
  python-all (>= 2.6), dpkg-dev (>= 1.16.1.1), docbook-xsl, docbook-xml,
  xsltproc, dh-autoreconf, netbase
 Standards-Version: 3.9.6
@@ -12,6 +12,7 @@ Vcs-Browser: http://github.com/thomaslee
 
 Package: libcapnp-0.5.3
 Architecture: any
+Multi-Arch: same
 Section: libs
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: Cap'n Proto C++ library
@@ -29,6 +30,7 @@ Description: Cap'n Proto C++ library
 
 Package: libcapnp-dev
 Architecture: any
+Multi-Arch: same
 Section: libdevel
 Depends: ${misc:Depends}, libcapnp-0.5.3 (= ${binary:Version})
 Description: Cap'n Proto C++ library (development files)
@@ -47,6 +49,7 @@ Description: Cap'n Proto C++ library (de
 
 Package: capnproto
 Architecture: any
+Multi-Arch: foreign
 Depends: ${shlibs:Depends}, ${misc:Depends},
  libcapnp-0.5.3 (= ${binary:Version})
 Description: tool for working with the Cap'n Proto data interchange format
diff -pruN -x '*~' capnproto-0.5.3.orig/debian/libcapnp-0.5.3.install 
capnproto-0.5.3/debian/libcapnp-0.5.3.install
--- capnproto-0.5.3.orig/debian/libcapnp-0.5.3.install  2015-10-31 
07:52:49.0 +0100
+++ capnproto-0.5.3/debian/libcapnp-0.5.3.install   2015-12-26 
20:30:22.0 +0100
@@ -1,5 +1,5 @@
-usr/lib/libcapnp-0.5.3.so
-usr/lib/libcapnp-rpc-0.5.3.so
-usr/lib/libcapnpc-*.so
-usr/lib/libkj-0.5.3.so
-usr/lib/libkj-async-0.5.3.so
+/usr/lib/*/libcapnp-0.5.3.so
+/usr/lib/*/libcapnp-rpc-0.5.3.so
+/usr/lib/*/libcapnpc-*.so
+/usr/lib/*/libkj-0.5.3.so
+/usr/lib/*/libkj-async-0.5.3.so
diff -pruN -x '*~' capnproto-0.5.3.orig/debian/libcapnp-dev.install 
capnproto-0.5.3/debian/libcapnp-dev.install
--- capnproto-0.5.3.orig/debian/libcapnp-dev.install2015-10-31 
07:52:49.0 +0100
+++ capnproto-0.5.3/debian/libcapnp-dev.install 2015-12-26 20:32:40.0 
+0100
@@ -1,13 +1,13 @@
-usr/lib/libcapnp.a
-usr/lib/libcapnp.so
-usr/lib/libcapnp-rpc.a
-usr/lib/libcapnp-rpc.so
-usr/lib/libcapnpc.a
-usr/lib/libcapnpc.so
-usr/lib/libkj.a
-usr/lib/libkj.so
-usr/lib/libkj-async.a
-usr/lib/libkj-async.so
-usr/lib/pkgconfig
-usr/lib/cmake
+/usr/lib/*/libcapnp.a
+/usr/lib/*/libcapnp.so
+/usr/lib/*/libcapnp-rpc.a
+/usr/lib/*/libcapnp-rpc.so
+/usr/lib/*/libcapnpc.a
+/usr/lib/*/libcapnpc.so
+/usr/lib/*/libkj.a
+/usr/lib/*/libkj.so
+/usr/lib/*/libkj-async.a
+/usr/lib/*/libkj-async.so
+/usr/lib/*/pkgconfig
+/usr/lib/*/cmake
 usr/include

Bug#808481: (no subject)

[Artur Rona]

Should not be the binary package kamailio-mono-modules in debian/control 
adjusted as well?


Package: kamailio-mono-modules
Architecture: amd64 armel i386 mipsel powerpc powerpcspe ppc64 s390x

Bug#792904: fwupdate: FTBFS on arm* architectures

[Artur Rona]

Package: src:fwupdate
Version: 0.4-3
Tags: ftbfs

-T elf_arm_efi.lds
ld: section .note.gnu.build-id loaded at [,0023] overlaps section 
.text loaded at [,648f]
make[3]: *** [fakeesrt2.so] Error 1
Makefile:74: recipe for target 'fakeesrt2.so' failed
rm fakeesrt2.o
make[3]: Leaving directory '/«PKGBUILDDIR»/efi'
make[2]: *** [all] Error 2
Makefile:7: recipe for target 'all' failed
make[2]: Leaving directory '/«PKGBUILDDIR»'
dh_auto_build: make -j1 libdir=${prefix}/usr/lib/arm-linux-gnueabihf 
LIBDIR=${prefix}/usr/lib GNUEFIDIR=${prefix}/usr/lib EFIDIR=debian returned 
exit code 2
make[1]: *** [override_dh_auto_build] Error 2
debian/rules:16: recipe for target 'override_dh_auto_build' failed
make[1]: Leaving directory '/«PKGBUILDDIR»'
make: *** [build-arch] Error 2
debian/rules:13: recipe for target 'build-arch' failed


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

Bug#783961: (no subject)

[Artur Rona]

In Ubuntu, we've applied the attached patch to achieve the following:

  - debian/control, debian/*.install:
+ Install pkcs11 in its own binary.

This change is strongly related to bug #686843 on BTS.

We thought you might be interested in doing the same


diff -pruN -x '*~' gnome-keyring-3.16.0.orig/debian/control 
gnome-keyring-3.16.0/debian/control
--- gnome-keyring-3.16.0.orig/debian/control2015-07-01 22:39:27.0 
+0200
+++ gnome-keyring-3.16.0/debian/control 2015-07-01 22:47:53.108825799 +0200
@@ -43,7 +43,7 @@ Depends: ${misc:Depends},
  dbus-x11,
  p11-kit (= 0.16),
  libcap2-bin [linux-any]
-Recommends: libpam-gnome-keyring
+Recommends: libpam-gnome-keyring, libp11-kit-gnome-keyring
 Breaks: libgnome-keyring0 ( 3.0),
 seahorse-plugins ( 3.0)
 Description: GNOME keyring services (daemon and tools)
@@ -55,6 +55,24 @@ Description: GNOME keyring services (dae
  password, and there is also a session keyring which is never stored to
  disk, but forgotten when the session ends.
 
+Package: libp11-kit-gnome-keyring
+Section: libs
+Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends},
+ multiarch-support
+Depends: ${misc:Depends},
+ ${shlibs:Depends}
+Breaks: gnome-keyring ( 3.6.2-0ubuntu2~)
+Replaces: gnome-keyring ( 3.6.2-0ubuntu2~)
+Description: GNOME keyring module for the PKCS#11 module loading library
+ gnome-keyring is a daemon in the session, similar to ssh-agent,
+ and other applications can use it to store passwords and other
+ sensitive information.
+ .
+ This package contains a PKCS#11 module that will allow using the GNOME
+ keyring as a certificate database.
+
 Package: libpam-gnome-keyring
 Section: admin
 Architecture: any
diff -pruN -x '*~' gnome-keyring-3.16.0.orig/debian/control.in 
gnome-keyring-3.16.0/debian/control.in
--- gnome-keyring-3.16.0.orig/debian/control.in 2015-07-01 22:40:07.0 
+0200
+++ gnome-keyring-3.16.0/debian/control.in  2015-07-01 22:47:36.420483673 
+0200
@@ -39,7 +39,7 @@ Depends: ${misc:Depends},
  dbus-x11,
  p11-kit (= 0.16),
  libcap2-bin [linux-any]
-Recommends: libpam-gnome-keyring
+Recommends: libpam-gnome-keyring, libp11-kit-gnome-keyring
 Breaks: libgnome-keyring0 ( 3.0),
 seahorse-plugins ( 3.0)
 Description: GNOME keyring services (daemon and tools)
@@ -51,6 +51,24 @@ Description: GNOME keyring services (dae
  password, and there is also a session keyring which is never stored to
  disk, but forgotten when the session ends.
 
+Package: libp11-kit-gnome-keyring
+Section: libs
+Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends},
+ multiarch-support
+Depends: ${misc:Depends},
+ ${shlibs:Depends}
+Breaks: gnome-keyring ( 3.6.2-0ubuntu2~)
+Replaces: gnome-keyring ( 3.6.2-0ubuntu2~)
+Description: GNOME keyring module for the PKCS#11 module loading library
+ gnome-keyring is a daemon in the session, similar to ssh-agent,
+ and other applications can use it to store passwords and other
+ sensitive information.
+ .
+ This package contains a PKCS#11 module that will allow using the GNOME
+ keyring as a certificate database.
+
 Package: libpam-gnome-keyring
 Section: admin
 Architecture: any
diff -pruN -x '*~' gnome-keyring-3.16.0.orig/debian/gnome-keyring.install 
gnome-keyring-3.16.0/debian/gnome-keyring.install
--- gnome-keyring-3.16.0.orig/debian/gnome-keyring.install  2015-04-17 
14:03:16.0 +0200
+++ gnome-keyring-3.16.0/debian/gnome-keyring.install   2015-07-01 
22:44:12.832179586 +0200
@@ -7,5 +7,4 @@ usr/share/man/man1/gnome-keyring.1
 usr/share/man/man1/gnome-keyring-daemon.1
 usr/share/p11-kit
 usr/lib/gnome-keyring/devel/*.so
-usr/lib/*/pkcs11/*.so
 etc/xdg/autostart
diff -pruN -x '*~' 
gnome-keyring-3.16.0.orig/debian/libp11-kit-gnome-keyring.install 
gnome-keyring-3.16.0/debian/libp11-kit-gnome-keyring.install
--- gnome-keyring-3.16.0.orig/debian/libp11-kit-gnome-keyring.install   
1970-01-01 01:00:00.0 +0100
+++ gnome-keyring-3.16.0/debian/libp11-kit-gnome-keyring.install
2015-04-08 16:09:49.0 +0200
@@ -0,0 +1,2 @@
+usr/lib/*/pkcs11/*.so
+usr/share/p11-kit

Bug#686843: (no subject)

[Artur Rona]

In Ubuntu, we've applied the attached patch to achieve the following:

 - debian/control, debian/rules, debian/*.install:
   + MultiArch support.

This change is strongly related to bug #783961 on BTS.

We thought you might be interested in doing the same.

diff -pruN -x '*~' gnome-keyring-3.16.0.orig/debian/control 
gnome-keyring-3.16.0/debian/control
--- gnome-keyring-3.16.0.orig/debian/control2015-05-04 21:00:31.0 
+0200
+++ gnome-keyring-3.16.0/debian/control 2015-07-01 22:39:27.841583840 +0200
@@ -34,7 +34,9 @@ Homepage: https://wiki.gnome.org/GnomeKe
 
 Package: gnome-keyring
 Architecture: any
-Pre-Depends: ${misc:Pre-Depends}
+Multi-Arch: foreign
+Pre-Depends: ${misc:Pre-Depends},
+ multiarch-support
 Depends: ${misc:Depends},
  ${shlibs:Depends},
  gcr (= 3.4),
@@ -56,6 +58,9 @@ Description: GNOME keyring services (dae
 Package: libpam-gnome-keyring
 Section: admin
 Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends},
+ multiarch-support
 Depends: ${misc:Depends},
  ${shlibs:Depends},
  libpam-runtime (= 1.0.1-6)
diff -pruN -x '*~' gnome-keyring-3.16.0.orig/debian/control.in 
gnome-keyring-3.16.0/debian/control.in
--- gnome-keyring-3.16.0.orig/debian/control.in 2015-04-17 13:46:10.0 
+0200
+++ gnome-keyring-3.16.0/debian/control.in  2015-07-01 22:40:07.066543980 
+0200
@@ -30,7 +30,9 @@ Homepage: https://wiki.gnome.org/GnomeKe
 
 Package: gnome-keyring
 Architecture: any
-Pre-Depends: ${misc:Pre-Depends}
+Multi-Arch: foreign
+Pre-Depends: ${misc:Pre-Depends},
+ multiarch-support
 Depends: ${misc:Depends},
  ${shlibs:Depends},
  gcr (= 3.4),
@@ -52,6 +54,9 @@ Description: GNOME keyring services (dae
 Package: libpam-gnome-keyring
 Section: admin
 Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends},
+ multiarch-support
 Depends: ${misc:Depends},
  ${shlibs:Depends},
  libpam-runtime (= 1.0.1-6)
diff -pruN -x '*~' 
gnome-keyring-3.16.0.orig/debian/libpam-gnome-keyring.install 
gnome-keyring-3.16.0/debian/libpam-gnome-keyring.install
--- gnome-keyring-3.16.0.orig/debian/libpam-gnome-keyring.install   
2015-04-14 19:35:20.0 +0200
+++ gnome-keyring-3.16.0/debian/libpam-gnome-keyring.install2015-07-01 
22:46:14.962792343 +0200
@@ -1,2 +1,2 @@
-lib/security/*.so
+lib/*/security/*.so
 debian/pam-configs usr/share/
diff -pruN -x '*~' gnome-keyring-3.16.0.orig/debian/rules 
gnome-keyring-3.16.0/debian/rules
--- gnome-keyring-3.16.0.orig/debian/rules  2015-04-14 19:35:20.0 
+0200
+++ gnome-keyring-3.16.0/debian/rules   2015-07-01 22:35:07.990620882 +0200
@@ -14,7 +14,7 @@ ifeq (,$(filter $(DEB_BUILD_ARCH),kfreeb
 DEB_MAKE_CHECK_TARGET := -k check || true
 endif
 
-DEB_CONFIGURE_EXTRA_FLAGS += --with-pam-dir=/lib/security \
+DEB_CONFIGURE_EXTRA_FLAGS += 
--with-pam-dir=/lib/$(DEB_HOST_MULTIARCH)/security \
  --enable-gtk-doc \
  --disable-update-mime
 

Bug#789790: src: ust: Switch to python3

[Artur Rona]

Package: src:use
Version: 2.6.2-1
Tags: patch
Usertags: origin-ubuntu ubuntu-patch wily

In Ubuntu, we've applied the attached patch to achieve the following:

- debian/control, debian/patches/use-python3.patch:
  + Switch to use python3.

We thought you might be interested in doing the same.
diff -pruN -x '*~' ust-2.6.2/debian/control ust-2.6.2.orig/debian/control
--- ust-2.6.2/debian/control2015-06-18 23:07:13.0 +0200
+++ ust-2.6.2.orig/debian/control   2015-06-24 14:32:57.113209786 +0200
@@ -2,7 +2,7 @@ Source: ust
 Priority: extra
 Maintainer: Jon Bernard jbern...@debian.org
 Build-Depends: debhelper (= 9), dh-autoreconf, liburcu-dev (= 0.8.4),
-  uuid-dev, texinfo, python
+  uuid-dev, texinfo, python3:any, dh-python
 Standards-Version: 3.9.6
 Section: libs
 Vcs-Git: git://anonscm.debian.org/collab-maint/ust.git
@@ -49,7 +49,7 @@ Multi-Arch: same
 Depends: ${misc:Depends},
   liblttng-ust0 (= ${binary:Version}), liblttng-ust-ctl2 (= ${binary:Version}),
   liburcu-dev (= 0.8.4), uuid-dev
-Recommends: python
+Recommends: python3
 Conflicts: liblttng-ust2
 Replaces: liblttng-ust2
 Breaks: liblttng-ust0 ( 2.3.0)
diff -pruN -x '*~' ust-2.6.2/debian/patches/series 
ust-2.6.2.orig/debian/patches/series
--- ust-2.6.2/debian/patches/series 1970-01-01 01:00:00.0 +0100
+++ ust-2.6.2.orig/debian/patches/series2015-06-24 14:32:48.957151978 
+0200
@@ -0,0 +1 @@
+use-python3.patch
diff -pruN -x '*~' ust-2.6.2/debian/patches/use-python3.patch 
ust-2.6.2.orig/debian/patches/use-python3.patch
--- ust-2.6.2/debian/patches/use-python3.patch  1970-01-01 01:00:00.0 
+0100
+++ ust-2.6.2.orig/debian/patches/use-python3.patch 2015-06-24 
14:32:48.957151978 +0200
@@ -0,0 +1,13 @@
+Description: use python3
+Author: Dimitri John Ledkov x...@ubuntu.com
+
+Index: ust-2.5.1-1ubuntu1/tools/lttng-gen-tp
+===
+--- ust-2.5.1-1ubuntu1.orig/tools/lttng-gen-tp
 ust-2.5.1-1ubuntu1/tools/lttng-gen-tp
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/python3
+ #
+ # Copyright (c)  2012 Yannick Brosseau yannick.bross...@gmail.com
+ #

Bug#789825: python-lockfile: FTBFS: ImportError: No module named setuptools

[Artur Rona]

Package: src:python-lockfile
Version: 1:0.10.2-2
Tags: patch
Usertags: origin-ubuntu ubuntu-patch wily

In some cases, is it possible to get FTBFS due to missing build 
dependencies python*-setuptools.


In Ubuntu, we've applied the attached patch to achieve the following:

  * debian/Build-Depends on python*-setuptools to fix FTBFS.

We thought you might be interested in doing the same.
I: using fakeroot in build.
I: Current time: Wed Jun 24 19:53:03 CEST 2015
I: pbuilder-time-stamp: 1435168383
I: Building the build Environment
I: extracting base tarball [/home/ari/pbuilder/wily-base.tgz]
I: creating local configuration
I: copying local configuration
W: --override-config is not set; not updating apt.conf Read the manpage for 
details.
I: mounting /proc filesystem
I: mounting /run/shm filesystem
I: mounting /dev/pts filesystem
I: policy-rc.d already exists
I: Obtaining the cached apt archive contents
I: Installing the build-deps
 - Attempting to satisfy build-dependencies
 - Creating pbuilder-satisfydepends-dummy package
Package: pbuilder-satisfydepends-dummy
Version: 0.invalid.0
Architecture: amd64
Maintainer: Debian Pbuilder Team pbuilder-ma...@lists.alioth.debian.org
Description: Dummy package to satisfy dependencies with aptitude - created by 
pbuilder
 This package was created automatically by pbuilder to satisfy the
 build-dependencies of the package being currently built.
Depends: debhelper (= 9~), dh-python, python3-pbr, python3-nose, python3, 
python-pbr, python-nose, python
dpkg-deb: building package `pbuilder-satisfydepends-dummy' in 
`/tmp/satisfydepends-aptitude/pbuilder-satisfydepends-dummy.deb'.
Selecting previously unselected package pbuilder-satisfydepends-dummy.
(Reading database ... 11718 files and directories currently installed.)
Preparing to unpack .../pbuilder-satisfydepends-dummy.deb ...
Unpacking pbuilder-satisfydepends-dummy (0.invalid.0) ...
dpkg: pbuilder-satisfydepends-dummy: dependency problems, but configuring 
anyway as you requested:
 pbuilder-satisfydepends-dummy depends on debhelper (= 9~); however:
  Package debhelper is not installed.
 pbuilder-satisfydepends-dummy depends on dh-python; however:
  Package dh-python is not installed.
 pbuilder-satisfydepends-dummy depends on python3-pbr; however:
  Package python3-pbr is not installed.
 pbuilder-satisfydepends-dummy depends on python3-nose; however:
  Package python3-nose is not installed.
 pbuilder-satisfydepends-dummy depends on python3; however:
  Package python3 is not installed.
 pbuilder-satisfydepends-dummy depends on python-pbr; however:
  Package python-pbr is not installed.
 pbuilder-satisfydepends-dummy depends on python-nose; however:
  Package python-nose is not installed.
 pbuilder-satisfydepends-dummy depends on python; however:
  Package python is not installed.

Setting up pbuilder-satisfydepends-dummy (0.invalid.0) ...
Reading package lists...
Building dependency tree...
Reading state information...
Initializing package states...
Writing extended state information...
Building tag database...
The following NEW packages will be installed:
  bsdmainutils{a} debhelper{a} dh-apparmor{a} dh-python{a} file{a} 
  gettext{a} gettext-base{a} groff-base{a} intltool-debian{a} 
  libasprintf0c2{a} libcroco3{a} libexpat1{a} libffi6{a} libglib2.0-0{a} 
  libicu52{a} libmagic1{a} libmpdec2{a} libpipeline1{a} libpython-stdlib{a} 
  libpython2.7-minimal{a} libpython2.7-stdlib{a} libpython3-stdlib{a} 
  libpython3.4-minimal{a} libpython3.4-stdlib{a} libssl1.0.0{a} 
  libunistring0{a} libxml2{a} man-db{a} mime-support{a} po-debconf{a} 
  python{a} python-minimal{a} python-nose{a} python-pbr{a} 
  python-pkg-resources{a} python2.7{a} python2.7-minimal{a} python3{a} 
  python3-minimal{a} python3-nose{a} python3-pbr{a} 
  python3-pkg-resources{a} python3.4{a} python3.4-minimal{a} 
0 packages upgraded, 44 newly installed, 0 to remove and 0 not upgraded.
Need to get 3951 kB/23.2 MB of archives. After unpacking 93.7 MB will be used.
Writing extended state information...
Get: 1 http://archive.ubuntu.com/ubuntu/ wily/main libpython2.7-minimal amd64 
2.7.10-2 [338 kB]
Get: 2 http://archive.ubuntu.com/ubuntu/ wily/main python2.7-minimal amd64 
2.7.10-2 [1365 kB]
Get: 3 http://archive.ubuntu.com/ubuntu/ wily/main libpython2.7-stdlib amd64 
2.7.10-2 [1848 kB]
Get: 4 http://archive.ubuntu.com/ubuntu/ wily/main python2.7 amd64 2.7.10-2 
[210 kB]
Get: 5 http://archive.ubuntu.com/ubuntu/ wily/main python3-pbr all 
1.0.1-1ubuntu1 [33.0 kB]
Get: 6 http://archive.ubuntu.com/ubuntu/ wily/main python-pbr all 
1.0.1-1ubuntu1 [44.6 kB]
Get: 7 http://archive.ubuntu.com/ubuntu/ wily/main python-pkg-resources all 
17.0-1 [70.5 kB]
Get: 8 http://archive.ubuntu.com/ubuntu/ wily/main python3-pkg-resources all 
17.0-1 [41.0 kB]
Fetched 3951 kB in 13s (290 kB/s)
debconf: delaying package configuration, since apt-utils is not installed
E: Can not write log (Is /dev/pts mounted?) - posix_openpt (2: No such file or 
directory)
Selecting previously 

Bug#781985: giftrans: FTBFS: ignoring return value of 'fread', declared with attribute warn_unused_result

[Artur Rona]

Package: giftrans
Version: 1.12.2-18
Tags: patch
Usertags: origin-ubuntu ubuntu-patch vivid

make[1]: Entering directory '/tmp/buildd/giftrans-1.12.2'
cc -g -Wall -Werror -pedantic-errors -Wfatal-errors -Wwrite-strings 
-fno-merge-constants -fstrict-aliasing -O2 -ogiftrans giftrans.c

giftrans.c: In function 'skipdata':
giftrans.c:293:3: error: ignoring return value of 'fread', declared with 
attribute warn_unused_result [-Werror=unused-result]

   (void)fread((void *)size,1,1,src);
   ^
compilation terminated due to -Wfatal-errors.
cc1: all warnings being treated as errors

In Ubuntu, we've applied the attached patch to achieve the following:

  * debian/patches/13_check_file_access_result.diff:
 - Patch giftrans.c to get result from fwrite. Fixes FTBFS with 
warn_unused_result.


We thought you might be interested in doing the same.
Index: giftrans-1.12.2/giftrans.c
===
--- giftrans-1.12.2.orig/giftrans.c	2008-06-19 12:12:08.152671697 +0100
+++ giftrans-1.12.2/giftrans.c	2008-06-19 12:16:13.844171848 +0100
@@ -270,16 +270,17 @@
 size_t		len;
 {
 	unsigned char	size;
+	size_t nbytes;
 
 	while (len) {
 		size=len256?len:255;
-		(void)fwrite((void *)size,1,1,dest);
-		(void)fwrite((void *)data,(size_t)size,1,dest);
+		nbytes = fwrite((void *)size,1,1,dest);
+		nbytes = fwrite((void *)data,(size_t)size,1,dest);
 		data+=size;
 		len-=size;
 	}
 	size=0;
-	(void)fwrite((void *)size,1,1,dest);
+	nbytes = fwrite((void *)size,1,1,dest);
 }
 
 
@@ -287,15 +288,16 @@
 FILE	*src;
 {
 	unsigned char	size,buffer[256];
+	size_t nbytes;
 
 	do {
 		pos=ftell(src);
-		(void)fread((void *)size,1,1,src);
+		nbytes = fread((void *)size,1,1,src);
 		if (debug)
 			dump(pos,size,1);
 		if (debug) {
 			pos=ftell(src);
-			(void)fread((void *)buffer,(size_t)size,1,src);
+			nbytes = fread((void *)buffer,(size_t)size,1,src);
 			dump(pos,buffer,(size_t)size);
 		}
 		else
@@ -309,19 +311,20 @@
 FILE	*dest;
 {
 	unsigned char	size,buffer[256];
+	size_t nbytes;
 
 	pos=ftell(src);
-	(void)fread((void *)size,1,1,src);
+	nbytes = fread((void *)size,1,1,src);
 	if (debug)
 		dump(pos,size,1);
 	if (output)
-		(void)fwrite((void *)size,1,1,dest);
+		nbytes = fwrite((void *)size,1,1,dest);
 	pos=ftell(src);
-	(void)fread((void *)buffer,(size_t)size,1,src);
+	nbytes = fread((void *)buffer,(size_t)size,1,src);
 	if (debug)
 		dump(pos,buffer,(size_t)size);
 	if (output)
-		(void)fwrite((void *)buffer,(size_t)size,1,dest);
+		nbytes = fwrite((void *)buffer,(size_t)size,1,dest);
 }
 
 
@@ -329,13 +332,13 @@
 FILE	*src;
 {
 	unsigned char	size,buffer[256];
-	size_t i;
+	size_t i,nbytes;
 
 	pos=ftell(src);
-	(void)fread((void *)size,1,1,src);
+	nbytes = fread((void *)size,1,1,src);
 	if (debug)
 		dump(pos,size,1);
-	(void)fread((void *)buffer,(size_t)size,1,src);
+	nbytes = fread((void *)buffer,(size_t)size,1,src);
 	if (debug)
 		dump(pos+1,buffer,(size_t)size);
 	for (i=0; i(size_t)size; i++)
@@ -360,20 +363,21 @@
 FILE	*dest;
 {
 	unsigned char	size,buffer[256];
+	size_t nbytes;
 
 	do {
 		pos=ftell(src);
-		(void)fread((void *)size,1,1,src);
+		nbytes = fread((void *)size,1,1,src);
 		if (debug)
 			dump(pos,size,1);
 		if (output)
-			(void)fwrite((void *)size,1,1,dest);
+			nbytes = fwrite((void *)size,1,1,dest);
 		pos=ftell(src);
-		(void)fread((void *)buffer,(size_t)size,1,src);
+		nbytes = fread((void *)buffer,(size_t)size,1,src);
 		if (debug)
 			dump(pos,buffer,(size_t)size);
 		if (output)
-			(void)fwrite((void *)buffer,(size_t)size,1,dest);
+			nbytes = fwrite((void *)buffer,(size_t)size,1,dest);
 	} while (!feof(src)size0);
 }
 
@@ -385,11 +389,11 @@
 	unsigned char	buffer[3*256],lsd[7],gct[3*256],gce[5];
 	unsigned int	cnt,cols,size,gct_size=0,gct_delay,gce_present;
 	struct entry	*rgbptr;
-
+	size_t nbytes;
 
 	/* Header */
 	pos=ftell(src);
-	(void)fread((void *)buffer,6,1,src);
+	nbytes = fread((void *)buffer,6,1,src);
 	if (strncmp((char *)buffer,GIF,3)) {
 		(void)fprintf(stderr,No GIF file!\n);
 		return(1);
@@ -403,12 +407,12 @@
 	if (output) {
 		if (!strncmp((char *)buffer,GIF87a,6))
 			buffer[4]='9';
-		(void)fwrite((void *)buffer,6,1,dest);
+		nbytes = fwrite((void *)buffer,6,1,dest);
 	}
 
 	/* Logical Screen Descriptor */
 	pos=ftell(src);
-	(void)fread((void *)lsd,7,1,src);
+	nbytes = fread((void *)lsd,7,1,src);
 	if (verbose) {
 		(void)fprintf(stderr,Logical Screen Descriptor:\n);
 		(void)fprintf(stderr,\tLogical Screen Width: %d pixels\n,readword(lsd));
@@ -431,7 +435,7 @@
 	if (lsd[4]0x80) {
 		gct_size=2(lsd[4]0x7);
 		pos=ftell(src);
-		(void)fread((void *)gct,gct_size,3,src);
+		nbytes = fread((void *)gct,gct_size,3,src);
 		if (go.index==RGB)
 			for(cnt=0;cntgct_sizego.index==RGB;cnt++)
 if (gct[3*cnt]==go.redgct[3*cnt+1]==go.greengct[3*cnt+2]==go.blue)
@@ -467,7 +471,7 @@
 			gct_delay=TRUE;
 	}
 	if (output)
-		(void)fwrite((void *)lsd,7,1,dest);
+		nbytes = fwrite((void *)lsd,7,1,dest);
 	if (lsd[4]0x80) {
 		if 

Bug#505662: (no subject)

[Artur Rona]

In Ubuntu, we've applied the attached patch to achieve the following:

  * debian/control:
- Drop xchat-gnome from Replaces/Conflicts.

We thought you might be interested in doing the same.
diff -Nru xchat-2.8.8/debian/control xchat-2.8.8/debian/control
--- xchat-2.8.8/debian/control	2014-10-13 21:58:48.0 +0200
+++ xchat-2.8.8/debian/control	2015-04-05 19:24:50.0 +0200
@@ -10,10 +10,9 @@
 Package: xchat
 Architecture: any
 Provides: irc
-Replaces: xchat-gnome ( 1:0.11-1), xchat-common ( 1.6.0-1)
+Replaces: xchat-common ( 1.6.0-1)
 Depends: ${shlibs:Depends}, xchat-common (= ${source:Version}), ${misc:Depends}
 Recommends: ${shlibs:Recommends}, esound-clients | alsa-utils, libnotify4 | libnotify-bin, xdg-utils
-Conflicts: xchat-gnome ( 1:0.11-1)
 Description: IRC client for X similar to AmIRC
  XChat is a graphical IRC Client with a GTK+ GUI. It has a look and feel
  similar to AmIRC for the Amiga. Special features include the mIRC extension

Bug#400890: (no subject)

[Artur Rona]

In Ubuntu, we've applied the attached patch to achieve the following:

  * debian/patches/72_fix_accelerator_menubar_toggle.patch:
- Correctly show F9 as shortcut to toggle the menubar.

We thought you might be interested in doing the same.
Description: Upstream changes introduced in version 2.8.8-3ubuntu6~test2
Author: Andreas Moog am...@ubuntu.com
Bug: http://sourceforge.net/support/tracker.php?aid=3024423
Bug-Ubuntu: https://launchpad.net/bugs/392503

--- xchat-2.8.8.orig/src/fe-gtk/menu.c
+++ xchat-2.8.8/src/fe-gtk/menu.c
@@ -2215,8 +2215,10 @@ togitem:
 	 mymenu[i].state);*/
 			if (mymenu[i].key != 0)
 gtk_widget_add_accelerator (item, activate, accel_group,
-	mymenu[i].key, mymenu[i].id == MENU_ID_AWAY ?
-	away_mask : GDK_CONTROL_MASK, GTK_ACCEL_VISIBLE);
+	mymenu[i].key,
+	mymenu[i].id == MENU_ID_AWAY ? away_mask :
+	mymenu[i].key == GDK_F9 ? 0 :
+	GDK_CONTROL_MASK, GTK_ACCEL_VISIBLE);
 			if (mymenu[i].callback)
 g_signal_connect (G_OBJECT (item), toggled,
 		G_CALLBACK (mymenu[i].callback), 0);

Bug#682141: (no subject)

[Artur Rona]

In Ubuntu, we've applied the attached patch to achieve the following:

  * debian/patches/76_fix_gfvs_mime_handler.patch:
- Make it possible to open irc:// URI's via gvfs.

We thought you might be interested in doing the same.
## Description: Make it possible to open irc:// URI's via gvfs.
## Origin/Author: Shawn Landden shawnland...@gmail.com and
## Daniel Gimpelevich dan...@gimpelevich.san-francisco.ca.us
## Bug: https://bugs.launchpad.net/ubuntu/+source/xchat/+bug/933822
Index: xchat-2.8.8/xchat.desktop
===
--- xchat-2.8.8.orig/xchat.desktop	2010-05-30 08:08:48.0 +0200
+++ xchat-2.8.8/xchat.desktop	2012-12-03 19:18:00.0 +0100
@@ -15,9 +15,10 @@
 Comment[ro]=Client de IRC
 Comment[zh_TW]=X-Chat 聊天程式
 Comment=Chat with other people using Internet Relay Chat
-Exec=xchat
+Exec=sh -c xchat --existing --url %U || exec xchat
 Icon=xchat
 Terminal=false
 Type=Application
 Categories=Network;
 StartupNotify=true
+MimeType=x-scheme-handler/irc;x-scheme-handler/ircs;

Bug#781964: xchat: Include svg icon

[Artur Rona]

Package: xchat
Version: 2.8.8-7.3
Tags: patch
Usertags: origin-ubuntu ubuntu-patch vivid

In Ubuntu, we've applied the attached patch to achieve the following:

  * debian/xchat.install, debian/xchat.svg:
 - Include svg icon.

We thought you might be interested in doing the same.
diff -Nru xchat-2.8.8/debian/xchat.install xchat-2.8.8/debian/xchat.install
--- xchat-2.8.8/debian/xchat.install	2011-07-03 12:27:04.0 +0200
+++ xchat-2.8.8/debian/xchat.install	2013-07-30 14:55:43.0 +0200
@@ -3,3 +3,4 @@
 debian/tmp/usr/bin/xchat ../xchat/usr/bin
 debian/tmp/usr/lib/xchat/plugins/*.so
 xchat.xpm ../xchat/usr/share/icons/
+debian/xchat.svg /usr/share/icons/hicolor/scalable/apps
diff -Nru xchat-2.8.8/debian/xchat.svg xchat-2.8.8/debian/xchat.svg
--- xchat-2.8.8/debian/xchat.svg	1970-01-01 01:00:00.0 +0100
+++ xchat-2.8.8/debian/xchat.svg	2013-07-30 14:55:43.0 +0200
@@ -0,0 +1,196 @@
+?xml version=1.0 encoding=UTF-8 standalone=no?
+!-- Created with Inkscape (http://www.inkscape.org/) --
+svg
+   xmlns:dc=http://purl.org/dc/elements/1.1/;
+   xmlns:cc=http://web.resource.org/cc/;
+   xmlns:rdf=http://www.w3.org/1999/02/22-rdf-syntax-ns#;
+   xmlns:svg=http://www.w3.org/2000/svg;
+   xmlns=http://www.w3.org/2000/svg;
+   xmlns:xlink=http://www.w3.org/1999/xlink;
+   xmlns:sodipodi=http://inkscape.sourceforge.net/DTD/sodipodi-0.dtd;
+   xmlns:inkscape=http://www.inkscape.org/namespaces/inkscape;
+   width=64
+   height=64
+   id=svg2
+   sodipodi:version=0.32
+   inkscape:version=0.43
+   version=1.0
+   sodipodi:docbase=/home/rax/Desktop
+   sodipodi:docname=xchat-clone.svg
+  defs
+ id=defs4
+linearGradient
+   id=linearGradient2289
+  stop
+ style=stop-color:#ff2600;stop-opacity:1;
+ offset=0
+ id=stop2291 /
+  stop
+ style=stop-color:#ffd600;stop-opacity:1;
+ offset=1
+ id=stop2293 /
+/linearGradient
+linearGradient
+   inkscape:collect=always
+   xlink:href=#linearGradient2289
+   id=linearGradient1335
+   gradientUnits=userSpaceOnUse
+   gradientTransform=matrix(0.545166,0,0,0.544959,0.186963,35.29511)
+   x1=16.88862
+   y1=77.796608
+   x2=72.348671
+   y2=20.59322 /
+linearGradient
+   inkscape:collect=always
+   xlink:href=#linearGradient2289
+   id=linearGradient1337
+   gradientUnits=userSpaceOnUse
+   gradientTransform=matrix(0.545166,0,0,0.544959,0.186963,35.29511)
+   x1=16.88862
+   y1=77.796608
+   x2=16.88862
+   y2=19.001091 /
+linearGradient
+   inkscape:collect=always
+   xlink:href=#linearGradient2289
+   id=linearGradient1317
+   gradientUnits=userSpaceOnUse
+   gradientTransform=matrix(0.735969,0,0,0.735801,-2.052758,-16.66733)
+   x1=16.88862
+   y1=77.796608
+   x2=72.348671
+   y2=20.59322 /
+linearGradient
+   inkscape:collect=always
+   xlink:href=#linearGradient2289
+   id=linearGradient1319
+   gradientUnits=userSpaceOnUse
+   gradientTransform=matrix(0.735969,0,0,0.735801,-2.052758,-16.66733)
+   x1=16.88862
+   y1=77.796608
+   x2=16.88862
+   y2=19.001091 /
+linearGradient
+   inkscape:collect=always
+   xlink:href=#linearGradient2289
+   id=linearGradient1320
+   gradientUnits=userSpaceOnUse
+   gradientTransform=matrix(0.735969,0,0,0.735801,-2.172329,-1.111016)
+   x1=16.88862
+   y1=77.796608
+   x2=72.348671
+   y2=20.59322 /
+linearGradient
+   inkscape:collect=always
+   xlink:href=#linearGradient2289
+   id=linearGradient1322
+   gradientUnits=userSpaceOnUse
+   gradientTransform=matrix(0.735969,0,0,0.735801,-2.172329,-1.111016)
+   x1=16.88862
+   y1=77.796608
+   x2=16.88862
+   y2=19.001091 /
+linearGradient
+   inkscape:collect=always
+   xlink:href=#linearGradient2289
+   id=linearGradient1328
+   gradientUnits=userSpaceOnUse
+   gradientTransform=matrix(0.735969,0,0,0.735801,-2.172329,-1.111016)
+   x1=16.88862
+   y1=77.796608
+   x2=72.348671
+   y2=20.59322 /
+linearGradient
+   inkscape:collect=always
+   xlink:href=#linearGradient2289
+   id=linearGradient1330
+   gradientUnits=userSpaceOnUse
+   gradientTransform=matrix(0.735969,0,0,0.735801,-2.172329,-1.111016)
+   x1=16.88862
+   y1=77.796608
+   x2=16.88862
+   y2=19.001091 /
+  /defs
+  sodipodi:namedview
+ id=base
+ pagecolor=#ff
+ bordercolor=#66
+ borderopacity=1.0
+ inkscape:pageopacity=0.0
+ inkscape:pageshadow=2
+ inkscape:zoom=12.828125
+ inkscape:cx=32
+ inkscape:cy=32
+ inkscape:document-units=px
+ inkscape:current-layer=layer1
+ showgrid=false
+ inkscape:window-width=1270
+ inkscape:window-height=972
+ inkscape:window-x=0
+ inkscape:window-y=0
+ showguides=true
+ inkscape:guide-bbox=true /
+  metadata
+ 

Bug#781513: regexxer: Fix save all menu item

[Artur Rona]

Package: src:regexxer
Version: 0.9-6
Tags: patch
Usertags: origin-ubuntu ubuntu-patch vivid

In Ubuntu, we've applied the attached patch to achieve the following:

  * debian/patches/fix-save-all-menu-item.patch:
 - Fix save all menu item.

We thought you might be interested in doing the same.
diff -Nur regexxer-0.9/ui/mainwindow.glade regexxer-0.9.new/ui/mainwindow.glade
--- regexxer-0.9/ui/mainwindow.glade	2007-01-08 17:36:55.0 +0100
+++ regexxer-0.9.new/ui/mainwindow.glade	2007-04-03 16:38:02.0 +0200
@@ -47,7 +47,7 @@
 		widget class=GtkImageMenuItem id=menuitem_save_all
 		  property name=visibleTrue/property
 		  property name=labelregexxer-save-all/property
-		  property name=use_underlineTrue/property
+		  property name=use_stockTrue/property
 		/widget
 		  /child
 

Bug#710880: (no subject)

[Artur Rona]

In Ubuntu, we've applied the attached patch to achieve the following:

  * debian/patches/99-esd_pa_fixes.patch, debian/control:
- Fix padsp ioctl type mismatch, and use esd record mode
  by default.

We thought you might be interested in doing the same.
diff -u xoscope-2.0/debian/control xoscope-2.0/debian/control
--- xoscope-2.0/debian/control
+++ xoscope-2.0/debian/control
@@ -2,14 +2,14 @@
 Section: x11
 Priority: optional
 Maintainer: Bhavani Shankar right2bh...@gmail.com
-Build-Depends: cdbs, debhelper (= 5), autotools-dev, libgtk2.0-dev, quilt, 
libcomedi-dev
+Build-Depends: cdbs, debhelper (= 5), autotools-dev, libgtk2.0-dev, quilt, 
libcomedi-dev, libesd0-dev
 Standards-Version: 3.8.3
 DM-Upload-Allowed: yes
 Homepage: http://xoscope.sourceforge.net/
 
 Package: xoscope
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}, pulseaudio-esound-compat
 Description: digital oscilloscope
  Xoscope is a oscilloscope using input from a 
  sound card or EsounD and/or a ProbeScope/osziFOX and will soon support 
diff -u xoscope-2.0/debian/changelog xoscope-2.0/debian/changelog
--- xoscope-2.0/debian/changelog
+++ xoscope-2.0/debian/changelog
@@ -1,3 +1,12 @@
+xoscope (2.0-3.3) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * debian/patches/99-esd_pa_fixes.patch, debian/control:
+- Fix padsp ioctl type mismatch, and use esd record mode
+  by default. (Closes: #710880)
+
+ -- Artur Rona ari-tc...@ubuntu.com  Mon, 30 Mar 2015 13:40:25 +0200
+
 xoscope (2.0-3.2) unstable; urgency=low
 
   * Non-maintainer upload.
diff -u xoscope-2.0/debian/patches/series xoscope-2.0/debian/patches/series
--- xoscope-2.0/debian/patches/series
+++ xoscope-2.0/debian/patches/series
@@ -3,0 +4 @@
+99-esd_pa_fixes.patch
only in patch2:
unchanged:
--- xoscope-2.0.orig/debian/patches/99-esd_pa_fixes.patch
+++ xoscope-2.0/debian/patches/99-esd_pa_fixes.patch
@@ -0,0 +1,22 @@
+=== modified file 'sc_linux.c'
+--- x/sc_linux.c   2009-08-12 13:20:43 +
 x/sc_linux.c   2011-11-08 23:36:06 +
+@@ -39,7 +39,7 @@
+ 
+ #ifdef HAVE_LIBESD
+ static int esdblock = 0;  /* 1 to block ESD; 0 to non-block */
+-static int esdrecord = 0; /* 1 to use ESD record mode; 0 to use ESD 
monitor mode */
++static int esdrecord = 1; /* 1 to use ESD record mode; 0 to use ESD 
monitor mode */
+ #endif
+ 
+ static int sc_chans = 0;
+@@ -87,7 +87,7 @@
+ 
+ /* show system error and close sound device if given ioctl status is bad */
+ static void
+-check_status_ioctl(int d, int request, void *argp, int line)
++check_status_ioctl(int d, unsigned int request, void *argp, int line)
+ {
+   if (ioctl(d, request, argp)  0) {
+ snd_errormsg1 = sound ioctl;
+

Bug#781376: oxygen-gtk3: Do not depend on libgtk-3-0

[Artur Rona]

Package: src:oxygen-gtk3
Version: 1.4.1-2
Tags: patch
Usertags: origin-ubuntu ubuntu-patch vivid

In Ubuntu, we've applied the attached patch to achieve the following:

  * debian/rules:
 - Add dh_shlibdeps to not depend on libgtk-3-0.

We thought you might be interested in doing the same.
diff -Nru oxygen-gtk3-1.4.1/debian/rules oxygen-gtk3-1.4.1/debian/rules
--- oxygen-gtk3-1.4.1/debian/rules  2013-07-14 19:57:32.0 +0200
+++ oxygen-gtk3-1.4.1/debian/rules  2015-03-25 10:40:27.0 +0100
@@ -19,3 +19,7 @@
 
 override_dh_builddeb:
dh_builddeb -- -Zxz
+
+override_dh_shlibdeps:
+   dh_shlibdeps -- -xlibgtk-3-0
+

Bug#781362: tcpdump: regression after fix CVE-2015-2153

[Artur Rona]

Package: src:tcpdump
Version: 4.6.2-4
Tags: patch
Usertags: origin-ubuntu ubuntu-patch vivid

In Ubuntu, we've applied the attached patch to achieve the following:

  * debian/patches/60_cve-2015-2153-fix-regression.diff:
- Fix regression due to 60_cve-2015-2153.diff

We thought you might be interested in doing the same.
Description: RPKI to Router Protocol: Fix Segmentation Faults and other problems.
 - Fix/add ND_TCHECK2 tests,
 - Fix a buffer overflow,
 - Remove a debug printf
Origin: upstream, https://github.com/the-tcpdump-group/tcpdump/commit/fb6e5377f392555b8c725f66b8b701f0061a3695

diff -pruN -x '*~' tcpdump-4.6.2.orig/print-rpki-rtr.c tcpdump-4.6.2/print-rpki-rtr.c
--- tcpdump-4.6.2.orig/print-rpki-rtr.c	2015-03-22 12:55:55.349173971 +0100
+++ tcpdump-4.6.2/print-rpki-rtr.c	2015-03-22 12:49:56.987396951 +0100
@@ -178,7 +178,7 @@ rpki_rtr_pdu_print (netdissect_options *
 pdu_header = (rpki_rtr_pdu *)tptr;
 pdu_type = pdu_header-pdu_type;
 pdu_len = EXTRACT_32BITS(pdu_header-length);
-ND_TCHECK2(tptr, pdu_len);
+ND_TCHECK2(*tptr, pdu_len);
 hexdump = FALSE;
 
 ND_PRINT((ndo, %sRPKI-RTRv%u, %s PDU (%u), length: %u,
@@ -255,6 +255,7 @@ rpki_rtr_pdu_print (netdissect_options *
 
 	pdu = (rpki_rtr_pdu_error_report *)tptr;
 	encapsulated_pdu_length = EXTRACT_32BITS(pdu-encapsulated_pdu_length);
+	ND_TCHECK2(*tptr, encapsulated_pdu_length);
 	tlen = pdu_len;
 
 	error_code = EXTRACT_16BITS(pdu-pdu_header.u.error_code);
@@ -287,9 +288,10 @@ rpki_rtr_pdu_print (netdissect_options *
 		tptr += 4;
 		tlen -= 4;
 	}
+	ND_TCHECK2(*tptr, text_length);
 	if (text_length  (text_length = tlen )) {
 		memcpy(buf, tptr, min(sizeof(buf)-1, text_length));
-		buf[text_length] = '\0';
+		buf[min(sizeof(buf) - 1, text_length)] = '\0';
 		ND_PRINT((ndo, %sError text: %s, indent_string(indent+2), buf));
 	}
 	}
@@ -336,13 +338,13 @@ rpki_rtr_print(netdissect_options *ndo,
 	pdu_header = (rpki_rtr_pdu *)tptr;
 pdu_type = pdu_header-pdu_type;
 pdu_len = EXTRACT_32BITS(pdu_header-length);
+	ND_TCHECK2(*tptr, pdu_len);
 
 /* infinite loop check */
 if (!pdu_type || !pdu_len) {
 break;
 }
 
-ND_TCHECK2(*tptr, pdu_len);
 if (tlen  pdu_len) {
 goto trunc;
 }

Bug#780701: jakarta-taglibs-standard: Transition from servlet 2.5 - 3.0

[Artur Rona]

Package: src:jakarta-taglibs-standard
Version: 1.1.2-3
Tags: patch
Usertags: origin-ubuntu ubuntu-patch vivid

In Ubuntu, we've applied the attached patch to achieve the following:

- debian/ant.properties, debian/control, debian/rules:
  + Transition from servlet 2.5 - 3.0.

We thought you might be interested in doing the same.
diff -Nru jakarta-taglibs-standard-1.1.2/debian/ant.properties 
jakarta-taglibs-standard-1.1.2/debian/ant.properties
--- jakarta-taglibs-standard-1.1.2/debian/ant.properties2015-03-15 
02:48:03.0 +0100
+++ jakarta-taglibs-standard-1.1.2/debian/ant.properties2015-03-18 
00:42:26.0 +0100
@@ -2,6 +2,6 @@
 dist.dir=dist
 ant.build.javac.source=1.5
 ant.build.javac.target=1.5
-servlet24.jar=/usr/share/java/servlet-api-2.5.jar
-jsp20.jar=/usr/share/java/jsp-api-2.1.jar
+servlet24.jar=/usr/share/java/servlet-api-3.0.jar
+jsp20.jar=/usr/share/java/jsp-api-2.2.jar
 xalan.jar=/usr/share/java/xalan2.jar
diff -Nru jakarta-taglibs-standard-1.1.2/debian/control 
jakarta-taglibs-standard-1.1.2/debian/control
--- jakarta-taglibs-standard-1.1.2/debian/control   2015-03-14 
23:20:00.0 +0100
+++ jakarta-taglibs-standard-1.1.2/debian/control   2015-03-18 
00:43:22.0 +0100
@@ -10,7 +10,7 @@
  debhelper (= 7.0.50~),
  javahelper,
  maven-repo-helper (= 1.5~)
-Build-Depends-Indep: default-jdk, libservlet2.5-java, libxalan2-java
+Build-Depends-Indep: default-jdk, libservlet3.0-java, libxalan2-java
 Standards-Version: 3.9.3
 DM-Upload-Allowed: yes
 Vcs-Git: git://git.debian.org/git/pkg-java/jakarta-taglibs-standard.git
diff -Nru jakarta-taglibs-standard-1.1.2/debian/rules 
jakarta-taglibs-standard-1.1.2/debian/rules
--- jakarta-taglibs-standard-1.1.2/debian/rules 2015-03-14 23:20:00.0 
+0100
+++ jakarta-taglibs-standard-1.1.2/debian/rules 2015-03-18 00:42:26.0 
+0100
@@ -1,7 +1,7 @@
 #!/usr/bin/make -f
 
 export JAVA_HOME=/usr/lib/jvm/default-java
-export CLASSPATH=/usr/share/java/el-api-2.1.jar
+export CLASSPATH=/usr/share/java/el-api-2.2.jar
 
 DEB_UPSTREAM_VERSION := $(shell dpkg-parsechangelog | sed -rne 's,^Version: 
([^+]+)-.*,\1,p')
 MAVEN_REPO   := http://repo1.maven.org/maven2

Bug#779465: hardinfo: FTBFS on arm64: Your architecture is not supported yet.

[Artur Rona]

Package: hardinfo
Version: 0.5.1-1.4
Tags: patch
Usertags: origin-ubuntu ubuntu-patch vivid

dh_clean
dpkg-buildpackage: warning: debian/rules must be updated to support the 
'build-arch' and 'build-indep' targets (at least 'build-arch' seems to be 
missing)
 debian/rules build
dh_testdir
./configure
ToscoConf (version 0.04) for hardinfo version 0.5.1
Determining system architecture.
Your architecture is not supported yet. Please send the
output of the following commands to lean...@hardinfo.org:

  $ cat /proc/cpuinfo
  $ uname -a
  $ uname -m
make: *** [configure-stamp] Error 1
debian/rules:24: recipe for target 'configure-stamp' failed


In Ubuntu, we've applied the attached patch to achieve the following:

  * debian/patches/aarch64.diff, debian/rules:
 - Build for AArch64, using the ARM configuration. Fixes FTBFS on 
arm64.


We thought you might be interested in doing the same.
diff -u hardinfo-0.5.1/debian/rules hardinfo-0.5.1/debian/rules
--- hardinfo-0.5.1/debian/rules
+++ hardinfo-0.5.1/debian/rules
@@ -22,6 +22,7 @@
 configure: configure-stamp
 configure-stamp:
dh_testdir
+   ln -sf armv4l arch/linux/aarch64
./configure
 
touch configure-stamp
@@ -39,6 +40,7 @@
 clean:
dh_testdir
dh_testroot
+   rm -f arch/linux/aarch64
rm -f build-stamp configure-stamp
 
# Add here commands to clean up after the build process.
only in patch2:
unchanged:
--- hardinfo-0.5.1.orig/debian/patches/aarch64.diff
+++ hardinfo-0.5.1/debian/patches/aarch64.diff
@@ -0,0 +1,14 @@
+Index: b/configure
+===
+--- a/configure
 b/configure
+@@ -66,6 +66,9 @@
+   sparc*)
+   ln -sf linux/sparc arch/this
+   ARCH=ARCH_SPARC ;;
++  aarch64*)
++  ln -sf linux/aarch64 arch/this
++  ARCH=ARCH_AARCH64 ;;
+   armv*)
+   ln -sf linux/armv4l arch/this
+   ARCH=ARCH_ARMV4L ;;

Bug#778936: Please switch to dh-autoreconf to update libtool macros

[Artur Rona]

Package: src:libfm
Version: 1.2.3-1
Tags: patch
Usertags: origin-ubuntu ubuntu-patch vivid

In Ubuntu, we've applied the attached patch to achieve the following:

 * debian/control, debian/rules:
   - Switch to dh-autoreconf to update libtool macros for ppc64el.

Because this is an automake-using package, dh-autoreconf can be viewed
as a superset of dh-autotools-dev, in that it still updates config.*
but also updates libtool and configure.  Please apply this patch, to
make life easier for new ports.

Adding support for dh-autoreconf provides a FTBFS, which can be fixed by 
missing-libs-ftbfs.patch.


We thought you might be interested in doing the same.



diff -Nru libfm-1.2.3/debian/control libfm-1.2.3/debian/control
--- libfm-1.2.3/debian/control  2014-10-18 03:47:40.0 +0200
+++ libfm-1.2.3/debian/control  2015-02-21 23:30:54.0 +0100
@@ -10,7 +10,7 @@
  debhelper (= 9), autotools-dev, gtk-doc-tools, intltool,
  libdbus-glib-1-dev, libglib2.0-dev, libgtk2.0-dev, libexif-dev,
  libmenu-cache-dev (=0.5.0), libtool, pkg-config, valac,
- libglib2.0-doc, libgtk-3-doc
+ libglib2.0-doc, libgtk-3-doc, dh-autoreconf
 Standards-Version: 3.9.6
 Homepage: http://pcmanfm.sourceforge.net/
 Vcs-Browser: http://git.lxde.org/gitweb/?p=debian/libfm.git
diff -Nru libfm-1.2.3/debian/rules libfm-1.2.3/debian/rules
--- libfm-1.2.3/debian/rules2014-10-18 03:47:40.0 +0200
+++ libfm-1.2.3/debian/rules2015-02-21 23:31:16.0 +0100
@@ -5,7 +5,7 @@
 export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 
 %:
-   dh ${@} --parallel
+   dh ${@} --parallel --with autoreconf
 
 override_dh_auto_configure:
dh_auto_configure -- --enable-debug --enable-gtk-doc --enable-udisks 
--disable-silent-rules

Bug#649772: libdoxia-java: FTBFS in a restrictive chroot

[Artur Rona]

Hello,

I'm sending an updated patch from Ubuntu as the last change was made by 
Mathieu on 11 Apr 2014.
diff -Nru doxia-1.1.4/debian/changelog doxia-1.1.4/debian/changelog
--- doxia-1.1.4/debian/changelog2012-06-07 07:15:36.0 +0200
+++ doxia-1.1.4/debian/changelog2015-02-21 19:59:14.0 +0100
@@ -1,3 +1,21 @@
+doxia (1.1.4-2ubuntu1) vivid; urgency=low
+
+  * Merge from Debian unstable. (LP: #1087922)  Remaining changes:
+- debian/control:
+  + Build-Depends on libjaxen-java and libmaven-install-plugin-java.
+- debian/maven.properties:
+  + Set maven to offline mode to avoid trying to download
+file from the web, which would fail the build.
+- debian/patches/0008-doxia-logging-deps.patch:
+  + Slightly adjust java package dependencies in doxia-modules
+and doxia-book pom files to include doxia-logging-api.
+- debian/rules:
+  + Import the jar files we just build back into the temporary
+maven repository so they're accessible as we try
+to build docs. (Closes: #649772)
+
+ -- Artur Rona ari-tc...@ubuntu.com  Sat, 21 Feb 2015 19:29:29 +0100
+
 doxia (1.1.4-2) unstable; urgency=low
 
   * Team upload.
@@ -9,6 +27,38 @@
 
  -- Miguel Landaeta mig...@miguel.cc  Wed, 06 Jun 2012 19:30:32 -0430
 
+doxia (1.1.4-1ubuntu4) trusty; urgency=medium
+
+  * debian/rules: make sure we run in offline mode in the install:install-file
+step too by forcing maven in offline mode and specifying the local
+repository path in relation to the debian dir. (LP: #935070)
+
+ -- Mathieu Trudel-Lapierre mathieu...@ubuntu.com  Fri, 11 Apr 2014 22:50:59 
-0400
+
+doxia (1.1.4-1ubuntu3) precise; urgency=low
+
+  * debian/patches/0008-doxia-logging-deps.patch: slightly adjust java package
+dependencies in doxia-modules and doxia-book pom files to include
+doxia-logging-api.
+  * debian/rules: import the jar files we just build back into the temporary
+maven repository so they're accessible as we try to build docs.
+  * debian/control: add a Build-Depends on libmaven-install-plugin-java.
+
+ -- Mathieu Trudel-Lapierre mathieu...@ubuntu.com  Wed, 23 Nov 2011 11:44:25 
-0500
+
+doxia (1.1.4-1ubuntu2) precise; urgency=low
+
+  * debian/maven.properties: set maven to offline mode to avoid trying to
+download file from the web, which would fail the build.
+
+ -- Mathieu Trudel-Lapierre mathieu...@ubuntu.com  Tue, 22 Nov 2011 15:00:40 
-0500
+
+doxia (1.1.4-1ubuntu1) precise; urgency=low
+
+  * debian/control: add Build-Depends for libjaxen-java.
+
+ -- Mathieu Trudel-Lapierre mathieu...@ubuntu.com  Mon, 21 Nov 2011 10:28:04 
-0500
+
 doxia (1.1.4-1) unstable; urgency=low
 
   [Gabriele Giacone]
diff -Nru doxia-1.1.4/debian/control doxia-1.1.4/debian/control
--- doxia-1.1.4/debian/control  2012-06-06 22:57:26.0 +0200
+++ doxia-1.1.4/debian/control  2015-02-21 19:29:42.0 +0100
@@ -1,7 +1,8 @@
 Source: doxia
 Section: java
 Priority: optional
-Maintainer: Debian Java Maintainers 
pkg-java-maintain...@lists.alioth.debian.org
+Maintainer: Ubuntu Developers ubuntu-devel-disc...@lists.ubuntu.com
+XSBC-Original-Maintainer: Debian Java Maintainers 
pkg-java-maintain...@lists.alioth.debian.org
 Uploaders: Torsten Werner twer...@debian.org
 Build-Depends: debhelper (= 7), cdbs, default-jdk, maven-debian-helper (= 
1.4)
 Build-Depends-Indep: libclirr-maven-plugin-java, libmaven-plugin-tools-java, 
libmaven-shade-plugin-java,  
@@ -11,7 +12,7 @@
  libplexus-i18n-java, libplexus-utils-java, libxerces2-java, junit, 
libxerces2-java,  
  default-jdk-doc, libcommons-configuration-java-doc, liblog4j1.2-java-doc,  
  libmaven2-core-java-doc, libplexus-containers-java-doc, 
libplexus-utils-java-doc,  
- libmaven-javadoc-plugin-java 
+ libmaven-javadoc-plugin-java, libjaxen-java, libmaven-install-plugin-java
 Standards-Version: 3.9.3
 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/doxia
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/doxia
diff -Nru doxia-1.1.4/debian/maven.properties 
doxia-1.1.4/debian/maven.properties
--- doxia-1.1.4/debian/maven.properties 2011-09-10 00:28:03.0 +0200
+++ doxia-1.1.4/debian/maven.properties 2014-04-12 06:09:55.0 +0200
@@ -2,4 +2,5 @@
 # For example:
 
 maven.test.skip=true
+maven.settings.offline=true
 
diff -Nru doxia-1.1.4/debian/patches/0008-doxia-logging-deps.patch 
doxia-1.1.4/debian/patches/0008-doxia-logging-deps.patch
--- doxia-1.1.4/debian/patches/0008-doxia-logging-deps.patch1970-01-01 
01:00:00.0 +0100
+++ doxia-1.1.4/debian/patches/0008-doxia-logging-deps.patch2014-04-11 
21:37:06.0 +0200
@@ -0,0 +1,38 @@
+From: Mathieu Trudel-Lapierre mathieu.trudel-lapie...@canonical.com
+Subject: Add doxia-logging-api to dependencies for doxia-modules and doxia-book
+Last-Update: 2011-11-23
+
+It appears to be required at least for building documentation, otherwise the
+build fails as it tries to resolve org.apache.maven.doxia.logging.LogEnabled

Bug#778859: tix: Multiarch support

[Artur Rona]

Package: tix
Version: 8.4.3-6
Tags: patch
Usertags: origin-ubuntu ubuntu-patch vivid

In Ubuntu, we've applied the attached patch to achieve the following:

- debian/rules:
  + Fix build failure with Tcl/Tk multiarch locations.
  + Use dpkg-buildflags.

We thought you might be interested in doing the same.
diff -Nru tix-8.4.3/debian/rules tix-8.4.3/debian/rules
--- tix-8.4.3/debian/rules  2014-11-11 12:20:49.0 +0100
+++ tix-8.4.3/debian/rules  2015-02-20 18:44:32.0 +0100
@@ -18,14 +18,12 @@
 
 SHELL=/bin/bash
 
-CFLAGS = -Wall -g 
-
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) 
-CFLAGS += -O0 
-else 
-CFLAGS += -O2 
-endif 
+CFLAGS := -Wall $(shell dpkg-buildflags --get CFLAGS)
+CPPFLAGS := $(shell dpkg-buildflags --get CPPFLAGS)
+LDFLAGS := $(shell dpkg-buildflags --get LDFLAGS)
 
+DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
+ 
 groff_version=`groff -v| grep groff version| sed -e 's/GNU groff version //'`
 tk_version = 8.6
 tix_version = 8.4.3
@@ -45,12 +43,13 @@
rm -rf build-static
mkdir build-static
cd build-static  ../configure \
+   CPPFLAGS=$(CPPFLAGS) CFLAGS=$(CFLAGS) LDFLAGS=$(LDFLAGS) \
--prefix=/usr \
--mandir=\$${prefix}/share/man \
--disable-shared \
-   --with-tclconfig=/usr/lib/tcl$(tk_version) \
+   --with-tclconfig=/usr/lib/$(DEB_HOST_MULTIARCH)/tcl$(tk_version) \
--with-tclinclude=/usr/include/tcl$(tk_version)/tcl-private \
-   --with-tkconfig=/usr/lib/tk$(tk_version) \
+   --with-tkconfig=/usr/lib/$(DEB_HOST_MULTIARCH)/tk$(tk_version) \
--with-tkinclude=/usr/include/tcl$(tk_version)/tk-private
 
$(MAKE) -C build-static
@@ -63,12 +62,13 @@
rm -rf build-shared
mkdir build-shared
cd build-shared  ../configure \
+   CPPFLAGS=$(CPPFLAGS) CFLAGS=$(CFLAGS) LDFLAGS=$(LDFLAGS) \
--prefix=/usr \
--mandir=\$${prefix}/share/man \
--enable-shared \
-   --with-tclconfig=/usr/lib/tcl$(tk_version) \
+   --with-tclconfig=/usr/lib/$(DEB_HOST_MULTIARCH)/tcl$(tk_version) \
--with-tclinclude=/usr/include/tcl$(tk_version)/tcl-private \
-   --with-tkconfig=/usr/lib/tk$(tk_version) \
+   --with-tkconfig=/usr/lib/$(DEB_HOST_MULTIARCH)/tk$(tk_version) \
--with-tkinclude=/usr/include/tcl$(tk_version)/tk-private
 
$(MAKE) -C build-shared \

Bug#778716: webkit2pdf: FTBFS on arm64 / Please use dh_autotools-dev to update config.{sub,guess} for new ports

[Artur Rona]

Package: webkit2pdf
Version: 0.3-1
Tags: patch
Usertags: origin-ubuntu ubuntu-patch vivid

/* confdefs.h */
#define PACKAGE_NAME 
#define PACKAGE_TARNAME 
#define PACKAGE_VERSION 
#define PACKAGE_STRING 
#define PACKAGE_BUGREPORT 
#define PACKAGE_URL 
#define PLUGINVERSION 0.3

configure: exit 1
debian/rules:12: recipe for target 'override_dh_auto_configure' failed
make[1]: *** [override_dh_auto_configure] Error 255
make[1]: Leaving directory '/«PKGBUILDDIR»'
make: *** [build-arch] Error 2
debian/rules:9: recipe for target 'build-arch' failed



In Ubuntu, we've applied the attached patch to achieve the following:

- debian/control, debian/rules:
  + Use dh_autotools-dev to update config.{sub,guess} for new ports.

We thought you might be interested in doing the same.
diff -Nru webkit2pdf-0.3/debian/rules webkit2pdf-0.3/debian/rules
--- webkit2pdf-0.3/debian/rules 2014-06-30 21:44:17.0 +0200
+++ webkit2pdf-0.3/debian/rules 2014-07-01 06:13:06.0 +0200
@@ -6,7 +6,7 @@
 MAN=debian/webkit2pdf
 
 %:
-   dh $@ 
+   dh $@ --with autotools_dev
 
 override_dh_auto_configure:
pod2man -d ${DATE} -r ${REL} -c  ${MAN}.pod ${MAN}.1

Bug#778649: lives: FTBFS: dh_auto_install: make -j6 install DESTDIR=/«PKGBUILDDIR»/debian/tmp AM_UPDATE_INFO_DIR=no returned exit code 2

[Artur Rona]

Package: lives
Version: 2.2.8~ds0-1
Tags: patch
Usertags: origin-ubuntu ubuntu-patch vivid

make[4]: *** [install-recursive] Error 1
Makefile:496: recipe for target 'install-recursive' failed
make[4]: Leaving directory '/«PKGBUILDDIR»/lives-plugins/plugins'
make[3]: *** [install-recursive] Error 1
Makefile:495: recipe for target 'install-recursive' failed
make[3]: Leaving directory '/«PKGBUILDDIR»/lives-plugins'
make[2]: *** [install-recursive] Error 1
Makefile:618: recipe for target 'install-recursive' failed
make[2]: Leaving directory '/«PKGBUILDDIR»'
dh_auto_install: make -j8 install DESTDIR=/«PKGBUILDDIR»/debian/tmp 
AM_UPDATE_INFO_DIR=no returned exit code 2
make[1]: *** [override_dh_auto_install] Error 2
debian/rules:21: recipe for target 'override_dh_auto_install' failed
make[1]: Leaving directory '/«PKGBUILDDIR»'
make: *** [binary-arch] Error 2
debian/rules:15: recipe for target 'binary-arch' failed


In Ubuntu, we've applied the attached patch to achieve the following:

- debian/patches/parallel-build.patch:
  + Fix build system race that broke parallel building.

We thought you might be interested in doing the same.
diff -Nru lives-2.2.8~ds0/debian/patches/parallel-build.patch 
lives-2.2.8~ds0/debian/patches/parallel-build.patch
--- lives-2.2.8~ds0/debian/patches/parallel-build.patch 1970-01-01 
01:00:00.0 +0100
+++ lives-2.2.8~ds0/debian/patches/parallel-build.patch 2014-11-17 
19:25:36.0 +0100
@@ -0,0 +1,17 @@
+Description: Fix build system race that broke parallel building
+Author: Colin Watson cjwat...@ubuntu.com
+Forwarded: no
+Last-Update: 2014-07-16
+
+Index: b/lives-plugins/plugins/effects/compound/Makefile.am
+===
+--- a/lives-plugins/plugins/effects/compound/Makefile.am
 b/lives-plugins/plugins/effects/compound/Makefile.am
+@@ -7,6 +7,7 @@
+ EXTRA_DIST = $(compoundscripts_DATA) data icons
+ 
+ install-data-local:
++  mkdir -p $(DESTDIR)$(compoundscriptsdir)
+   cp -rf icons/ $(DESTDIR)$(compoundscriptsdir)
+   $(MAKE) -i install-data-local-remove-vcs-files
+ 
diff -Nru lives-2.2.8~ds0/debian/patches/series 
lives-2.2.8~ds0/debian/patches/series
--- lives-2.2.8~ds0/debian/patches/series   2015-02-14 12:40:05.0 
+0100
+++ lives-2.2.8~ds0/debian/patches/series   2015-02-17 00:50:30.0 
+0100
@@ -1,3 +1,4 @@
 01-cdda2wav_to_icedax.patch
 02-drop_py3_multiencoder.patch
 03-libav10.patch
+parallel-build.patch

Bug#764500: erlang-jiffy: FTBFS on arm64

[Artur Rona]

In Ubuntu, we've applied the attached patch to achieve the following:

  * debian/patches/arm64-support.patch:
- Add ARM 64 support.

We thought you might be interested in doing the same.
diff -Nru erlang-jiffy-0.8.5+dfsg/debian/patches/arm64-support.patch 
erlang-jiffy-0.8.5+dfsg/debian/patches/arm64-support.patch
--- erlang-jiffy-0.8.5+dfsg/debian/patches/arm64-support.patch  1970-01-01 
01:00:00.0 +0100
+++ erlang-jiffy-0.8.5+dfsg/debian/patches/arm64-support.patch  2015-02-15 
23:59:11.0 +0100
@@ -0,0 +1,18 @@
+From: Artur Rona ari-tc...@ubuntu.com
+Description: Add ARM 64 support. 
+Bug-Debian: http://bugs.debian.org/764500
+Origin: upstream, 
https://github.com/vitaut/double-conversion/commit/86c52dab02836843e9e32793768ec5b9b3401049
+
https://code.google.com/p/double-conversion/source/detail?r=4e24bb31bcc76d6d218f3056b4c24a109d367561
+
+--- erlang-jiffy-0.8.5+dfsg.orig/c_src/double-conversion/utils.h
 erlang-jiffy-0.8.5+dfsg/c_src/double-conversion/utils.h
+@@ -58,7 +58,8 @@
+ defined(__mips__) || defined(__powerpc__) || \
+ defined(__sparc__) || defined(__sparc) || defined(__s390__) || \
+ defined(__SH4__) || defined(__alpha__) || \
+-defined(_MIPS_ARCH_MIPS32R2)
++defined(_MIPS_ARCH_MIPS32R2) || \
++defined(__AARCH64EL__)
+ #define DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS 1
+ #elif defined(_M_IX86) || defined(__i386__) || defined(__i386)
+ #if defined(_WIN32)
diff -Nru erlang-jiffy-0.8.5+dfsg/debian/patches/series 
erlang-jiffy-0.8.5+dfsg/debian/patches/series
--- erlang-jiffy-0.8.5+dfsg/debian/patches/series   2013-10-11 
06:11:54.0 +0200
+++ erlang-jiffy-0.8.5+dfsg/debian/patches/series   2015-02-16 
00:28:58.0 +0100
@@ -2,3 +2,4 @@
 fix_makefile
 remove_git_clean
 change_optimize
+arm64-support.patch

Bug#777721: softhsm: FTBFS on arm64

[Artur Rona]

Package: softhsm
Version: 1.3.7-2
Tags: patch
Usertags: origin-ubuntu ubuntu-patch vivid

#define PACKAGE_TARNAME softhsm
#define PACKAGE_VERSION 1.3.7
#define PACKAGE_STRING SoftHSM 1.3.7
#define PACKAGE_BUGREPORT 
#define PACKAGE_URL 
#define PACKAGE softhsm
#define VERSION 1.3.7

configure: exit 1
dh_auto_configure: ./configure --build=aarch64-linux-gnu --prefix=/usr 
--includedir=${prefix}/include --mandir=${prefix}/share/man 
--infodir=${prefix}/share/info --sysconfdir=/etc --localstatedir=/var 
--libexecdir=${prefix}/lib/softhsm --disable-maintainer-mode 
--disable-dependency-tracking --sysconfdir=/etc/softhsm 
--localstatedir=/var/lib --with-botan=/usr --with-pic --enable-64bit 
LDFLAGS=-Wl,-z,defs -Wl,--as-needed returned exit code 1
make[1]: *** [override_dh_auto_configure] Error 25
debian/rules:22: recipe for target 'override_dh_auto_configure' failed
make[1]: Leaving directory '/«PKGBUILDDIR»'
make: *** [build-arch] Error 2
debian/rules:19: recipe for target 'build-arch' failed


In Ubuntu, we've applied the attached patch to achieve the following:

- debian/patches/remove-64bit-check.diff:
  + Remove the check for -m64, not needed for package builds.
- debian/rules:
  + Don't use unrecognized build flags on aarch64, resolving FTBFS

We thought you might be interested in doing the same.
diff -Nru softhsm-1.3.7/debian/patches/remove-64bit-check.diff 
softhsm-1.3.7/debian/patches/remove-64bit-check.diff
--- softhsm-1.3.7/debian/patches/remove-64bit-check.diff1970-01-01 
01:00:00.0 +0100
+++ softhsm-1.3.7/debian/patches/remove-64bit-check.diff2014-04-03 
13:59:17.0 +0200
@@ -0,0 +1,13 @@
+Index: b/configure.ac
+===
+--- a/configure.ac
 b/configure.ac
+@@ -63,8 +63,6 @@
+ [SOFTLOGLEVEL=3]
+ )
+ 
+-ACX_64BIT
+-
+ # Check for library include arguments
+ ACX_BOTAN
+ ACX_LIBSQLITE3
diff -Nru softhsm-1.3.7/debian/patches/series 
softhsm-1.3.7/debian/patches/series
--- softhsm-1.3.7/debian/patches/series 2014-12-01 17:52:26.0 +0100
+++ softhsm-1.3.7/debian/patches/series 2014-12-01 22:42:19.0 +0100
@@ -1,2 +1,3 @@
 SUPPORT-101.patch
 002_libtool_export_symbols_fix.patch
+remove-64bit-check.diff
diff -Nru softhsm-1.3.7/debian/rules softhsm-1.3.7/debian/rules
--- softhsm-1.3.7/debian/rules  2014-12-01 17:52:26.0 +0100
+++ softhsm-1.3.7/debian/rules  2015-02-11 00:52:59.0 +0100
@@ -6,7 +6,7 @@
 DEB_HOST_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 DEB_HOST_ARCH_BITS ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_BITS)
 
-SKIP_64BIT_ON_CPU=alpha ia64 mips64 mips64el
+SKIP_64BIT_ON_CPU=alpha ia64 mips64 mips64el aarch64
 
 ifeq ($(DEB_HOST_ARCH_BITS),64)
   # -m64 is not recognized on some architectures

Bug#776720: presage: FTBFS: undefined reference to symbol 'floor@@GLIBC_2.0'

[Artur Rona]

Package: presage
Version: 0.9-1
Tags: patch
Usertags: origin-ubuntu ubuntu-patch vivid

libtool: link: gcc -pthread -I/usr/include/gtk-2.0 
-I/usr/lib/i386-linux-gnu/gtk-2.0/include -I/usr/include/gio-unix-2.0/ 
-I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/atk-1.0 
-I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/libpng12 
-I/usr/include/gdk-pixbuf-2.0 -I/usr/include/libpng12 
-I/usr/include/pango-1.0 -I/usr/include/harfbuzz 
-I/usr/include/pango-1.0 -I/usr/include/glib-2.0 
-I/usr/lib/i386-linux-gnu/glib-2.0/include -I/usr/include/freetype2 
-pthread -I/usr/include/glib-2.0 
-I/usr/lib/i386-linux-gnu/glib-2.0/include -pthread 
-I/usr/include/glib-2.0 -I/usr/lib/i386-linux-gnu/glib-2.0/include 
-I../../../src/lib -I./scintilla/include -g -O2 -fstack-protector-strong 
-Wformat -Werror=format-security -Wl,-Bsymbolic-functions -Wl,-z 
-Wl,relro -o .libs/gprompter gprompter-gprompter.o -pthread 
-Wl,--export-dynamic -pthread -L/usr/local/lib -lgmodule-2.0 -lm 
../../../src/lib/.libs/libpresage.so ./.libs/libscintilla.a 
/usr/lib/i386-linux-gnu/libfreetype.so -lgtk-x11-2.0 -lgdk-x11-2.0 -
lpangocairo-1.0 -latk-1.0 -lcairo -lgdk_pixbuf-2.0 -lgio-2.0 
-lpangoft2-1.0 -lpango-1.0 -lgobject-2.0 -lfontconfig -lgthread-2.0 
-lglib-2.0 -lstdc++ -pthread
/usr/bin/ld: ./.libs/libscintilla.a(libscintilla_la-LineMarker.o): 
undefined reference to symbol 'floor@@GLIBC_2.0'
/usr/lib/gcc/i686-linux-gnu/4.9/../../../i386-linux-gnu/libm.so: error 
adding symbols: DSO missing from command line

collect2: error: ld returned 1 exit status

In Ubuntu, we've applied the attached patch to achieve the following:

  * debian/patches/lib_underlinkage.patch:
 - Added missing lib to link, fixing FTBFS.

We thought you might be interested in doing the same.
diff -Nru presage-0.9/debian/patches/lib_underlinkage.patch 
presage-0.9/debian/patches/lib_underlinkage.patch
--- presage-0.9/debian/patches/lib_underlinkage.patch   1970-01-01 
01:00:00.0 +0100
+++ presage-0.9/debian/patches/lib_underlinkage.patch   2015-01-30 
18:46:56.0 +0100
@@ -0,0 +1,33 @@
+Description: Added missing lib to link, fixing FTBFS.
+Author: Daniel T Chen crim...@ubuntu.com
+Last-Update: 2015-01-30
+
+--- presage-0.9.orig/apps/gtk/gprompter/Makefile.am
 presage-0.9/apps/gtk/gprompter/Makefile.am
+@@ -253,10 +253,9 @@ gprompter_SOURCES =   gprompter.c
+ gprompter_CFLAGS =$(GNOME_CFLAGS) $(GTHREAD_CFLAGS) $(GMODULE_CFLAGS) \
+   -I$(top_srcdir)/src/lib \
+   -I$(srcdir)/scintilla/include 
+-gprompter_LDADD = $(GNOME_LIBS) $(GTHREAD_LIBS) $(GMODULE_LIBS) \
+-  -lm \
++gprompter_LDADD = $(GNOME_LIBS) $(GTHREAD_LIBS) \
+   ../../../src/lib/libpresage.la \
+-  libscintilla.la
++  libscintilla.la $(GMODULE_LIBS) -lm
+ if USE_GCC
+ gprompter_LDADD +=-lstdc++
+ endif
+--- presage-0.9.orig/apps/gtk/gprompter/Makefile.in
 presage-0.9/apps/gtk/gprompter/Makefile.in
+@@ -887,9 +887,9 @@ AUTOMAKE_OPTIONS = subdir-objects
+ @BUILD_GTK_PROMPTER_TRUE@ -I$(srcdir)/scintilla/include 
+ 
+ @BUILD_GTK_PROMPTER_TRUE@gprompter_LDADD = $(GNOME_LIBS) \
+-@BUILD_GTK_PROMPTER_TRUE@ $(GTHREAD_LIBS) $(GMODULE_LIBS) -lm \
++@BUILD_GTK_PROMPTER_TRUE@ $(GTHREAD_LIBS) \
+ @BUILD_GTK_PROMPTER_TRUE@ ../../../src/lib/libpresage.la \
+-@BUILD_GTK_PROMPTER_TRUE@ libscintilla.la $(am__append_1)
++@BUILD_GTK_PROMPTER_TRUE@ libscintilla.la $(GMODULE_LIBS) -lm 
$(am__append_1)
+ @BUILD_GTK_PROMPTER_TRUE@@HAVE_HELP2MAN_TRUE@dist_man_MANS = gprompter.1
+ @BUILD_GTK_PROMPTER_TRUE@@HAVE_HELP2MAN_TRUE@DISTCLEANFILES = gprompter.1
+ @BUILD_GTK_PROMPTER_TRUE@desktopdir = $(datadir)/applications
diff -Nru presage-0.9/debian/patches/series presage-0.9/debian/patches/series
--- presage-0.9/debian/patches/series   2014-09-26 17:35:24.0 +0200
+++ presage-0.9/debian/patches/series   2015-01-30 18:48:16.0 +0100
@@ -1 +1,2 @@
 wxpy3.0-compat.patch
+lib_underlinkage.patch

Bug#776287: grok: Fix linking with ld --as-needed by moving the libraries from LDFLAGS to LIBS

[Artur Rona]

Package: grok
Version: 1.20110708.1-4.1
Tags: patch
Usertags: origin-ubuntu ubuntu-patch utopic

In Ubuntu, we've applied the attached patch to achieve the following:

  * debian/patches/ld-as-needed.diff:
 - Fix linking with ld --as-needed by  moving the libraries from 
LDFLAGS to LIBS.


We thought you might be interested in doing the same.


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

Bug#776292: ffrenzy: FTBFS with -Werror

[Artur Rona]

Package: ffrenzy
Version: 1.0.2~svn20070530-5
Tags: patch
Usertags: origin-ubuntu ubuntu-patch vivid

In Ubuntu, we've applied the attached patch to achieve the following:

  * debian/patches/fix-werror-usage-and-aclocal-regen.patch:
 - Do not pass Werror by default to avoid build failures.
 - Fix the aclocal flags to not include.

We thought you might be interested in doing the same.
diff -Nru ffrenzy-1.0.2~svn20070530/debian/patches/fix-werror-usage-and-aclocal-regen.patch ffrenzy-1.0.2~svn20070530/debian/patches/fix-werror-usage-and-aclocal-regen.patch
--- ffrenzy-1.0.2~svn20070530/debian/patches/fix-werror-usage-and-aclocal-regen.patch	1970-01-01 01:00:00.0 +0100
+++ ffrenzy-1.0.2~svn20070530/debian/patches/fix-werror-usage-and-aclocal-regen.patch	2015-01-24 23:55:42.0 +0100
@@ -0,0 +1,44 @@
+Description: Do not pass Werror by default to avoid build failures.
+ In addition to fixing the Werror usage, fix the aclocal flags to not include.
+Author: Ben Collins bcoll...@ubuntu.com 
+
+--- ffrenzy-1.0.2~svn20070530.orig/Makefile.am
 ffrenzy-1.0.2~svn20070530/Makefile.am
+@@ -1,5 +1,3 @@
+ SUBDIRS = src po tests data utils
+ 
+-ACLOCAL_AMFLAGS = -I m4
+-
+ EXTRA_DIST = config.rpath
+--- ffrenzy-1.0.2~svn20070530.orig/configure
 ffrenzy-1.0.2~svn20070530/configure
+@@ -4347,7 +4347,7 @@ $as_echo $am_cv_python_pyexecdir 6;
+ 
+ 
+ # setting CFLAGS
+-CFLAGS=$CLAGS -Wall -Werror -g -O2 -finline-functions
++CFLAGS=$CLAGS -Wall -g -O2 -finline-functions
+ 
+ # gettext stuff
+ 
+--- ffrenzy-1.0.2~svn20070530.orig/Makefile.in
 ffrenzy-1.0.2~svn20070530/Makefile.in
+@@ -198,7 +198,6 @@ target_cpu = @target_cpu@
+ target_os = @target_os@
+ target_vendor = @target_vendor@
+ SUBDIRS = src po tests data utils
+-ACLOCAL_AMFLAGS = -I m4
+ EXTRA_DIST = config.rpath
+ all: config.h
+ 	$(MAKE) $(AM_MAKEFLAGS) all-recursive
+--- ffrenzy-1.0.2~svn20070530.orig/configure.ac
 ffrenzy-1.0.2~svn20070530/configure.ac
+@@ -20,7 +20,7 @@ AC_CHECK_HEADERS
+ AM_PATH_PYTHON(2.3)
+ 
+ # setting CFLAGS
+-CFLAGS=$CLAGS -Wall -Werror -g -O2 -finline-functions
++CFLAGS=$CLAGS -Wall -g -O2 -finline-functions
+ 
+ # gettext stuff
+ AM_GNU_GETTEXT_VERSION(0.16.1)
diff -Nru ffrenzy-1.0.2~svn20070530/debian/patches/series ffrenzy-1.0.2~svn20070530/debian/patches/series
--- ffrenzy-1.0.2~svn20070530/debian/patches/series	2013-08-03 02:24:22.0 +0200
+++ ffrenzy-1.0.2~svn20070530/debian/patches/series	2015-01-24 12:45:15.0 +0100
@@ -1,2 +1,3 @@
 fix-ffrenzy-menu-path.patch
 fix-libm-underlinkage.patch
+fix-werror-usage-and-aclocal-regen.patch

Bug#776287: Acknowledgement (grok: Fix linking with ld --as-needed by moving the libraries from LDFLAGS to LIBS)

[Artur Rona]

diff -Nru grok-1.20110708.1/debian/patches/ld-as-needed.diff 
grok-1.20110708.1/debian/patches/ld-as-needed.diff
--- grok-1.20110708.1/debian/patches/ld-as-needed.diff  1970-01-01 
01:00:00.0 +0100
+++ grok-1.20110708.1/debian/patches/ld-as-needed.diff  2015-01-26 
11:34:34.0 +0100
@@ -0,0 +1,59 @@
+Description: Fix linking with ld --as-needed by moving the libraries from 
LDFLAGS to LIBS.
+Bug-Debian: http://bugs.debian.org/776287
+Author: Michael Bienia ge...@ubuntu.com,
+Logan Rosen lo...@ubuntu.com
+Last-Update: 2015-01-26
+
+--- a/Makefile
 b/Makefile
+@@ -28,17 +28,17 @@
+ # For linux, we need libdl for dlopen()
+ # On FreeBSD, comment this line out.
+ ifeq ($(PLATFORM), GNULinux)
+-LDFLAGS+=-ldl
++LIBS+=-ldl
+ endif
+ 
+ # For GNU/kFreeBSD, we also need libdl
+ ifeq ($(PLATFORM), GNUkFreeBSD)
+-LDFLAGS+=-ldl
++LIBS+=-ldl
+ endif
+ 
+ # For GNU/Hurd, we need libdl for dlopen()
+ ifeq ($(PLATFORM), GNU)
+-LDFLAGS+=-ldl
++LIBS+=-ldl
+ endif
+ 
+ # #
+@@ -52,7 +52,7 @@
+ #LDFLAGS+=-g
+ 
+ CFLAGS+=-pipe -fPIC -I. -O2
+-LDFLAGS+=-lpcre -levent -rdynamic -ltokyocabinet
++LIBS+=-lpcre -levent -rdynamic -ltokyocabinet
+ 
+ LIBSUFFIX=$(shell sh $(BASE)/platform.sh libsuffix)
+ VERLIBSUFFIX=$(shell sh $(BASE)/platform.sh libsuffix $(MAJOR))
+@@ -170,16 +170,16 @@
+   #$(MAKE) -C test test
+ 
+ # Binary creation
+-grok: LDFLAGS+=-levent
++grok: LIBS+=-levent
+ grok: $(GROKOBJ) conf.tab.o conf.yy.o main.o grok_config.o
+-  $(CC) $(LDFLAGS) $^ -o $@
++  $(CC) $(LDFLAGS) $^ -o $@ $(LIBS)
+ 
+ discogrok: $(GROKOBJ) discover_main.o
+-  $(CC) $(LDFLAGS) $^ -o $@
++  $(CC) $(LDFLAGS) $^ -o $@ $(LIBS)
+ 
+ libgrok.$(LIBSUFFIX): 
+ libgrok.$(LIBSUFFIX): $(GROKOBJ) 
+-  $(CC) $(LDFLAGS) -fPIC $(DYNLIBFLAG) $(LIBNAMEFLAG) $^ -o $@
++  $(CC) $(LDFLAGS) -fPIC $(DYNLIBFLAG) $(LIBNAMEFLAG) $^ -o $@ $(LIBS)
+ 
+ libgrok.$(VERLIBSUFFIX): libgrok.$(LIBSUFFIX);
+   ln -s $ $@
diff -Nru grok-1.20110708.1/debian/patches/series 
grok-1.20110708.1/debian/patches/series
--- grok-1.20110708.1/debian/patches/series 2015-01-16 23:04:43.0 
+0100
+++ grok-1.20110708.1/debian/patches/series 2015-01-26 10:57:27.0 
+0100
@@ -2,3 +2,4 @@
 0001-Support-GNU-kFreeBSD-add-necessary-linker-flag.patch
 0002-Support-GNU-Hurd-add-necessary-linker-flag.patch
 pcre-group-name.patch
+ld-as-needed.diff

Bug#758710: failed arm64 build of sigscheme 0.8.5-4.1

[Artur Rona]

In Ubuntu, we've applied the attached patch to achieve the following:

  * debian/libgcroots0.symbols, debian/patches/aarch64.diff:
- Add AArch64 support.

We thought you might be interested in doing the same.
diff -Nru sigscheme-0.8.5/debian/libgcroots0.symbols 
sigscheme-0.8.5/debian/libgcroots0.symbols
--- sigscheme-0.8.5/debian/libgcroots0.symbols  2014-04-16 14:42:14.0 
+0200
+++ sigscheme-0.8.5/debian/libgcroots0.symbols  2015-01-26 18:05:31.0 
+0100
@@ -5,7 +5,7 @@
  GCROOTS_init@Base 0.8.5
  GCROOTS_is_protected@Base 0.8.5
  GCROOTS_is_protected_context@Base 0.8.5
- (arch=!mips !mipsel !mipsn32 !mipsn32el !mips64 !mips64el !s390 
!s390x)GCROOTS_jmp_buf@Base 0.8.5
+ (arch=!mips !mipsel !mipsn32 !mipsn32el !mips64 !mips64el !s390 !s390x 
!arm64)GCROOTS_jmp_buf@Base 0.8.5
  GCROOTS_mark@Base 0.8.5
  GCROOTS_noop1@Base 0.8.5
  GCROOTS_push_current_stack@Base 0.8.5
diff -Nru sigscheme-0.8.5/debian/patches/aarch64.diff 
sigscheme-0.8.5/debian/patches/aarch64.diff
--- sigscheme-0.8.5/debian/patches/aarch64.diff 1970-01-01 01:00:00.0 
+0100
+++ sigscheme-0.8.5/debian/patches/aarch64.diff 2015-01-26 18:11:42.0 
+0100
@@ -0,0 +1,76 @@
+From: Matthias Klose d...@ubuntu.com
+Description: Added AARCH64 support to gcconfig.h (libgcroots). It needs to get 
symbols file updated, as well.
+Bug: https://groups.google.com/forum/#!topic/uim-en/fxixLmHXcq0
+Bug-Debian: http://bugs.debian.org/758710
+Origin: upstream, 
https://github.com/ctyler/libgcroots/commit/da6e6884a1119e2cf6be88b4cf5eb9091c52beeb
+
+Index: b/libgcroots/include/private/gcconfig.h
+===
+--- a/libgcroots/include/private/gcconfig.h
 b/libgcroots/include/private/gcconfig.h
+@@ -62,6 +62,13 @@
+ # endif
+ 
+ /* Determine the machine type: */
++# if defined(__aarch64__)
++#define AARCH64
++#if !defined(LINUX)
++#  define NOSYS
++#  define mach_type_known
++#endif
++# endif
+ # if defined(__arm__) || defined(__thumb__)
+ #define ARM32
+ #if !defined(LINUX)  !defined(NETBSD)
+@@ -231,6 +238,10 @@
+ #define IA64
+ #define mach_type_known
+ # endif
++# if defined(LINUX)  defined(__aarch64__)
++#define AARCH64
++#define mach_type_known
++# endif
+ # if defined(LINUX)  defined(__arm__)
+ #define ARM32
+ #define mach_type_known
+@@ -504,6 +515,7 @@
+   /*  running Amdahl UTS4 */
+ /* S390   == 390-like machine  */
+   /*  running LINUX   */
++  /* AARCH64== ARM AArch64   */
+   /* ARM32  == Intel StrongARM   */
+   /* IA64   == Intel IPF */
+   /*(e.g. Itanium)*/
+@@ -1724,6 +1736,32 @@
+ #   endif
+ # endif
+ 
++# ifdef AARCH64
++#   define CPP_WORDSZ 64
++#   define MACH_TYPE AARCH64
++#   define ALIGNMENT 8
++#   ifndef HBLKSIZE
++# define HBLKSIZE 4096
++#   endif
++#   ifdef LINUX
++# define OS_TYPE LINUX
++# define LINUX_STACKBOTTOM
++# define USE_GENERIC_PUSH_REGS
++# define DYNAMIC_LOADING
++  extern int __data_start[];
++# define DATASTART ((ptr_t)__data_start)
++  extern char _end[];
++# define DATAEND ((ptr_t)(_end))
++#   endif
++#   ifdef NOSYS
++  /* __data_start is usually defined in the target linker script.   */
++  extern int __data_start[];
++# define DATASTART ((ptr_t)__data_start)
++  extern void *__stack_base__;
++# define STACKBOTTOM ((ptr_t)__stack_base__)
++#   endif
++# endif
++
+ # ifdef ARM32
+ #   define CPP_WORDSZ 32
+ #   define MACH_TYPE ARM32
diff -Nru sigscheme-0.8.5/debian/patches/series 
sigscheme-0.8.5/debian/patches/series
--- sigscheme-0.8.5/debian/patches/series   2014-04-16 14:36:19.0 
+0200
+++ sigscheme-0.8.5/debian/patches/series   2015-01-26 18:03:57.0 
+0100
@@ -7,3 +7,4 @@
 test-gc-protect-0.8.5
 add-ac-config-macro-dir-m4-0.8.5
 support-automake-test-log-driver-0.8.5
+aarch64.diff

Bug#727878: gnuspool: run dh-autoreconf to update config.{sub,guess} and {libtool,aclocal}.m4

[Artur Rona]

In Ubuntu, we've applied the attached patch to achieve the following:

  * debian/rules:
- Use autotools-dev for arm64.

We thought you might be interested in doing the same.
diff -Nru gnuspool-1.7+nmu1/debian/rules gnuspool-1.7+nmu1ubuntu1/debian/rules
--- gnuspool-1.7+nmu1/debian/rules	2010-07-22 08:03:47.0 +0200
+++ gnuspool-1.7+nmu1ubuntu1/debian/rules	2015-01-24 22:33:35.0 +0100
@@ -15,7 +15,7 @@
 endif
 
 %:
-	dh  $@
+	dh  $@  --with autotools-dev
 
 override_dh_auto_configure:
 	mailer=/usr/bin/mail ./configure $(CROSS) --prefix=/usr --sysconfdir=/etc/gnuspool --with-printers-directory=/etc/gnuspool/ptrconf \

Bug#742718: udev

[Artur Rona]

tags 742718 + patch
thanks

In Ubuntu, we've applied the attached patch to achieve the following:

  * Makefile.am, Makefile.in: Install udev rules into /lib/udev/rules.d
  * debian/libdjconsole-data.install: Take udev rules from 
/lib/udev/rules.d

  * debian/libdjconsole-data.preinst: Remove old rules if not modified
  * debian/control: Add Breaks to ensure right version of udev is used.

We thought you might be interested in doing the same.
diff -pruN 0.1.3-1/debian/control 0.1.3-1ubuntu2/debian/control
--- 0.1.3-1/debian/control	2014-03-23 01:07:47.0 +
+++ 0.1.3-1ubuntu2/debian/control	2014-03-23 01:07:48.0 +
@@ -17,6 +17,7 @@ Description: Hercules DJ Console access
 Package: libdjconsole-data
 Section: libs
 Architecture: all
+Breaks: udev ( 136-1)
 Description: Hercules DJ Console access library - data files
  The DJ Console library is a C++ library that facilitates access to the
  Hercules DJ Console MK I and MK II via libusb. It supports all non-audio
diff -pruN 0.1.3-1/debian/libdjconsole-data.install 0.1.3-1ubuntu2/debian/libdjconsole-data.install
--- 0.1.3-1/debian/libdjconsole-data.install	2014-03-23 01:07:47.0 +
+++ 0.1.3-1ubuntu2/debian/libdjconsole-data.install	2014-03-23 01:07:48.0 +
@@ -1,2 +1,2 @@
 debian/tmp/usr/share/
-debian/tmp/etc/udev/rules.d/
+debian/tmp/lib/udev/rules.d/
diff -pruN 0.1.3-1/debian/libdjconsole-data.preinst 0.1.3-1ubuntu2/debian/libdjconsole-data.preinst
--- 0.1.3-1/debian/libdjconsole-data.preinst	1970-01-01 00:00:00.0 +
+++ 0.1.3-1ubuntu2/debian/libdjconsole-data.preinst	2014-03-23 01:07:48.0 +
@@ -0,0 +1,15 @@
+#!/bin/sh
+
+set -e
+
+if [ $1 = install ] || [ $1 = upgrade ]; then
+	if [ -e /etc/udev/rules.d/45-hpdjconsole.rules ]; then
+		if [ `md5sum \/etc/udev/rules.d/45-hpdjconsole.rules\ | sed -e \s/ .*//\` = \
+		 `dpkg-query -W -f='${Conffiles}' libdjconsole-data | sed -n -e \' /etc/udev/rules.d/45-hpdjconsole.rules's/.* //p\` ]
+		then
+			rm -f /etc/udev/rules.d/45-hpdjconsole.rules
+		fi
+	fi
+fi
+
+#DEBHELPER#
diff -pruN 0.1.3-1/Makefile.am 0.1.3-1ubuntu2/Makefile.am
--- 0.1.3-1/Makefile.am	2008-06-11 05:39:41.0 +
+++ 0.1.3-1ubuntu2/Makefile.am	2014-03-23 01:07:48.0 +
@@ -1,6 +1,6 @@
 AUTOMAKE_OPTIONS = gnu
 pkgconfigdir=$(libdir)/pkgconfig
-rulesdir=$(sysconfdir)/udev/rules.d
+rulesdir=/lib/udev/rules.d
 
 lib_LTLIBRARIES = libdjconsole.la
 
diff -pruN 0.1.3-1/Makefile.in 0.1.3-1ubuntu2/Makefile.in
--- 0.1.3-1/Makefile.in	2008-06-11 05:39:41.0 +
+++ 0.1.3-1ubuntu2/Makefile.in	2014-03-23 01:07:48.0 +
@@ -91,7 +91,7 @@ am__quote = @am__quote@
 install_sh = @install_sh@
 AUTOMAKE_OPTIONS = gnu
 pkgconfigdir = $(libdir)/pkgconfig
-rulesdir = $(sysconfdir)/udev/rules.d
+rulesdir = /lib/udev/rules.d
 
 lib_LTLIBRARIES = libdjconsole.la
 

Bug#775013: mt-st: Pass command-line options to the modprobe call

[Artur Rona]

Package: mt-st
Version: 1.1-6
Tags: patch
Usertags: origin-ubuntu ubuntu-patch vivid

In Ubuntu, we've applied the attached patch to achieve the following:

   * debian/mt-st.modprobe:
  - Pass command-line options to the modprobe call.

We thought you might be interested in doing the same.


diff -Nru mt-st-1.1/debian/changelog mt-st-1.1/debian/changelog
--- mt-st-1.1/debian/changelog	2014-07-19 15:10:36.0 +0200
+++ mt-st-1.1/debian/changelog	2015-01-10 00:58:17.0 +0100
@@ -1,3 +1,11 @@
+mt-st (1.1-6ubuntu1) vivid; urgency=low
+
+  * Merge from Debian unstable.  Remaining changes:
+- debian/mt-st.modprobe:
+  + Pass command-line options to the modprobe call.
+
+ -- Artur Rona ari-tc...@ubuntu.com  Sat, 10 Jan 2015 00:57:28 +0100
+
 mt-st (1.1-6) unstable; urgency=medium
 
   * Adopt package (Closes: #698986)
@@ -14,6 +22,13 @@
 
  -- Iustin Pop ius...@debian.org  Sat, 19 Jul 2014 15:10:05 +0200
 
+mt-st (1.1-5ubuntu1) saucy; urgency=low
+
+  * Merge from Debian unstable. (LP: #1190083) Remaining changes:
+- debian/mt-st.modprobe: Pass command-line options to the modprobe call
+
+ -- Alessandro Losavio alessandro.losa...@yahoo.com  Wed, 12 Jun 2013 00:17:26 +0100
+
 mt-st (1.1-5) unstable; urgency=low
 
   * QA upload.
@@ -27,6 +42,14 @@
 
  -- Ivo De Decker ivo.dedec...@ugent.be  Sat, 01 Jun 2013 22:52:07 +0200
 
+mt-st (1.1-4ubuntu1) karmic; urgency=low
+
+  * Merge from debian unstable (LP: #380353), remaining changes:
+- debian/mt-st.modprobe: Pass command-line options to the modprobe call
+- debian/control: Add Breaks on udev to get correct version
+
+ -- Andres Rodriguez andres...@ubuntu.com  Mon, 25 May 2009 13:57:44 -0500
+
 mt-st (1.1-4) unstable; urgency=low
 
   * Add .conf suffix to modprobe.d snippet. Closes: #518245.
@@ -47,6 +70,21 @@
 
  -- Jan Christoph Nordholz he...@pool.math.tu-berlin.de  Sun, 01 Mar 2009 16:36:22 +0100
 
+mt-st (1.1-2ubuntu2) jaunty; urgency=low
+
+  * Bump build-depend on debhelper again to migrate modprobe conf file to
+correct new path.
+  * debian/mt-st.modprobe: Pass command-line options to the modprobe call
+
+ -- Scott James Remnant sc...@ubuntu.com  Thu, 05 Mar 2009 16:47:08 +
+
+mt-st (1.1-2ubuntu1) jaunty; urgency=low
+
+  * Bump build-depend on debhelper to install udev rules into
+/lib/udev/rules.d, add Breaks on udev to get correct version.
+
+ -- Scott James Remnant sc...@ubuntu.com  Tue, 13 Jan 2009 02:26:02 +
+
 mt-st (1.1-2) unstable; urgency=low
 
   * Update debian/copyright.
@@ -227,3 +265,4 @@
   * New package; closes: #83810.
 
  -- Philippe Troin p...@fifi.org  Sat, 27 Jan 2001 18:30:45 -0800
+
diff -Nru mt-st-1.1/debian/control mt-st-1.1/debian/control
--- mt-st-1.1/debian/control	2014-07-19 15:10:36.0 +0200
+++ mt-st-1.1/debian/control	2015-01-10 00:59:01.0 +0100
@@ -1,7 +1,8 @@
 Source: mt-st
 Section: admin
 Priority: extra
-Maintainer: Iustin Pop ius...@debian.org
+Maintainer: Ubuntu Developers ubuntu-devel-disc...@lists.ubuntu.com
+XSBC-Original-Maintainer: Debian QA Group packa...@qa.debian.org
 Build-Depends: debhelper (= 9)
 Standards-Version: 3.9.5
 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=collab-maint/mt-st.git
diff -Nru mt-st-1.1/debian/mt-st.modprobe mt-st-1.1/debian/mt-st.modprobe
--- mt-st-1.1/debian/mt-st.modprobe	2014-07-19 15:10:36.0 +0200
+++ mt-st-1.1/debian/mt-st.modprobe	2014-07-19 19:23:40.0 +0200
@@ -1 +1 @@
-install st /sbin/modprobe --ignore-install st  /etc/init.d/mt-st modload /dev/null 2/dev/null
+install st /sbin/modprobe --ignore-install st $CMDLINE_OPTS  /etc/init.d/mt-st modload /dev/null 2/dev/null

Bug#742718: Please install udev rules into /lib/udev/rules.d

[Artur Rona]

In Ubuntu, we've applied the attached patch to achieve the following:

   * Makefile.am, Makefile.in: Install udev rules into /lib/udev/rules.d
   * debian/libdjconsole-data.install: Take udev rules from
/lib/udev/rules.d
   * debian/libdjconsole-data.preinst: Remove old rules if not modified
   * debian/control: Add Breaks to ensure right version of udev is used.

We thought you might be interested in doing the same.



diff -pruN 0.1.3-1/debian/control 0.1.3-1ubuntu2/debian/control
--- 0.1.3-1/debian/control	2014-03-23 01:07:47.0 +
+++ 0.1.3-1ubuntu2/debian/control	2014-03-23 01:07:48.0 +
@@ -17,6 +17,7 @@ Description: Hercules DJ Console access
 Package: libdjconsole-data
 Section: libs
 Architecture: all
+Breaks: udev ( 136-1)
 Description: Hercules DJ Console access library - data files
  The DJ Console library is a C++ library that facilitates access to the
  Hercules DJ Console MK I and MK II via libusb. It supports all non-audio
diff -pruN 0.1.3-1/debian/libdjconsole-data.install 0.1.3-1ubuntu2/debian/libdjconsole-data.install
--- 0.1.3-1/debian/libdjconsole-data.install	2014-03-23 01:07:47.0 +
+++ 0.1.3-1ubuntu2/debian/libdjconsole-data.install	2014-03-23 01:07:48.0 +
@@ -1,2 +1,2 @@
 debian/tmp/usr/share/
-debian/tmp/etc/udev/rules.d/
+debian/tmp/lib/udev/rules.d/
diff -pruN 0.1.3-1/debian/libdjconsole-data.preinst 0.1.3-1ubuntu2/debian/libdjconsole-data.preinst
--- 0.1.3-1/debian/libdjconsole-data.preinst	1970-01-01 00:00:00.0 +
+++ 0.1.3-1ubuntu2/debian/libdjconsole-data.preinst	2014-03-23 01:07:48.0 +
@@ -0,0 +1,15 @@
+#!/bin/sh
+
+set -e
+
+if [ $1 = install ] || [ $1 = upgrade ]; then
+	if [ -e /etc/udev/rules.d/45-hpdjconsole.rules ]; then
+		if [ `md5sum \/etc/udev/rules.d/45-hpdjconsole.rules\ | sed -e \s/ .*//\` = \
+		 `dpkg-query -W -f='${Conffiles}' libdjconsole-data | sed -n -e \' /etc/udev/rules.d/45-hpdjconsole.rules's/.* //p\` ]
+		then
+			rm -f /etc/udev/rules.d/45-hpdjconsole.rules
+		fi
+	fi
+fi
+
+#DEBHELPER#
diff -pruN 0.1.3-1/Makefile.am 0.1.3-1ubuntu2/Makefile.am
--- 0.1.3-1/Makefile.am	2008-06-11 05:39:41.0 +
+++ 0.1.3-1ubuntu2/Makefile.am	2014-03-23 01:07:48.0 +
@@ -1,6 +1,6 @@
 AUTOMAKE_OPTIONS = gnu
 pkgconfigdir=$(libdir)/pkgconfig
-rulesdir=$(sysconfdir)/udev/rules.d
+rulesdir=/lib/udev/rules.d
 
 lib_LTLIBRARIES = libdjconsole.la
 
diff -pruN 0.1.3-1/Makefile.in 0.1.3-1ubuntu2/Makefile.in
--- 0.1.3-1/Makefile.in	2008-06-11 05:39:41.0 +
+++ 0.1.3-1ubuntu2/Makefile.in	2014-03-23 01:07:48.0 +
@@ -91,7 +91,7 @@ am__quote = @am__quote@
 install_sh = @install_sh@
 AUTOMAKE_OPTIONS = gnu
 pkgconfigdir = $(libdir)/pkgconfig
-rulesdir = $(sysconfdir)/udev/rules.d
+rulesdir = /lib/udev/rules.d
 
 lib_LTLIBRARIES = libdjconsole.la
 

Bug#728002: (no subject)

[Artur Rona]

tags 728002 patch
thanks

In Ubuntu, we've applied the attached patch to achieve the following:

  * debian/control, debian/rules:
- Build using dh-autoreconf.

We thought you might be interested in doing the same.
diff -Nru wmnut-0.64/debian/control wmnut-0.64/debian/control
--- wmnut-0.64/debian/control	2012-06-01 12:50:45.0 +
+++ wmnut-0.64/debian/control	2013-12-30 10:22:01.0 +
@@ -2,7 +2,7 @@
 Section: x11
 Priority: optional
 Maintainer: Arnaud Quette aque...@debian.org
-Build-Depends: debhelper (= 9), libx11-dev, libxext-dev, libxpm-dev, x11proto-core-dev, libupsclient-dev (= 2.4.0), pkg-config
+Build-Depends: debhelper (= 9), libx11-dev, libxext-dev, libxpm-dev, x11proto-core-dev, libupsclient-dev (= 2.4.0), pkg-config, dh-autoreconf
 Standards-Version: 3.9.3
 Homepage: http://wmnut.mgeops.org/
 
diff -Nru wmnut-0.64/debian/rules wmnut-0.64/debian/rules
--- wmnut-0.64/debian/rules	2012-06-01 13:01:11.0 +
+++ wmnut-0.64/debian/rules	2013-12-30 10:21:51.0 +
@@ -21,15 +21,17 @@
 INSTALL_PROGRAM += -s
 endif
 
-config.status: configure
+configure-stamp:
 	dh_testdir
+	dh_autoreconf
 	./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man
+	touch configure-stamp
 
 build-arch: build
 build-indep: build
 
 build: build-stamp
-build-stamp:  config.status
+build-stamp:  configure-stamp
 	dh_testdir
 	$(MAKE)
 	touch build-stamp
@@ -37,8 +39,9 @@
 clean:
 	dh_testdir
 	dh_testroot
-	rm -f build-stamp 
+	rm -f build-stamp configure-stamp
 	[ ! -f Makefile ] || $(MAKE) distclean
+	dh_autoreconf_clean
 	dh_clean
 
 install: build

Bug#728002: dh-autoreconf

[Artur Rona]

In Ubuntu, we've applied the attached patch to achieve the following:

   * debian/control, debian/rules:
 - Build using dh-autoreconf.

We thought you might be interested in doing the same.



diff -Nru wmnut-0.64/debian/control wmnut-0.64/debian/control
--- wmnut-0.64/debian/control	2012-06-01 12:50:45.0 +
+++ wmnut-0.64/debian/control	2013-12-30 10:22:01.0 +
@@ -2,7 +2,7 @@
 Section: x11
 Priority: optional
 Maintainer: Arnaud Quette aque...@debian.org
-Build-Depends: debhelper (= 9), libx11-dev, libxext-dev, libxpm-dev, x11proto-core-dev, libupsclient-dev (= 2.4.0), pkg-config
+Build-Depends: debhelper (= 9), libx11-dev, libxext-dev, libxpm-dev, x11proto-core-dev, libupsclient-dev (= 2.4.0), pkg-config, dh-autoreconf
 Standards-Version: 3.9.3
 Homepage: http://wmnut.mgeops.org/
 
diff -Nru wmnut-0.64/debian/rules wmnut-0.64/debian/rules
--- wmnut-0.64/debian/rules	2012-06-01 13:01:11.0 +
+++ wmnut-0.64/debian/rules	2013-12-30 10:21:51.0 +
@@ -21,15 +21,17 @@
 INSTALL_PROGRAM += -s
 endif
 
-config.status: configure
+configure-stamp:
 	dh_testdir
+	dh_autoreconf
 	./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man
+	touch configure-stamp
 
 build-arch: build
 build-indep: build
 
 build: build-stamp
-build-stamp:  config.status
+build-stamp:  configure-stamp
 	dh_testdir
 	$(MAKE)
 	touch build-stamp
@@ -37,8 +39,9 @@
 clean:
 	dh_testdir
 	dh_testroot
-	rm -f build-stamp 
+	rm -f build-stamp configure-stamp
 	[ ! -f Makefile ] || $(MAKE) distclean
+	dh_autoreconf_clean
 	dh_clean
 
 install: build

Bug#731785: guile 1.8 transition

[Artur Rona]

tags 651271 patch
thanks

In Ubuntu, we've applied the attached patch to achieve the following:

   * debian/control, debian/patches/guile-1.8-transition.patch:
 - Guile 1.8 transition.

We thought you might be interested in doing the same.



diff -pruN -x '*~' jacal-1b9.orig/debian/control jacal-1b9/debian/control
--- jacal-1b9.orig/debian/control	2014-11-14 00:18:41.0 +0100
+++ jacal-1b9/debian/control	2015-01-08 01:56:39.460761482 +0100
@@ -11,7 +11,7 @@ Vcs-Browser: http://anonscm.debian.org/g
 
 Package: jacal
 Architecture: all
-Depends: ${misc:Depends}, scm | guile-1.6, slib (= 3a5-1)
+Depends: ${misc:Depends}, scm | guile-1.8, slib (= 3a5-1)
 Description: Interactive symbolic math system
  JACAL is an interactive symbolic math system which can manipulate and
  simplify equations, scalars, vectors, and matrices of single and
diff -pruN -x '*~' jacal-1b9.orig/debian/patches/guile-1.8-transition.patch jacal-1b9/debian/patches/guile-1.8-transition.patch
--- jacal-1b9.orig/debian/patches/guile-1.8-transition.patch	1970-01-01 01:00:00.0 +0100
+++ jacal-1b9/debian/patches/guile-1.8-transition.patch	2015-01-08 01:28:58.0 +0100
@@ -0,0 +1,27 @@
+From: Artur Rona ari-tc...@ubuntu.com
+Description: Guile 1.8 transition.
+Author: Dmitrijs Ledkovs dmitrij.led...@ubuntu.com
+Last-Update: 2015-01-08
+
+--- jacal-1b9.orig/jacal.sh
 jacal-1b9/jacal.sh
+@@ -25,7 +25,7 @@ Usage: jacal SCHEME
+ 
+ Usage: jacal
+ 
+-  Run JACAL using (MIT) 'scheme', 'scm', 'gsi', 'mzscheme', 'guile-1.6',
++  Run JACAL using (MIT) 'scheme', 'scm', 'gsi', 'mzscheme', 'guile-1.8',
+   'slib48', 'larceny', 'scmlit', 'elk', 'sisc', or 'kawa'.
+ # in preceding notice, change guile to guile-1.6, by tb.
+ 
+@@ -47,8 +47,8 @@ if [ -z $command ]; then
+ elif type mzscheme/dev/null 21; then
+ 	command=mzscheme; implementation=plt
+ # Changed from looking for 'guile' to 'guile-1.6' by tb.
+-elif type guile-1.6/dev/null 21; then
+-	command=guile-1.6; implementation=gui
++elif type guile-1.8/dev/null 21; then
++	command=guile-1.8; implementation=gui
+ elif type slib48/dev/null 21; then
+ 	echo do 'cd ${JACALDIR}; make jacal48'
+ elif type scheme48/dev/null 21; then
diff -pruN -x '*~' jacal-1b9.orig/debian/patches/series jacal-1b9/debian/patches/series
--- jacal-1b9.orig/debian/patches/series	2014-11-14 00:18:18.0 +0100
+++ jacal-1b9/debian/patches/series	2015-01-08 01:30:49.0 +0100
@@ -2,3 +2,4 @@
 0002-man-tweaks.patch
 0003-guile-version.patch
 0004-update-texinfo.patch
+guile-1.8-transition.patch

Bug#700484: (no subject)

[Artur Rona]

Hello Jose,

I'd like to upload my NMU for amanda. Is it OK for you?


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

Bug#758923: condor: FTBFS with --as-needed

[Artur Rona]

Package: condor
Version: 8.2.1~dfsg.1-1
Tags: patch
Usertags: origin-ubuntu ubuntu-patch utopic

/usr/bin/ld: ../classad/libclassad.a(fnCall.cpp.o): undefined reference to 
symbol 'dlopen@@GLIBC_2.1'
/usr/lib/gcc/i686-linux-gnu/4.8/../../../i386-linux-gnu/libdl.so: error adding 
symbols: DSO missing from command line
collect2: error: ld returned 1 exit status
make[4]: *** [src/condor_shadow.V6.1/condor_shadow] Error 1
make[4]: Leaving directory 
`/build/buildd/condor-8.0.5~dfsg.1/obj-i686-linux-gnu'
make[3]: *** [src/condor_shadow.V6.1/CMakeFiles/condor_shadow.dir/all] Error 2
make[3]: Leaving directory 
`/build/buildd/condor-8.0.5~dfsg.1/obj-i686-linux-gnu'
make[2]: *** [all] Error 2
make[2]: Leaving directory 
`/build/buildd/condor-8.0.5~dfsg.1/obj-i686-linux-gnu'
dh_auto_build: make -j1 VERBOSE=1 returned exit code 2
make[1]: *** [override_dh_auto_build] Error 2
make[1]: Leaving directory `/build/buildd/condor-8.0.5~dfsg.1'
make: *** [binary] Error 2
dpkg-buildpackage: error: /usr/bin/fakeroot debian/rules binary gave error exit 
status 2


In Ubuntu, we've applied the attached patch to achieve the following:

  * debian/patches/as-needed-libs-ftbfs.patch:
 - Add missing lib to link, resolving FTBFS.

We thought you might be interested in doing the same
diff -Nru condor-8.2.1~dfsg.1/debian/patches/as-needed-libs-ftbfs.patch condor-8.2.1~dfsg.1/debian/patches/as-needed-libs-ftbfs.patch
--- condor-8.2.1~dfsg.1/debian/patches/as-needed-libs-ftbfs.patch	1970-01-01 01:00:00.0 +0100
+++ condor-8.2.1~dfsg.1/debian/patches/as-needed-libs-ftbfs.patch	2014-05-30 04:34:36.0 +0200
@@ -0,0 +1,9 @@
+Index: condor-8.0.5~dfsg.1/src/condor_shadow.V6.1/CMakeLists.txt
+===
+--- condor-8.0.5~dfsg.1.orig/src/condor_shadow.V6.1/CMakeLists.txt	2013-12-29 06:24:37.0 -0500
 condor-8.0.5~dfsg.1/src/condor_shadow.V6.1/CMakeLists.txt	2014-01-14 15:53:03.408347075 -0500
+@@ -26,3 +26,4 @@
+ endif(NOT PROPER AND (LINUX OR DARWIN))
+ condor_daemon( shadow ${shadowRmvElements} ${CONDOR_LIBS_FOR_SHADOW} ${C_SBIN} OFF )
+ 
++TARGET_LINK_LIBRARIES(condor_shadow dl)
diff -Nru condor-8.2.1~dfsg.1/debian/patches/series condor-8.2.1~dfsg.1/debian/patches/series
--- condor-8.2.1~dfsg.1/debian/patches/series	2014-07-13 15:02:01.0 +0200
+++ condor-8.2.1~dfsg.1/debian/patches/series	2014-08-19 08:04:32.0 +0200
@@ -10,3 +10,4 @@
 fix_condor_run
 alpha-fix-getpid.patch
 noformat_arg
+as-needed-libs-ftbfs.patch

Bug#726798: (no subject)

[Artur Rona]

Hello Andreas,

could you forward your patch to upstream, please?

Regards


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

Bug#758255: alsa-oss: FTBFS on ppc64el, Please switch to dh-autoreconf to update libtool macros

[Artur Rona]

Package: src:alsa-oss
Version: 1.0.28-1
Tags: patch
Usertags: origin-ubuntu ubuntu-patch utopic

The package fails to build on ppc64el with autotools_dev. Switching to 
autoreconf fixes that problem. Here is buildlog:


make[1]: Leaving directory '/build/buildd/alsa-oss-1.0.28'
   debian/rules override_dh_install
make[1]: Entering directory '/build/buildd/alsa-oss-1.0.28'
find debian/tmp -name '*.la' -delete
find debian/tmp -name '*.a' -delete
dh_install --fail-missing
dh_install: alsa-oss missing files (usr/lib/*/*.so), aborting
debian/rules:11: recipe for target 'override_dh_install' failed
make[1]: *** [override_dh_install] Error 255
make[1]: Leaving directory '/build/buildd/alsa-oss-1.0.28'
debian/rules:3: recipe for target 'binary-arch' failed
make: *** [binary-arch] Error 2
dpkg-buildpackage: error: /usr/bin/fakeroot debian/rules binary-arch 
gave error exit status 2

**
Build finished at 20140815-0318
FAILED [dpkg-buildpackage died]

In Ubuntu, we've applied the attached patch to achieve the following:

* debian/control, debian/rules:
  - Switch to dh-autoreconf to update libtool macros for ppc64el.

Because this is an automake-using package, dh-autoreconf can be viewed
as a superset of dh-autotools-dev, in that it still updates config.*
but also updates libtool and configure.  Please apply this patch, to
make life easier for new ports.

We thought you might be interested in doing the same.


diff -pruN -x '*~' alsa-oss-1.0.28.orig/debian/control alsa-oss-1.0.28/debian/control
--- alsa-oss-1.0.28.orig/debian/control	2014-07-18 21:14:27.0 +0200
+++ alsa-oss-1.0.28/debian/control	2014-08-15 23:10:10.634057577 +0200
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Debian ALSA Maintainers pkg-alsa-de...@lists.alioth.debian.org
 Uploaders: Jordi Mallach jo...@debian.org,
Elimar Riesebieter riese...@lxtec.de
-Build-Depends: autotools-dev, debhelper (= 9), libasound2-dev (= 1.0.15)
+Build-Depends: autotools-dev, debhelper (= 9), libasound2-dev (= 1.0.15), dh-autoreconf
 Standards-Version: 3.9.5
 Homepage: http://www.alsa-project.org/
 Vcs-Svn: svn://anonscm.debian.org/pkg-alsa/trunk/alsa-oss
diff -pruN -x '*~' alsa-oss-1.0.28.orig/debian/rules alsa-oss-1.0.28/debian/rules
--- alsa-oss-1.0.28.orig/debian/rules	2013-10-25 15:17:34.0 +0200
+++ alsa-oss-1.0.28/debian/rules	2014-08-15 09:34:07.516146939 +0200
@@ -1,6 +1,6 @@
 #!/usr/bin/make -f
 %:
-	dh $@ --with autotools_dev
+	dh $@ --with autoreconf
 
 # Install in debian/tmp to retain control through dh_install:
 override_dh_auto_install:

Bug#758261: Please switch to dh-autoreconf to update libtool macros

[Artur Rona]

Package: src:amanda
Version: 1:3.3.6-1
Tags: patch
Usertags: origin-ubuntu ubuntu-patch utopic

In Ubuntu, we've applied the attached patch to achieve the following:

* debian/control, debian/rules:
  - Switch to dh-autoreconf to update libtool macros for ppc64el.

Because this is an automake-using package, dh-autoreconf can be viewed
as a superset of dh-autotools-dev, in that it still updates config.*
but also updates libtool and configure.  Please apply this patch, to
make life easier for new ports.

Adding support for dh-autoreconf provides a FTBFS, which can be fixed by 
missing-libs-ftbfs.patch.


We thought you might be interested in doing the same.


diff -pruN -x '*~' amanda-3.3.6.orig/debian/changelog amanda-3.3.6/debian/changelog
--- amanda-3.3.6.orig/debian/changelog	2014-08-05 16:16:41.0 +0200
+++ amanda-3.3.6/debian/changelog	2014-08-15 23:34:24.045264636 +0200
@@ -1,3 +1,13 @@
+amanda (1:3.3.6-1ubuntu1) utopic; urgency=low
+
+  * Merge from Debian unstable.  Remaining changes:
+- debian/control, debian/rules:
+  + Switch to dh-autoreconf to update libtool macros for ppc64el.
+- debian/patches/missing-libs-ftbfs.patch:
+  + Add missing libs to link.
+
+ -- Artur Rona ari-tc...@ubuntu.com  Fri, 15 Aug 2014 23:34:16 +0200
+
 amanda (1:3.3.6-1) unstable; urgency=low
 
   * QA upload.
@@ -12,6 +22,16 @@ amanda (1:3.3.6-1) unstable; urgency=low
 
  -- Hideki Yamane henr...@debian.org  Wed, 30 Jul 2014 23:20:42 +0900
 
+amanda (1:3.3.3-3ubuntu1) utopic; urgency=medium
+
+  * Reintroduced changes dropped due to sync:
+- debian/control, debian/rules:
+  + Switch to dh-autoreconf to update libtool macros for ppc64el.
+- debian/patches/missing-libs-ftbfs.patch:
+  + Add missing libs to link.
+
+ -- Artur Rona ari-tc...@ubuntu.com  Mon, 30 Jun 2014 00:26:45 +0200
+
 amanda (1:3.3.3-3) unstable; urgency=medium
 
   * QA upload.
diff -pruN -x '*~' amanda-3.3.6.orig/debian/control amanda-3.3.6/debian/control
--- amanda-3.3.6.orig/debian/control	2014-08-05 16:16:41.0 +0200
+++ amanda-3.3.6/debian/control	2014-08-16 00:49:11.971519072 +0200
@@ -2,7 +2,7 @@ Source: amanda
 Section: utils
 Priority: optional
 Maintainer: Debian QA Group packa...@qa.debian.org
-Build-Depends: debhelper (= 5), dump [linux-any], gnuplot, libncurses5-dev, libreadline-dev, libtool, flex, perl, smbclient, bsd-mailx | mailx, lpr, mtx, xfsdump [linux-any], po-debconf, autotools-dev, libglib2.0-dev, procps, curl, libcurl4-openssl-dev, libssl-dev
+Build-Depends: debhelper (= 5), dump [linux-any], gnuplot, libncurses5-dev, libreadline-dev, libtool, flex, perl, smbclient, bsd-mailx | mailx, lpr, mtx, xfsdump [linux-any], po-debconf, autotools-dev, libglib2.0-dev, procps, curl, libcurl4-openssl-dev, libssl-dev, dh-autoreconf
 Standards-Version: 3.9.5
 Vcs-Git: git://anonscm.debian.org/collab-maint/amanda.git
 Vcs-Browser: http://anonscm.debian.org/?p=collab-maint/amanda.git;a=summary
diff -pruN -x '*~' amanda-3.3.6.orig/debian/patches/missing-libs-ftbfs.patch amanda-3.3.6/debian/patches/missing-libs-ftbfs.patch
--- amanda-3.3.6.orig/debian/patches/missing-libs-ftbfs.patch	1970-01-01 01:00:00.0 +0100
+++ amanda-3.3.6/debian/patches/missing-libs-ftbfs.patch	2014-08-16 00:02:44.177695120 +0200
@@ -0,0 +1,56 @@
+From: Artur Rona ari-tc...@ubuntu.com
+Description: Add missing libs to link.
+Author: Daniel T Chen crim...@ubuntu.com
+Last-Update: 2014-08-16
+
+diff -pruN -x '*~' amanda-3.3.6.orig/amar-src/Makefile.am amanda-3.3.6/amar-src/Makefile.am
+--- amanda-3.3.6.orig/amar-src/Makefile.am	2014-07-09 16:21:59.0 +0200
 amanda-3.3.6/amar-src/Makefile.am	2014-08-15 23:59:49.148827283 +0200
+@@ -26,7 +26,8 @@ noinst_HEADERS = \
+ sbin_PROGRAMS = amarchiver
+ 
+ amarchiver_SOURCES = amarchiver.c
+-amarchiver_LDADD = libamar.la
++amarchiver_LDADD = libamar.la \
++	../common-src/libamanda.la
+ 
+ # automake-style tests
+ 
+@@ -35,4 +36,5 @@ noinst_PROGRAMS = $(TESTS)
+ 
+ amar_test_SOURCES = amar-test.c
+ amar_test_LDADD = libamar.la \
+-	../common-src/libtestutils.la
++	../common-src/libtestutils.la \
++	../common-src/libamanda.la
+diff -pruN -x '*~' amanda-3.3.6.orig/ndmp-src/Makefile.am amanda-3.3.6/ndmp-src/Makefile.am
+--- amanda-3.3.6.orig/ndmp-src/Makefile.am	2014-07-09 16:21:55.0 +0200
 amanda-3.3.6/ndmp-src/Makefile.am	2014-08-15 23:57:11.100043499 +0200
+@@ -204,10 +204,12 @@ amndmjob_SOURCES = amndmjob_main.c \
+ 		  amndma_tape_simulator.c
+ 
+ ndmjob_LDADD = libndmjob.la \
+-		   ../common-src/libamanda.la
++		   ../common-src/libamanda.la \
++		   libndmlib.la
+ 
+ amndmjob_LDADD = libndmjob.la \
+-		   ../common-src/libamanda.la
++		   ../common-src/libamanda.la \
++		   libndmlib.la
+ 
+ ndmp0_xdr.c : ndmp0.x
+ 	$(RPCGEN) ndmp0.x
+diff -pruN -x '*~' amanda-3.3.6.orig/xfer-src/Makefile.am amanda-3.3.6/xfer-src/Makefile.am
+--- amanda-3.3.6.orig/xfer-src/Makefile.am	2014-07-09 16:21:56.0 +0200
 amanda-3.3.6/xfer-src/Makefile.am	2014

Bug#750901: Fix lintian warnings

[Artur Rona]

Package: src:lightdm-gtk-greeter
Version: 1.8.5-1
Tags: patch
Usertags: origin-ubuntu ubuntu-patch utopic

In Ubuntu, we've applied the attached patch to achieve the following:
- debian/control:
  + Fix binary-control-field-duplicates-source lintian tag.
- debian/copyright:
  + Fix wiki-copyright-format-uri lintian tag.
  + Fix obsolete-field-in-dep5-copyright lintian tags.
  + Add missing license information.

We thought you might be interested in doing the same
diff -pruN -x '*~' lightdm-gtk-greeter-1.8.5.orig/debian/control lightdm-gtk-greeter-1.8.5/debian/control
--- lightdm-gtk-greeter-1.8.5.orig/debian/control	2014-01-07 23:33:25.0 +0100
+++ lightdm-gtk-greeter-1.8.5/debian/control	2014-06-08 11:12:23.980933915 +0200
@@ -16,7 +16,6 @@ Package: lightdm-gtk-greeter
 Provides: lightdm-greeter
 Replaces: lightdm-gtk, lightdm ( 0.9.2-1)
 Breaks: lightdm-gtk, lightdm ( 0.9.2-1)
-Section: x11
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Recommends: desktop-base, gnome-themes-standard, gnome-icon-theme-symbolic, policykit-1
diff -pruN -x '*~' lightdm-gtk-greeter-1.8.5.orig/debian/copyright lightdm-gtk-greeter-1.8.5/debian/copyright
--- lightdm-gtk-greeter-1.8.5.orig/debian/copyright	2012-01-31 07:51:04.0 +0100
+++ lightdm-gtk-greeter-1.8.5/debian/copyright	2014-05-06 22:39:49.0 +0200
@@ -1,7 +1,5 @@
-Format-Specification:
- http://wiki.debian.org/Proposals/CopyrightFormat?action=recallrev=402
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: lightdm
-Upstream-Maintainer: Robert Ancell
 Upstream-Source: https://launchpad.net/lightdm
 
 Files: debian/*
@@ -116,3 +114,12 @@ License: GPL-3
  Public License version 3 can be found in
  `/usr/share/common-licenses/GPL-3'.
 
+License: GPL-3+
+ On Debian systems, the complete text of the GNU General
+ Public License version 3 can be found in
+ `/usr/share/common-licenses/GPL-3'.
+
+License: LGPL-3+
+ On Debian systems, the complete text of the GNU Lesser
+ General Public License version 3 can be found in
+ `/usr/share/common-licenses/LGPL-3'.

Bug#750955: Replace a duplicate 'backup' util man page with the one, for 'crashreport'.

[Artur Rona]

Package: src:libimobiledevice
Version: 1.1.6+dfsg-1
Tags: patch
Usertags: origin-ubuntu ubuntu-patch utopic

In Ubuntu, we've applied the attached patch to achieve the following:

- debian/libimobiledevice-utils.manpages:
  + Replace a duplicate 'backup' util man page with the one
for 'crashreport'.

We thought you might be interested in doing the same.
diff -Nru libimobiledevice-1.1.5/debian/libimobiledevice-utils.manpages libimobiledevice-1.1.5+git20140313.bafe6a9e/debian/libimobiledevice-utils.manpages
--- libimobiledevice-1.1.5/debian/libimobiledevice-utils.manpages	2013-10-29 18:42:24.0 +0100
+++ libimobiledevice-1.1.5+git20140313.bafe6a9e/debian/libimobiledevice-utils.manpages	2014-03-18 18:24:32.0 +0100
@@ -1,5 +1,6 @@
 docs/idevicebackup.1
 docs/idevicebackup2.1
+docs/idevicecrashreport.1
 docs/idevicedate.1
 docs/idevicedebugserverproxy.1
 docs/idevicediagnostics.1
@@ -7,8 +8,8 @@
 docs/idevice_id.1
 docs/ideviceimagemounter.1
 docs/ideviceinfo.1
+docs/idevicename.1
 docs/idevicepair.1
 docs/ideviceprovision.1
 docs/idevicescreenshot.1
 docs/idevicesyslog.1
-docs/idevicebackup.1

Bug#750059: Port the uses of GtkTable to a GtkGrid, since GtkTable is now deprecated

[Artur Rona]

Package: network-manager-vpnc
Version: 0.9.8.6-2
Tags: patch
Usertags: origin-ubuntu ubuntu-patch utopic

In Ubuntu, we've applied the attached patch to achieve the following:

  * debian/patches/gtk_table_to_gtk_grid.patch:
- Port the uses of GtkTable to a GtkGrid, since GtkTable is now 
deprecated.


We thought you might be interested in doing the same.

--
Pozdrawiam / Kind regards,
Artur Rona

From: Mathieu Trudel-Lapierre mathieu.trudel-lapie...@canonical.com
Subject: Port GtkTable uses to GtkGrid, since the former is now deprecated.

Index: network-manager-vpnc-0.9.2.0+git201201080319.236292c/auth-dialog/vpn-password-dialog.c
===
--- network-manager-vpnc-0.9.2.0+git201201080319.236292c.orig/auth-dialog/vpn-password-dialog.c	2012-02-10 14:41:30.0 -0500
+++ network-manager-vpnc-0.9.2.0+git201201080319.236292c/auth-dialog/vpn-password-dialog.c	2012-02-10 15:10:40.120355818 -0500
@@ -123,8 +123,8 @@
 	label = gtk_label_new_with_mnemonic (label_text);
 	gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
 
-	gtk_table_attach_defaults (GTK_TABLE (table), label, 0, 1, row, row + 1);
-	gtk_table_attach_defaults (GTK_TABLE (table), entry, 1, 2, row, row + 1);
+	gtk_grid_attach (GTK_GRID (table), label, 0, row, 1, 1);
+	gtk_grid_attach (GTK_GRID (table), entry, 1, row, 1, 1);
 
 	gtk_label_set_mnemonic_widget (GTK_LABEL (label), entry);
 }
@@ -153,7 +153,7 @@
 	if (priv-show_password_secondary)
 		add_row (priv-table, row++, priv-secondary_password_label,  priv-password_entry_secondary);
 
-	gtk_table_attach_defaults (GTK_TABLE (priv-table), priv-show_passwords_checkbox, 1, 2, row, row + 1);
+	gtk_grid_attach (GTK_GRID (priv-table), priv-show_passwords_checkbox, 1, row, 1, 1);
 
 	gtk_widget_show_all (priv-table);
 }
@@ -227,9 +227,9 @@
 
 	priv-group = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL);
 
-	priv-table = gtk_table_new (4, 2, FALSE);
-	gtk_table_set_col_spacings (GTK_TABLE (priv-table), 12);
-	gtk_table_set_row_spacings (GTK_TABLE (priv-table), 6);
+	priv-table = gtk_grid_new ();
+	gtk_grid_set_column_spacing (GTK_GRID (priv-table), 12);
+	gtk_grid_set_row_spacing (GTK_GRID (priv-table), 6);
 	gtk_container_add (GTK_CONTAINER (priv-table_alignment), priv-table);
 
 	priv-password_entry = gtk_entry_new ();

Bug#750060: Please switch to dh-autoreconf to update libtool macros

[Artur Rona]

Package: src:network-manager-openconnect
Version: 0.9.8.6-1
Tags: patch
Usertags: origin-ubuntu ubuntu-patch utopic

In Ubuntu, we've applied the attached patch to achieve the following:

   * debian/control, debian/rules:
 - Switch to dh-autoreconf to update libtool macros for ppc64el.

Because this is an automake-using package, dh-autoreconf can be viewed
as a superset of dh-autotools-dev, in that it still updates config.*
but also updates libtool and configure.  Please apply this patch, to
make life easier for new ports.

We thought you might be interested in doing the same.

diff -pruN -x '*~' network-manager-openconnect-0.9.8.6.orig/debian/control network-manager-openconnect-0.9.8.6/debian/control
--- network-manager-openconnect-0.9.8.6.orig/debian/control	2014-04-06 23:40:54.0 +0200
+++ network-manager-openconnect-0.9.8.6/debian/control	2014-06-01 10:19:35.848055702 +0200
@@ -2,7 +2,7 @@ Source: network-manager-openconnect
 Section: net
 Priority: optional
 Maintainer: Mike Miller mtmil...@debian.org
-Build-Depends: autotools-dev,
+Build-Depends: dh-autoreconf,
debhelper (= 7.0.50),
dpkg-dev (= 1.16.1),
intltool,
diff -pruN -x '*~' network-manager-openconnect-0.9.8.6.orig/debian/rules network-manager-openconnect-0.9.8.6/debian/rules
--- network-manager-openconnect-0.9.8.6.orig/debian/rules	2014-04-06 22:35:20.0 +0200
+++ network-manager-openconnect-0.9.8.6/debian/rules	2014-06-01 10:20:11.868234313 +0200
@@ -4,7 +4,7 @@ DPKG_EXPORT_BUILDFLAGS = 1
 include /usr/share/dpkg/buildflags.mk
 
 %:
-	dh $@ --with autotools_dev
+	dh $@ --with autoreconf
 
 override_dh_auto_configure:
 	dh_auto_configure -- \

Bug#749110: Please switch to dh-autoreconf to update libtool macros

[Artur Rona]

That's right, I've pushed first Debian bug report before a package to 
Ubuntu archive.


Now I've been testing more latest psensor revision and it doesn't FTBFS, 
so autotools-dev is enough.


This bug can be closed.


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

Bug#749110: Please switch to dh-autoreconf to update libtool macros

[Artur Rona]

Package: src:psensor
Version: 0.8.0.4-1
Tags: patch
Usertags: origin-ubuntu ubuntu-patch utopic

In Ubuntu, we've applied the attached patch to achieve the following:

  * debian/control, debian/rules:
- Switch to dh-autoreconf to update libtool macros for ppc64el.

Because this is an automake-using package, dh-autoreconf can be viewed
as a superset of dh-autotools-dev, in that it still updates config.*
but also updates libtool and configure.  Please apply this patch, to
make life easier for new ports.

We thought you might be interested in doing the same.
diff -pruN -x '*~' psensor-0.8.0.4.orig/debian/control psensor-0.8.0.4/debian/control
--- psensor-0.8.0.4.orig/debian/control	2014-02-10 09:46:49.0 +0100
+++ psensor-0.8.0.4/debian/control	2014-05-24 10:49:06.631322554 +0200
@@ -6,7 +6,7 @@ Build-Depends: asciidoc,
autoconf,
automake,
autopoint,
-	   autotools-dev,
+   dh-autoreconf,
cppcheck,
debhelper (= 9),
gettext,
diff -pruN -x '*~' psensor-0.8.0.4.orig/debian/rules psensor-0.8.0.4/debian/rules
--- psensor-0.8.0.4.orig/debian/rules	2014-02-10 09:46:49.0 +0100
+++ psensor-0.8.0.4/debian/rules	2014-05-24 10:49:49.371534485 +0200
@@ -11,4 +11,4 @@
 export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
 
 %:
-	dh $@ --with=autotools_dev
+	dh $@ --with autoreconf

Bug#747551: sendmail: Some man page corrections

[Artur Rona]

Package: sendmail
Version: 8.14.4-5
Tags: patch
Usertags: origin-ubuntu ubuntu-patch utopic

In Ubuntu, we've applied the attached patch to achieve the following:

  * debian/examples/checksendmail/checksendmail.8,
debian/examples/checksendmail/harker/checksendmail.8::
- Some man page corrections.

We thought you might be interested in doing the same.
diff -Nru sendmail-8.14.4/debian/examples/checksendmail/checksendmail.8 sendmail-8.14.4/debian/examples/checksendmail/checksendmail.8
--- sendmail-8.14.4/debian/examples/checksendmail/checksendmail.8	2014-02-16 00:49:47.0 +0100
+++ sendmail-8.14.4/debian/examples/checksendmail/checksendmail.8	2014-02-16 05:16:53.0 +0100
@@ -3,10 +3,10 @@
 .Dt CHECKSENDMAIL 8
 .Os
 .Sh NAME
-.Nm checksendmail 
+.Nm checksendmail
 .Nd verify sendmail address transformations.
 .Sh SYNOPSIS
-.Nm checksendmail 
+.Nm checksendmail
 .Op Fl a
 .Op Fl d
 .Op Fl b
@@ -17,19 +17,20 @@
 .Op Fl T Ar test.address
 .Sh DESCRIPTION
 .Pp
-The 
+The
 .Nm checksendmail
-program is a 
+program is a
 .Xr perl
-script that aids the testing of 
-.Xr sendmail 8 's 
+script that aids the testing of
+.\.Xr sendmail 8 's
+sendmail(8)'s
 various configuration files.
-.Nm checksendmail 
+.Nm checksendmail
 passes typical addresses (supplied in input files) through
 .Xr sendmail
 and prints the results of the resolution and transformation routines.
 .Pp
-The input files contain a list of addresses, one per line.  
+The input files contain a list of addresses, one per line.
 For example:
 .Bd -literal -offset indent
 user
@@ -37,29 +38,29 @@
 u...@site.com
 .Ed
 .Pp
-The input file can contain comments started with a 
-.Em # 
+The input file can contain comments started with a
+.Em #
 and blank lines.
 .Sh OPTIONS
 .Pp
 .Bl -tag -width Fl -compact -offset left
 .It Fl a
-Show aliasing of local addresses in 
+Show aliasing of local addresses in
 mail address resolution phase of testing
 .It Fl d
-Preceed each address translation line with ruleset sequence summary
+Precede each address translation line with ruleset sequence summary
 .It Fl C Ar file.cf
-Use the 
+Use the
 .Xr sendmail
-configuration file 
+configuration file
 .Ar file.cf
-instead of the default 
+instead of the default
 .Pa /etc/sendmail.cf
 file.
 .It Fl b Ar sendmail_binary
 Use the specified
 .Ar sendmail_binary
-as the path to invoke sendmail (instead of 
+as the path to invoke sendmail (instead of
 .Pa /usr/sbin/sendmail ) .
 .It Fl l Ar log_file
 Log
@@ -80,12 +81,12 @@
 .El
 .Sh EXAMPLES
 .Pp
-The following command will pass the addresses in 
+The following command will pass the addresses in
 .Ar address.resolve
-through 
-.Xr sendmail 
-using the configuration information in 
-.Ar myconfig.cf .  
+through
+.Xr sendmail
+using the configuration information in
+.Ar myconfig.cf .
 .Bd -literal -offset left
 example% cat address.resolve
 user
@@ -115,38 +116,38 @@
 .Ed
 .Pp
 The first section of the output shows how the addresses in the input
-files are resolved by 
+files are resolved by
 .Xr sendmail 8 .
 Consider the following output line:
 .Pp
-.Dl u...@site.com	--(ether )--  u...@site.com[rmtc]
+.Dl u...@site.com	--(ether )--  u...@site.com[rmtc]
 .Pp
-The input address 
+The input address
 .Em u...@site.com
-resolves to use the 
+resolves to use the
 .Em ether
 mailer.  That mailer is directed to send the mail to
-to the user 
+to the user
 .Em u...@site.com
-at site 
+at site
 .Em rmtc
 (as indicated in the square brackets).
 .Pp
 The two later sections of output show how the addresses specified as
-the 
-.Em To 
-and 
-.Em From 
+the
+.Em To
+and
+.Em From
 address are transformed in the text of the
-headers.  In the example above, the 
-.Em To 
+headers.  In the example above, the
+.Em To
 addresses are untouched.
-The 
-.Em From 
+The
+.Em From
 addresses, however, all lose their machine information on
 the way through the mailer:
 .Pp
-.Dl user@site		  user
+.Dl user@site		  user
 .Pp
 This may be desirable when using a configuration file on a
 workstation which is to be hidden as a mailhost from the rest of the
@@ -199,7 +200,7 @@
 .It u...@machine.dom.sun.com
 fully qualified but unknown machine
 .It u...@foo.com
-standard, known, really far away domain 
+standard, known, really far away domain
 .It u...@foo.dom
 standard, unknown, really far away domain
 .It site!user
@@ -214,24 +215,24 @@
 Mixed double uucp/domain
 .El
 .Sh NOTES
-Note that 
+Note that
 .Nm checksendmail
-is a 
-.Xr perl 
+is a
+.Xr perl
 script.  If your site does not have
 .Xr perl 1 ,
 it can be obtained via anonymous
 .Xr ftp
-from 
+from
 .Em ftp.uu.net .
 .Pp
 .Xr sendmail
-requires that the user have access to directory specified by the 
+requires that the user have access to directory specified by the
 .Em OQ
-parameter in the configuration file (normally 
+parameter in the configuration file (normally
 .Pa /usr/spool/mqueue ) .
 .Nm checksendmail
-verifies that the user has access to this directory before allowing 

Bug#738937: zabbix: Drop virtual libgcrypt-dev from Build-Depends

[Artur Rona]

Package: zabbix
Version: 1:2.2.1+dfsg-1
Tags: patch
Usertags: origin-ubuntu ubuntu-patch trusty

In Ubuntu, we've applied the attached patch to achieve the following:

  * debian/control: Replace virtual libgcrypt-dev in Build-Depends with 
libgcrypt11-dev | libgcrypt20-dev


We thought you might be interested in doing the same.

--
Pozdrawiam / Kind regards,
Artur Rona

diff -pruN -x '*~' zabbix-2.2.1+dfsg.orig/debian/control zabbix-2.2.1+dfsg/debian/control
--- zabbix-2.2.1+dfsg.orig/debian/control	2013-12-04 05:24:59.0 +0100
+++ zabbix-2.2.1+dfsg/debian/control	2014-02-14 00:06:32.0 +0100
@@ -5,7 +5,7 @@ Maintainer: Christoph Haas haas@debian.
 Uploaders: Dmitry Smirnov only...@debian.org
 Build-Depends: debhelper (= 9), automake, dh-autoreconf
  ,libcurl4-gnutls-dev
- ,libgcrypt-dev
+ ,libgcrypt11-dev | libgcrypt20-dev
  ,libiksemel-dev
  ,libldap2-dev
  ,libmysqlclient-dev

Bug#738309: sshfs-fuse: Return the correct X_OK access for sshfs mounts.

[Artur Rona]

Package: sshfs-fuse
Version: 2.5-1
Tags: patch
Usertags: origin-ubuntu ubuntu-patch trusty

In Ubuntu, we've applied the attached patch to achieve the following:

  *   debian/patches/lp1017870.patch:
  + Return the correct X_OK access for sshfs mounts.

We thought you might be interested in doing the same.

--
Pozdrawiam / Kind regards,
Artur Rona

Description: Return the correct X_OK access for sshfs mounts
 sshfs-fuse always returned 0 in access(file, X_OK) calls, causing nautilus
 to prompt Do you want to run login.defs, or display its contents? for
 text files that were not executable.
 .
 sshfs-fuse (2.4-1ubuntu1) quantal; urgency=low
 .
   * Return the correct X_OK access for sshfs mounts (LP: #1017870).
Author: Alkis Georgopoulos alk...@gmail.com
Bug-Ubuntu: https://bugs.launchpad.net/bugs/1017870
Origin: upstream, http://sourceforge.net/mailarchive/message.php?msg_id=29804620

--- sshfs-fuse-2.4.orig/sshfs.c
+++ sshfs-fuse-2.4/sshfs.c
@@ -247,6 +247,7 @@ struct sshfs {
 	int ext_statvfs;
 	int ext_hardlink;
 	mode_t mnt_mode;
+	struct fuse_operations *op;
 
 	/* statistics */
 	uint64_t bytes_sent;
@@ -1915,6 +1916,22 @@ static int sshfs_getattr(const char *pat
 	return err;
 }
 
+static int sshfs_access(const char *path, int mask)
+{
+	struct stat stbuf;
+	int err = 0;
+
+	if (mask  X_OK) {
+		err = sshfs.op-getattr(path, stbuf);
+		if (!err) {
+			if (S_ISREG(stbuf.st_mode) 
+			!(stbuf.st_mode  (S_IXUSR|S_IXGRP|S_IXOTH)))
+err = -EACCES;
+		}
+	}
+	return err;
+}
+
 static int count_components(const char *p)
 {
 	int ctr;
@@ -3115,6 +3132,7 @@ static struct fuse_cache_operations sshf
 	.oper = {
 		.init   = sshfs_init,
 		.getattr= sshfs_getattr,
+		.access = sshfs_access,
 		.readlink   = sshfs_readlink,
 		.mknod  = sshfs_mknod,
 		.mkdir  = sshfs_mkdir,
@@ -3215,10 +3233,11 @@ static int is_ssh_opt(const char *arg)
 
 static int sshfs_fuse_main(struct fuse_args *args)
 {
+	sshfs.op = cache_init(sshfs_oper);
 #if FUSE_VERSION = 26
-	return fuse_main(args-argc, args-argv, cache_init(sshfs_oper), NULL);
+	return fuse_main(args-argc, args-argv, sshfs.op, NULL);
 #else
-	return fuse_main(args-argc, args-argv, cache_init(sshfs_oper));
+	return fuse_main(args-argc, args-argv, sshfs.op);
 #endif
 }
 
@@ -3856,7 +3875,8 @@ int main(int argc, char *argv[])
 		if (res == -1)
 			perror(WARNING: failed to set FD_CLOEXEC on fuse device);
 
-		fuse = fuse_new(ch, args, cache_init(sshfs_oper),
+		sshfs.op = cache_init(sshfs_oper);
+		fuse = fuse_new(ch, args, sshfs.op,
 sizeof(struct fuse_operations), NULL);
 		if (fuse == NULL) {
 			fuse_unmount(mountpoint, ch);
--- sshfs-fuse-2.4.orig/cache.c
+++ sshfs-fuse-2.4/cache.c
@@ -490,6 +490,7 @@ static void cache_unity_fill(struct fuse
 	cache_oper-init= oper-oper.init;
 #endif
 	cache_oper-getattr = oper-oper.getattr;
+	cache_oper-access	= oper-oper.access;
 	cache_oper-readlink= oper-oper.readlink;
 	cache_oper-getdir  = cache_unity_getdir;
 	cache_oper-mknod   = oper-oper.mknod;

Bug#738136: ibus-qt: annoying debug output for every application

[Artur Rona]

Package: ibus-qt
Version: 1.3.2-1
Tags: patch
Usertags: origin-ubuntu ubuntu-patch trusty

In Ubuntu, we've applied the attached patch to achieve the following:

  * debian/rules: Set -DCMAKE_CXX_FLAGS=-DQT_NO_DEBUG_OUTPUT
 -DQT_NO_WARNING_OUTPUT to stop annoying debug output for
  every application.

We thought you might be interested in doing the same.

--
Pozdrawiam / Kind regards,
Artur Rona

diff -Nru ibus-qt-1.3.2/debian/rules ibus-qt-1.3.2/debian/rules
--- ibus-qt-1.3.2/debian/rules	2014-01-26 16:19:19.0 +0100
+++ ibus-qt-1.3.2/debian/rules	2014-02-06 23:30:36.0 +0100
@@ -15,6 +15,7 @@
 
 override_dh_auto_configure:
 	cmake \
+-DCMAKE_CXX_FLAGS=-DQT_NO_DEBUG_OUTPUT -DQT_NO_WARNING_OUTPUT \
 	-DCMAKE_INSTALL_PREFIX=/usr \
 -DLIBDIR=/usr/lib/$(DEB_HOST_MULTIARCH)
 

Bug#733126: evas: Please use unversioned libtiff-dev rather than libtiff4-dev

[Artur Rona]

Package: argyll
Version: 1.5.1-5
Tags: patch
Usertags: origin-ubuntu ubuntu-patch trusty

Dear Maintainer,

It makes libtiff transitions (like the upcoming libtiff5 one) easier if
the unversioned virtual package libtiff-dev is used instead of libtiff4-dev.

Thanks for considering the patch.





diff -pruN -x '*~' argyll-1.5.1.orig/debian/control argyll-1.5.1/debian/control
--- argyll-1.5.1.orig/debian/control	2013-08-19 14:18:25.0 +0200
+++ argyll-1.5.1/debian/control	2013-12-26 00:49:06.0 +0100
@@ -5,7 +5,7 @@ Maintainer: Debian QA Group packages@qa
 Uploaders: Xavier Oswald xosw...@debian.org
 Homepage: http://www.argyllcms.com/
 Standards-Version: 3.9.4
-Build-Depends: debhelper (= 9), libtiff4-dev, libx11-dev, libxxf86vm-dev,
+Build-Depends: debhelper (= 9), libtiff-dev, libx11-dev, libxxf86vm-dev,
  x11proto-xf86vidmode-dev, libxinerama-dev, libxrandr-dev, x11proto-scrnsaver-dev,
  libxss-dev, libusbhid-dev [kfreebsd-any], autoconf, automake | automaken, libtool,
  quilt, libjpeg-dev, libusb-dev, dh-autoreconf

Bug#732168: (no subject)

[Artur Rona]

You can to consider remove libgnome-keyring-dev from Build-Depends, as well.
diff -Nru seahorse-3.8.2/debian/control seahorse-3.8.2/debian/control
--- seahorse-3.8.2/debian/control	2013-05-26 00:09:41.0 +0200
+++ seahorse-3.8.2/debian/control	2013-12-16 00:27:07.0 +0100
@@ -2,12 +2,11 @@
 # 
 # Modifications should be made to debian/control.in instead.
 # This file is regenerated automatically in the clean target.
-
 Source: seahorse
 Section: gnome
 Priority: optional
 Maintainer: Debian GNOME Maintainers pkg-gnome-maintain...@lists.alioth.debian.org
-Uploaders: Andreas Henriksson andr...@fatal.se, Jordi Mallach jo...@debian.org, Josselin Mouette j...@debian.org, Michael Biebl bi...@debian.org
+Uploaders: Andreas Henriksson andr...@fatal.se, Jordi Mallach jo...@debian.org, Michael Biebl bi...@debian.org
 Build-Depends: cdbs (= 0.4.41),
debhelper (= 8),
dh-autoreconf,
@@ -19,9 +18,7 @@
libldap2-dev,
libavahi-glib-dev (= 0.6),
libavahi-client-dev (= 0.6),
-   gnome-doc-utils,
gtk-doc-tools (= 1.9),
-   libgnome-keyring-dev (= 3.0.0),
libglib2.0-dev (= 2.10.0),
libgtk-3-dev (= 3.4.0),
libsecret-1-dev (= 0.5),
diff -Nru seahorse-3.8.2/debian/control.in seahorse-3.8.2/debian/control.in
--- seahorse-3.8.2/debian/control.in	2013-05-26 00:07:32.0 +0200
+++ seahorse-3.8.2/debian/control.in	2013-12-16 00:26:12.0 +0100
@@ -14,9 +14,7 @@
libldap2-dev,
libavahi-glib-dev (= 0.6),
libavahi-client-dev (= 0.6),
-   gnome-doc-utils,
gtk-doc-tools (= 1.9),
-   libgnome-keyring-dev (= 3.0.0),
libglib2.0-dev (= 2.10.0),
libgtk-3-dev (= 3.4.0),
libsecret-1-dev (= 0.5),

Bug#732168: seahorse: drop gnome-doc-utils from Build-Depends

[Artur Rona]

Package: seahorse
Version: 3.8.2-1
Tags: patch
Usertags: origin-ubuntu ubuntu-patch trusty

In Ubuntu, we've applied the attached patch to achieve the following:

  * debian/control:
  - Drop Build-Depends on gnome-doc-utils, replaced by yelp-tools.
Port to new documentation infrastructure.

We thought you might be interested in doing the same
diff -pruN -x '*~' seahorse-3.8.2.orig/debian/control seahorse-3.8.2/debian/control
--- seahorse-3.8.2.orig/debian/control	2013-05-26 00:09:41.0 +0200
+++ seahorse-3.8.2/debian/control	2013-12-15 01:22:38.0 +0100
@@ -19,7 +19,6 @@ Build-Depends: cdbs (= 0.4.41),
libldap2-dev,
libavahi-glib-dev (= 0.6),
libavahi-client-dev (= 0.6),
-   gnome-doc-utils,
gtk-doc-tools (= 1.9),
libgnome-keyring-dev (= 3.0.0),
libglib2.0-dev (= 2.10.0),
diff -pruN -x '*~' seahorse-3.8.2.orig/debian/control.in seahorse-3.8.2/debian/control.in
--- seahorse-3.8.2.orig/debian/control.in	2013-05-26 00:07:32.0 +0200
+++ seahorse-3.8.2/debian/control.in	2013-12-15 01:22:49.0 +0100
@@ -14,7 +14,6 @@ Build-Depends: cdbs (= 0.4.41),
libldap2-dev,
libavahi-glib-dev (= 0.6),
libavahi-client-dev (= 0.6),
-   gnome-doc-utils,
gtk-doc-tools (= 1.9),
libgnome-keyring-dev (= 3.0.0),
libglib2.0-dev (= 2.10.0),

Bug#730192: libbtm-java: Typo in rules file

[Artur Rona]

Hello Tony,

yes that's right. I found yesterday that change causes FTBFS. We have 
already synced your package clearly to Ubuntu archive. This bug can be 
closed.


Sorry and thanks.

--
Pozdrawiam / Kind Regards,
Artur Rona


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

Bug#730192: libbtm-java: Typo in rules file

[Artur Rona]

Package: libbtm-java
Version: 2.1.4-1
Tags: patch
Usertags: origin-ubuntu ubuntu-patch trusty

In Ubuntu, we've applied the attached patch to achieve the following:

  * debian/rules:
 - Fixed typo (replaced _'s with -'s in jms package name)

We thought you might be interested in doing the same.

--
Pozdrawiam / Kind regards,
Artur Rona

diff -pruN 2.1.2-1/debian/rules 2.1.2-1ubuntu1/debian/rules
--- 2.1.2-1/debian/rules	2012-01-18 15:25:40.0 +
+++ 2.1.2-1ubuntu1/debian/rules	2012-02-13 20:45:49.0 +
@@ -5,7 +5,7 @@ VERSION = $(shell dpkg-parsechangelog | 
 export JAVA_HOME := /usr/lib/jvm/default-java
 
 D := /usr/share/java/
-export CLASSPATH := $(D)slf4j-api.jar:$(D)geronimo-jms_1.1_spec-1.1.jar:$(D)geronimo-jta-1.0.1b-spec.jar:$(D)mockito-core.jar
+export CLASSPATH := $(D)slf4j-api.jar:$(D)geronimo-jms-1.1-spec-1.1.jar:$(D)geronimo-jta-1.0.1b-spec.jar:$(D)mockito-core.jar
 
 %:
 	dh $@

Bug#724921: links2: Please use unversioned libtiff-dev rather than libtiff4-dev

[Artur Rona]

If you'd change those Build-Depends, then when the libtiff5 transition 
starts in Debian, this package will only need a binNMU (which can be 
done in bulk by the release team) rather than a coordinated upload.
There's only a single provider of libtiff-dev at any one time, so it's 
fine to build-depend directly on it without additionally stating a real 
alternative (saving a time).



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

Bug#724921: links2: Please use unversioned libtiff-dev rather than libtiff4-dev

[Artur Rona]

Don't forget about Bug #662420 :-)


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

Bug#724921: evas: Please use unversioned libtiff-dev rather than libtiff4-dev

[Artur Rona]

Package: links2
Version: 2.8-1
Tags: patch
Usertags: origin-ubuntu ubuntu-patch saucy

Dear Maintainer,

It makes libtiff/libpng/libjpeg transitions (like the upcoming libtiff5 
one) easier if the unversioned virtual package 
libtiff-dev/libpng-dev/libjpeg-dev is used instead of 
libtiff4-dev/libpng12-dev/libjpeg8-dev.


Attached patch fixes also the bug #662420.

Thanks for considering the patch.





diff -Nru links2-2.8/debian/control links2-2.8/debian/control
--- links2-2.8/debian/control	2013-06-06 01:21:02.0 +0200
+++ links2-2.8/debian/control	2013-09-29 18:41:29.0 +0200
@@ -8,12 +8,12 @@
libbz2-dev,
libdirectfb-dev,
libgpm-dev [linux-any],
-   libjpeg8-dev | libjpeg-dev,
+   libjpeg-dev,
liblzma-dev,
-   libpng12-dev | libpng-dev,
+   libpng-dev,
libsdl1.2-dev,
libssl-dev,
-   libtiff4-dev,
+   libtiff-dev,
libx11-dev,
libxau-dev,
libxdmcp-dev,

Bug#662420: (no subject)

[Artur Rona]

tags: patch
thanks

Hello,

we've in Ubuntu similiar fix uploaded. The same patch I've sent to the 
bug #724921.


Regards

diff -Nru links2-2.8/debian/control links2-2.8/debian/control
--- links2-2.8/debian/control	2013-06-06 01:21:02.0 +0200
+++ links2-2.8/debian/control	2013-09-29 18:41:29.0 +0200
@@ -8,12 +8,12 @@
libbz2-dev,
libdirectfb-dev,
libgpm-dev [linux-any],
-   libjpeg8-dev | libjpeg-dev,
+   libjpeg-dev,
liblzma-dev,
-   libpng12-dev | libpng-dev,
+   libpng-dev,
libsdl1.2-dev,
libssl-dev,
-   libtiff4-dev,
+   libtiff-dev,
libx11-dev,
libxau-dev,
libxdmcp-dev,

Bug#724921: (no subject)

[Artur Rona]

retitle 724921 links2: Please use unversioned libtiff-dev, libjpeg-dev, 
libpng-dev

stop


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

Bug#723149: love: Please use unversioned libtiff-dev rather than libtiff4-dev

[Artur Rona]

Package: love
Version: 0.8.0-6
Tags: patch
Usertags: origin-ubuntu ubuntu-patch saucy

Dear Maintainer,

It makes libtiff/libpng transitions (like the upcoming libtiff5 one) 
easier if the unversioned virtual package libtiff-dev/libpng-dev is used 
instead of libtiff4-dev/libpng12-dev.


Thanks for considering the patch.




diff -Nru love-0.8.0/debian/control love-0.8.0/debian/control
--- love-0.8.0/debian/control	2013-08-15 20:36:01.0 +0200
+++ love-0.8.0/debian/control	2013-09-16 23:14:23.0 +0200
@@ -7,7 +7,7 @@
  dh-buildinfo, pkg-config, libboost-dev, libsdl1.2-dev, libsdl-mixer1.2-dev,
  libopenal-dev, liblua5.1-0-dev, libphysfs-dev, libdevil-dev, libfreetype6-dev,
  libmng-dev, libmodplug-dev, libmpg123-dev, libflac++-dev, libxpm-dev,
- libxcursor-dev, libxxf86vm-dev, libtiff4-dev, libpng12-dev, lua5.1,
+ libxcursor-dev, libxxf86vm-dev, libtiff-dev, libpng-dev, lua5.1,
  liblua5.1-expat0, libvorbis-dev, glee-dev
 Standards-Version: 3.9.4
 Homepage: http://love2d.org/

Bug#723150: evas: Please use unversioned libtiff-dev rather than libtiff4-dev

[Artur Rona]

Package: evas
Version: 1.7.7-1
Tags: patch
Usertags: origin-ubuntu ubuntu-patch saucy

Dear Maintainer,

It makes libtiff transitions (like the upcoming libtiff5 one) easier if
the unversioned virtual package libtiff-dev is used instead of libtiff4-dev.

Thanks for considering the patch.




diff -Nru evas-1.7.7/debian/control evas-1.7.7/debian/control
--- evas-1.7.7/debian/control	2013-06-23 16:02:56.0 +0200
+++ evas-1.7.7/debian/control	2013-09-16 23:23:06.0 +0200
@@ -8,7 +8,7 @@
  Nikita V. Youshchenko yo...@debian.org
 Build-Depends: debhelper (= 7.0.50~), libeet-dev (= 1.7.4), libeina-dev (= 1.6.0),
  libfreetype6-dev, libpng-dev, libx11-dev,
- x11proto-xext-dev, zlib1g, libjpeg-dev, libtiff4-dev, libgif-dev,
+ x11proto-xext-dev, zlib1g, libjpeg-dev, libtiff-dev, libgif-dev,
  libfontconfig1-dev, libglu1-mesa-dev, mesa-common-dev, libxpm-dev,
  librsvg2-dev, libfribidi-dev, libxrender-dev, libgles2-mesa-dev,
  libpixman-1-dev, libxcb-shm0-dev, libxcb-image0-dev, libxcb1-dev

Bug#723151: testdisk: Build against ntfs-3g-dev rather than deprecated libntfs-dev.

[Artur Rona]

Package: testdisk
Version: 6.14-1
Tags: patch
Usertags: origin-ubuntu ubuntu-patch saucy

In Ubuntu, we've applied the attached patch to achieve the following:

  * debian/control: Build against ntfs-3g-dev rather than deprecated 
libntfs-dev.


We thought you might be interested in doing the same.
diff -Nru testdisk-6.14/debian/control testdisk-6.14/debian/control
--- testdisk-6.14/debian/control	2013-08-02 21:20:17.0 +0200
+++ testdisk-6.14/debian/control	2013-09-16 23:31:00.0 +0200
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Jean-Michel Kelbert kelb...@debian.org
 Uploaders: Roland Stigge sti...@antcom.de
-Build-Depends: debhelper (= 8.0.0), e2fslibs-dev (= 1.35-3), libncurses5-dev, libncursesw5-dev, libntfs-dev (= 1.11.2-3), libjpeg-dev, uuid-dev, zlib1g-dev
+Build-Depends: debhelper (= 8.0.0), e2fslibs-dev (= 1.35-3), libncurses5-dev, libncursesw5-dev, ntfs-3g-dev, libjpeg-dev, uuid-dev, zlib1g-dev
 Standards-Version: 3.9.4
 
 Package: testdisk

Bug#722938: synfig: Please use unversioned libtiff-dev rather than libtiff4-dev

[Artur Rona]

Package: synfig
Version: 0.64.0-3
Tags: patch
Usertags: origin-ubuntu ubuntu-patch saucy

Dear Maintainer,

It makes libtiff transitions (like the upcoming libtiff5 one) easier if
the unversioned virtual package libtiff-dev is used instead of libtiff4-dev.

Thanks for considering the patch.
diff -Nru synfig-0.64.0/debian/control synfig-0.64.0/debian/control
--- synfig-0.64.0/debian/control	2013-09-13 12:07:16.0 +0200
+++ synfig-0.64.0/debian/control	2013-09-14 18:06:19.0 +0200
@@ -21,7 +22,7 @@
  ,libpng-dev
  ,libsigc++-2.0-dev
 # ,libswscale-dev
- ,libtiff4-dev
+ ,libtiff-dev
  ,libxml++2.6-dev
 Standards-Version: 3.9.4
 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-multimedia/synfig-synfig.git

Bug#722968: lynkeos.app: Please use unversioned libtiff-dev rather than libtiff4-dev

[Artur Rona]

Package: lynkeos.app
Version: 1.2-6.1
Tags: patch
Usertags: origin-ubuntu ubuntu-patch saucy

Dear Maintainer,

It makes libtiff transitions (like the upcoming libtiff5 one) easier if
the unversioned virtual package libtiff-dev is used instead of libtiff4-dev.

Thanks for considering the patch.

diff -u lynkeos.app-1.2/debian/control lynkeos.app-1.2/debian/control
--- lynkeos.app-1.2/debian/control
+++ lynkeos.app-1.2/debian/control
@@ -10,7 +10,7 @@
 	   libavformat-dev (= 4:0.7.1),
 	   libswscale-dev (= 4:0.7.1),
 	   libfftw3-dev,
-	   libtiff4-dev,
+	   libtiff-dev,
 	   libgnustep-gui-dev,
 	   openssl,
 	   imagemagick

Bug#722969: kdc2tiff: Please use unversioned libtiff-dev rather than libtiff4-dev

[Artur Rona]

Package: kdc2tiff
Version: 0.35-9
Tags: patch
Usertags: origin-ubuntu ubuntu-patch saucy

Dear Maintainer,

It makes libtiff transitions (like the upcoming libtiff5 one) easier if
the unversioned virtual package libtiff-dev is used instead of libtiff4-dev.

Thanks for considering the patch.


diff -u kdc2tiff-0.35/debian/control kdc2tiff-0.35/debian/control
--- kdc2tiff-0.35/debian/control
+++ kdc2tiff-0.35/debian/control
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Martin Wuertele m...@debian.org
 Standards-Version: 3.9.4
-Build-Depends: debhelper (= 7.0.50), libtiff4-dev, libjpeg-dev
+Build-Depends: debhelper (= 7.0.50), libtiff-dev, libjpeg-dev
 Homepage: http://kdc2tiff.sourceforge.net/
 
 Package: kdc2tiff

Bug#722972: primaxscan: Please use unversioned libtiff-dev rather than libtiff4-dev

[Artur Rona]

Package: primaxscan
Version: 0.93beta3-10.1
Tags: patch
Usertags: origin-ubuntu ubuntu-patch saucy

Dear Maintainer,

It makes libtiff transitions (like the upcoming libtiff5 one) easier if
the unversioned virtual package libtiff-dev is used instead of libtiff4-dev.

Thanks for considering the patch.



diff -u primaxscan-0.93beta3/debian/control primaxscan-0.93beta3/debian/control
--- primaxscan-0.93beta3/debian/control
+++ primaxscan-0.93beta3/debian/control
@@ -2,7 +2,7 @@
 Section: misc
 Priority: extra
 Maintainer: Ola Lundqvist o...@debian.org
-Build-Depends: debhelper ( 4.0.0), perl, libtiff4-dev, zlib1g-dev (= 1:1.1.3), autotools-dev
+Build-Depends: debhelper ( 4.0.0), perl, libtiff-dev, zlib1g-dev (= 1:1.1.3), autotools-dev
 Standards-Version: 3.7.2
 
 Package: primaxscan

Bug#722596: critcl: FTBFS during override_dh_auto_install

[Artur Rona]

Package: critcl
Version: 3.1.9-1
Tags:sid
Usertags: ftbfs

The package fails to build in a test rebuild on at least i386.

 dpkg-source -b critcl-3.1.9
dpkg-source: info: using source format `3.0 (quilt)'
dpkg-source: info: building critcl using existing ./critcl_3.1.9.orig.tar.gz
dpkg-source: info: building critcl in critcl_3.1.9-1.debian.tar.gz
dpkg-source: info: building critcl in critcl_3.1.9-1.dsc
 debian/rules build
dh build
   dh_testdir
   dh_auto_configure
   dh_auto_build
   dh_auto_test
 fakeroot debian/rules binary
dh binary
   dh_testroot
   dh_prep
   debian/rules override_dh_auto_install
make[1]: Entering directory `/tmp/buildd/critcl-3.1.9'
./build.tcl install debian/critcl/usr/lib/tcltk
Installing into:
Packages:   debian/critcl/usr/lib/tcltk
Application:debian/critcl/usr/bin
make[1]: *** [override_dh_auto_install] Segmentation fault (core dumped)
make[1]: Leaving directory `/tmp/buildd/critcl-3.1.9'
make: *** [binary] Error 2
dpkg-buildpackage: error: fakeroot debian/rules binary gave error exit 
status 2

E: Failed autobuilding of package


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

Bug#680896: ppl: FTBFS: /bin/bash: ./installdox: No such file or directory

[Artur Rona]

 -rf ppl-user-configured-c-interface-0.11.2-html
/bin/sed -e 
's/PPL_SED_CONFIGURED_MANUAL/PPL_DOXYGEN_CONFIGURED_MANUAL/' -e 
's/PPL_SED_LANGUAGE_NAME/Configured C/' -e 
's/PPL_SED_INTERFACE_NAME/configured-c-interface/' -e 
's/PPL_SED_USEPACKAGE_OCAMLDOC//' \

./user-language-interface.tex \
 user-configured-c-interface.tex
/bin/sed -e 
's/PPL_SED_CONFIGURED_MANUAL/PPL_DOXYGEN_CONFIGURED_MANUAL/' -e 
's/PPL_SED_LANGUAGE_NAME/Configured C/' -e 
's/PPL_SED_INTERFACE_NAME/configured-c-interface/' -e 
's/PPL_SED_USEPACKAGE_OCAMLDOC//' -f ./interfaces-html.sed -e 
's|PPL_SED_TAGFILES|ppl-user-0.11.2-html.tag=../ppl-user-0.11.2-html.tag|' 
\
-e 's|PPL_SED_INPUT|'./../interfaces/C/C_interface.dox 
../interfaces/C/ppl_c.h ./gpl.dox ./fdl.dox'|' \
user-language-interface.doxyconf   
Doxyfile.user-configured-c-interface-html
TEXINPUTS=/tmp/buildd/ppl-0.11.2/doc: doxygen 
Doxyfile.user-configured-c-interface-html
warning: Tag `SHOW_DIRECTORIES' at line 72 of file 
Doxyfile.user-configured-c-interface-html has become obsolete.
To avoid this warning please remove this line from your configuration 
file or upgrade it using doxygen -u
warning: Tag `HTML_ALIGN_MEMBERS' at line 132 of file 
Doxyfile.user-configured-c-interface-html has become obsolete.
To avoid this warning please remove this line from your configuration 
file or upgrade it using doxygen -u
warning: Tag `USE_INLINE_TREES' at line 157 of file 
Doxyfile.user-configured-c-interface-html has become obsolete.
To avoid this warning please remove this line from your configuration 
file or upgrade it using doxygen -u

This is pdfTeX, Version 3.1415926-2.4-1.40.13 (TeX Live 2012/Debian)
 restricted \write18 enabled.
entering extended mode
(./_formulas.tex
LaTeX2e 2011/06/27
Babel v3.8m and hyphenation patterns for english, dumylang, 
nohyphenation, lo

aded.


(process:27547): Pango-WARNING **: error opening config file 
'/root/.pangorc': Permission denied


(cd ppl-user-configured-c-interface-0.11.2-html; ./installdox -q \
-l ppl-user-0.11.2-html.tag@../ppl-user-0.11.2-html)
/bin/bash: ./installdox: No such file or directory
make[1]: *** [ppl-user-configured-c-interface-0.11.2-html] Error 127
make[1]: Leaving directory `/tmp/buildd/ppl-0.11.2/doc'
make: *** [build-indep-stamp] Error 2
dpkg-buildpackage: error: fakeroot debian/rules binary gave error exit 
status 2

E: Failed autobuilding of package

--
Pozdrawiam / Kind regards,
Artur Rona




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

Bug#680897: ppl: New upstream release available

[Artur Rona]

, and the
   expressions defining artificial parameters.

o  The implementations of the MIP and PIP solvers are based on a new
   data structure leading to significant space and time savings when
   the tableau matrix is sparse; the benchmarks of the ppl_lpsol demo
   show an improvement on the average case, that grows when the toughest
   tests in the benchmark suite are considered.

o  When the `--check' option is used, the input data for demo ppl_lpsol
   is perturbed the same way as GLPK does, thereby allowing for a
   meaningful comparison of the results obtained.

o  The input routine for PPL numeric datatypes has been extended to
   accept the ISO9899 (C99) hexadecimal floating constant syntax.

o  The Parma Watchdog Library has been merged into the
   Parma Polyhedra Library.


Bugfixes


o  Corrected a precision bug in methods

 BoxITV::upper_bound_assign(const Box)
 BoxITV::upper_bound_assign_if_exact(const Box)

   whereby, provided any argument is an empty box and under other rather
   specific conditions, the computed result was correct but unnecessarily
   imprecise.

o  Corrected a bug in method

 Grid::relation_with(const Constraint) const

   whereby, under specific conditions, the method was creating invalid
   Grid_Generator objects and providing an incorrect result.


--
Pozdrawiam / Kind regards,
Artur Rona




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

Bug#669479: Time to upload fix for #669479

[Artur Rona]

Hello Gregor,

unfortunately, my latest fix is not correct. We cannot just drop 
libncurses5-dev from Build-Depends cause hurd-i386 and mips don't need 
it. So I'd like straightforward add next library to B-D: libncursesw5-dev.


However, if ppl gets missing library, then next FTBFS happens. I've 
filled new bug there: http://bugs.debian.org/680896


Well, above bug has to be fixed, as well. Also there are another bugs 
related to Multi-Arch:

http://bugs.debian.org/670024
http://bugs.debian.org/670025
It would be nice to fix them all by one upload. So if someone can do it, 
feel free to ignore my NMU and upload full fix. From my side, I'll try 
to fix 2nd FTBFS bug but please don't wait for me.


I'm sorry for holding on with this one.

On 06/30/2012 09:33 PM, Gregor Jasny wrote:

Hello Artur,

maybe you should just NMU upload to DELAYED/2.

Thanks,
Gregor


--
Pozdrawiam / Kind Regards,
Artur Rona



diff -Nru ppl-0.11.2/debian/changelog ppl-0.11.2/debian/changelog
--- ppl-0.11.2/debian/changelog 2011-10-11 12:15:19.0 +0200
+++ ppl-0.11.2/debian/changelog 2012-07-08 16:31:21.0 +0200
@@ -1,3 +1,11 @@
+ppl (0.11.2-6.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * debian/control: Add libncursesw5-dev to Build-Depends due to
+missing library, fixes FTBFS. (Closes: #669479)
+
+ -- Artur Rona ari-tc...@tlen.pl  Sun, 08 Jul 2012 16:30:36 +0200
+
 ppl (0.11.2-6) unstable; urgency=low
 
   * Build-depend on libncurses5-dev, until swi-prolog-nox depends on it.
diff -Nru ppl-0.11.2/debian/control ppl-0.11.2/debian/control
--- ppl-0.11.2/debian/control   2011-10-11 12:14:41.0 +0200
+++ ppl-0.11.2/debian/control   2012-07-08 16:30:22.0 +0200
@@ -4,7 +4,7 @@
 Maintainer: Debian GCC Maintainers debian-...@lists.debian.org
 Uploaders: Michael Tautschnig m...@debian.org, Arthur Loiret 
aloi...@debian.org, Matthias Klose d...@debian.org
 Standards-Version: 3.9.2
-Build-Depends: debhelper (= 6.0.7~), libgmp-dev, autoconf, libtool, 
autotools-dev, swi-prolog [!hurd-i386 !mips], chrpath, libncurses5-dev
+Build-Depends: debhelper (= 6.0.7~), libgmp-dev, autoconf, libtool, 
autotools-dev, swi-prolog [!hurd-i386 !mips], chrpath, libncurses5-dev, 
libncursesw5-dev
 Build-Depends-Indep: doxygen-latex, graphviz, poppler-utils, ghostscript, 
texlive-math-extra
 Homepage: http://www.cs.unipr.it/ppl/
 

Bug#676084: (no subject)

[Artur Rona]

Hello Hendrik,

Could you then prepare a fix and upload it to mentors? Somebody will 
sponsor your package. Or if you don't have a time to handle with 
packaging, then just attach here a patch to fix FTBFS.


--
Pozdrawiam / Kind Regards,
Artur Rona




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

Bug#676014: (no subject)

[Artur Rona]

tags 676014 patch
thanks



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

Bug#671962: (no subject)

[Artur Rona]

tags 671962 + patch
thanks



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

Bug#669469: (no subject)

[Artur Rona]

tags 669469 patch
thanks



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

Bug#676203: (no subject)

[Artur Rona]

tags 676203 patch
thanks

Hello,

I have found a patch on upstream's svn. It's attached. If there is no 
response from maintainer, I'm going to upload this one through NMU.


--
Pozdrawiam / Kind regards,
Artur Rona

From: Artur Rona ari-tc...@tlen.pl
Description: Ruby 1.9.1 has a memoisation optimisation when compiling with GCC which breaks using rb_intern as an lvalue, as SWIG does. We work around this issue for now by disabling this.
Bug: https://sourceforge.net/tracker/?func=detailaid=2859614group_id=1645atid=101645
Bug-Debian: http://bugs.debian.org/676203
Origin: upstream, http://code.google.com/p/mecab/source/diff?spec=svn112old=91r=112format=unidiffpath=%2Ftrunk%2Fmecab%2Fruby%2FMeCab_wrap.cpp

diff -pruN -x '*~' mecab-ruby-0.993.orig/MeCab_wrap.cpp mecab-ruby-0.993/MeCab_wrap.cpp
--- mecab-ruby-0.993.orig/MeCab_wrap.cpp	2012-02-10 17:46:45.0 +0100
+++ mecab-ruby-0.993/MeCab_wrap.cpp	2012-06-19 22:26:36.0 +0200
@@ -854,6 +854,10 @@ SWIG_UnpackDataName(const char *c, void
 
 
 #include ruby.h
+ 
+#ifdef rb_intern
+# undef rb_intern
+#endif
 
 /* Remove global macros defined in Ruby's win32.h */
 #ifdef write
@@ -1402,7 +1406,7 @@ SWIG_Ruby_AppendOutput(VALUE target, VAL
 /* Error manipulation */
 
 #define SWIG_ErrorType(code)SWIG_Ruby_ErrorType(code)   
-#define SWIG_Error(code, msg)		rb_raise(SWIG_Ruby_ErrorType(code), msg)
+#define SWIG_Error(code, msg)		rb_raise(SWIG_Ruby_ErrorType(code), %s, msg)
 #define SWIG_fail		goto fail 
 
 
@@ -1457,7 +1461,7 @@ static ID swig_call_id  = 0;
   ++swig_virtual_calls;
 #  define SWIG_RELEASE_STACK --swig_virtual_calls;
 #  define Ruby_DirectorTypeMismatchException(x) \
-  rb_raise( rb_eTypeError, x ); return c_result;
+  rb_raise( rb_eTypeError, %s, x ); return c_result;
 
   static unsigned int swig_virtual_calls = 0;
 
@@ -1838,7 +1842,7 @@ static VALUE mMeCab;
 #define SWIG_RUBY_THREAD_END_BLOCK
 
 
-#define SWIGVERSION 0x010340 
+#define SWIGVERSION 0x020004
 #define SWIG_VERSION SWIGVERSION
 
 
@@ -2000,7 +2004,7 @@ SWIG_ruby_failed(void)
 } 
 
 
-/*@SWIG:/usr/share/swig1.3/ruby/rubyprimtypes.swg,23,%ruby_aux_method@*/
+/*@SWIG:/usr/share/swig2.0/ruby/rubyprimtypes.swg,19,%ruby_aux_method@*/
 SWIGINTERN VALUE SWIG_AUX_NUM2DBL(VALUE *args)
 {
   VALUE obj = args[0];
@@ -2076,7 +2080,7 @@ SWIG_From_bool  (bool value)
 }
 
 
-/*@SWIG:/usr/share/swig1.3/ruby/rubyprimtypes.swg,23,%ruby_aux_method@*/
+/*@SWIG:/usr/share/swig2.0/ruby/rubyprimtypes.swg,19,%ruby_aux_method@*/
 SWIGINTERN VALUE SWIG_AUX_NUM2ULONG(VALUE *args)
 {
   VALUE obj = args[0];
@@ -2122,7 +2126,7 @@ SWIG_From_size_t  (size_t value)
 }
 
 
-/*@SWIG:/usr/share/swig1.3/ruby/rubyprimtypes.swg,23,%ruby_aux_method@*/
+/*@SWIG:/usr/share/swig2.0/ruby/rubyprimtypes.swg,19,%ruby_aux_method@*/
 SWIGINTERN VALUE SWIG_AUX_NUM2LONG(VALUE *args)
 {
   VALUE obj = args[0];

Bug#651271: (no subject)

[Artur Rona]

tags 651271 + |moreinfo| |unreproducible
severity minor

Hello Bernward,

Unfortunately, I can't reproduce this bug, even with 
gst-fluendo-mp3/0.10.14.debian-1. Could you full update your Debian and 
try again? By my side mp3splt-gtk and quodlibet work fine. If you can't 
already reproduce with latests versions, than I'd like to close this bug.

|

--
Pozdrawiam / Kind regards,
Artur Rona

Bug#651271: Info received ((no subject))

[Artur Rona]

tags 651271 + |moreinfo| |unreproducible
severity minor
thanks
|

Bug#676503: watch file is broken

[Artur Rona]

Package: qtads
Version: 2.1.1-1
Tags: patch

Hello,

You have outdated watch file. Now it's shipped in .tar.bz2 @ sf.net by 
upstream. Fix is attached.


--
Pozdrawiam / Kind regards,
Artur Rona

diff -Nru qtads-2.1.1/debian/watch qtads-2.1.1/debian/watch
--- qtads-2.1.1/debian/watch	2009-11-11 01:49:42.0 +0100
+++ qtads-2.1.1/debian/watch	2012-06-07 13:51:04.0 +0200
@@ -1,2 +1,2 @@
 version=3
-http://sf.net/qtads/qtads-([0-9a-z.]+)\.tar\.gz
+http://sf.net/qtads/qtads-([0-9a-z.]+)\.tar\.bz2

Bug#671979: (no subject)

[Artur Rona]

tags 671979 + patch
thanks

Hello,

I've prepared small patch to fix this one. Just add pkg-config to 
Build-Depends. If you (maintainer) don't have a time to upload this one, 
I'm going to go on with NMU.


--
Pozdrawiam / Kind regards,
Artur Rona

diff -Nru qtads-2.1.1/debian/changelog qtads-2.1.1/debian/changelog
--- qtads-2.1.1/debian/changelog2011-04-02 22:28:05.0 +0200
+++ qtads-2.1.1/debian/changelog2012-06-07 13:39:59.0 +0200
@@ -1,3 +1,11 @@
+qtads (2.1.1-1.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * debian/control:
+- Fix FTBFS, add pkg-config to Build-Depends. (Closes: #671979)
+
+ -- Artur Rona ari-tc...@tlen.pl  Thu, 07 Jun 2012 13:37:14 +0200
+
 qtads (2.1.1-1) unstable; urgency=low
 
   * New upstream release.
diff -Nru qtads-2.1.1/debian/control qtads-2.1.1/debian/control
--- qtads-2.1.1/debian/control  2011-04-02 22:29:28.0 +0200
+++ qtads-2.1.1/debian/control  2012-06-07 13:37:10.0 +0200
@@ -2,7 +2,7 @@
 Section: games
 Priority: optional
 Maintainer: Daniel Schepler schep...@debian.org
-Build-Depends: debhelper (= 6), libqt4-dev (= 4:4.5), libsdl-mixer1.2-dev, 
libsdl-sound1.2-dev, cdbs (= 0.4.50)
+Build-Depends: debhelper (= 6), libqt4-dev (= 4:4.5), libsdl-mixer1.2-dev, 
libsdl-sound1.2-dev, cdbs (= 0.4.50), pkg-config
 Standards-Version: 3.9.1
 
 Package: qtads

Bug#666307: (no subject)

[Artur Rona]

Hello maintainers,

I've working a bit on this bug and I concluded upgrade to 1.17 fixes 
FTBFS (including refreshed patches etc.). If you want to fix it, let's 
upgrade it. If you don't have time, I'm going to go on with NMU.


--
Pozdrawiam / Kind regards,
Artur Rona

Bug#671979: (no subject)

[Artur Rona]

W dniu 2012-06-07 22:02, Nikos Chantziaras pisze:
qtads.pro uses qmake's support for pkg-config and never calls it 
directly.  pkg-config support is shipped with Qt in 
mkspecs/features/link_pkgconfig.prf.  It assumes pkg-config is 
present on the system.

Maybe in theory. In practise, pbuilder gives FTBFS in result.

BTW, can you please upgrade qtads to 2.1.3?

--
Pozdrawiam / Kind regards,
Artur Rona




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

Bug#666307: (no subject)

[Artur Rona]

W dniu 2012-06-07 23:11, Diego Escalante Urrelo pisze:

Hi Artur,
Since a long time now htp was in the to-be-removed list and just a few
days ago I got an email that it had been officially removed from
testing.

Considering that I don't use it anymore and that popcon always says
there are -1 users... I don't know if it is worth further maintaining.

That said, feel free to take over the package if you use htp or have
an interest in maintaining it.

Thanks for the email :-)

Diego

I'm not sure whether do I want to adopt this one. Since 1.17 upstream 
tarball is not clear, e.g. there are no pic directory (including all 
.png files) which makes htp a bit ugly. I've sent a question to 
upstream, though.


Could you please then orphan a package?

--
Pozdrawiam / Kind regards,
Artur Rona




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

Bug#671969: (no subject)

[Artur Rona]

tags 671969 + patch
thanks

Hello,

There is a simple patch to fix this RC bug. Just add pkg-config to 
Builds-Depends. If they don't have a time to upload it, I'm going to go 
on with NMU.


--
Pozdrawiam / Kind regards,
Artur Rona

diff -Nru phlipple-0.8.2/debian/changelog phlipple-0.8.2/debian/changelog
--- phlipple-0.8.2/debian/changelog 2011-11-16 13:50:42.0 +0100
+++ phlipple-0.8.2/debian/changelog 2012-06-07 01:46:56.0 +0200
@@ -1,3 +1,11 @@
+phlipple (0.8.2-1.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * debian/control:
+- Add pkg-config to Build-Depeds. Fixes FTBFS. (Closes: #671969)
+
+ -- Artur Rona ari-tc...@tlen.pl  Thu, 07 Jun 2012 01:46:49 +0200
+
 phlipple (0.8.2-1) unstable; urgency=low
 
   * Initial release. Closes: #648909
diff -Nru phlipple-0.8.2/debian/control phlipple-0.8.2/debian/control
--- phlipple-0.8.2/debian/control   2011-11-16 14:04:53.0 +0100
+++ phlipple-0.8.2/debian/control   2012-06-07 01:34:53.0 +0200
@@ -5,7 +5,7 @@
 Uploaders: Miriam Ruiz little_m...@yahoo.es
 Build-Depends: debhelper (= 7), dh-buildinfo, quilt, autotools-dev,
  libsdl1.2-dev, libsdl-image1.2-dev, libsdl-mixer1.2-dev,
- libglew1.6-dev | libglew1.5-dev
+ libglew1.6-dev | libglew1.5-dev, pkg-config
 Standards-Version: 3.9.2
 Homepage: http://phuzzboxmedia.com/games/phlipple
 Vcs-Svn: svn://svn.debian.org/svn/pkg-games/packages/trunk/phlipple/

Bug#676447: Add watch file

[Artur Rona]

Package: phlipple
Version: 0.8.2-1
Tags: patch

Hello,

I've prepaid a watch file to use by uscan. I hope you will add this one.

--
Pozdrawiam / Kind regards,
Artur Rona

version=3
http://sf.net/phlipple/phlipple-([0-9.a-z]+)\.tar\.gz

Bug#669479: (no subject)

[Artur Rona]

tags 669479 patch
thanks

I've prepared small patch to fix Build-Depends in debian/control. If 
there is no response from maintainer team, than I'm going to upload NMU.


--
Pozdrawiam / Kind regards,
Artur Rona

diff -Nru ppl-0.11.2/debian/changelog ppl-0.11.2/debian/changelog
--- ppl-0.11.2/debian/changelog 2011-10-11 12:15:19.0 +0200
+++ ppl-0.11.2/debian/changelog 2012-05-19 16:27:44.0 +0200
@@ -1,3 +1,14 @@
+ppl (0.11.2-6.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * debian/control:
+- Drop libncurses5-dev from Builds-Depends. swi-prolog-nox
+  already Depends on it.
+- Add libncursesw5-dev to Build-Depends, fixes FTBFS
+  due to missing library. (Closes: #669479)
+
+ -- Artur Rona ari-tc...@tlen.pl  Sat, 19 May 2012 16:24:48 +0200
+
 ppl (0.11.2-6) unstable; urgency=low
 
   * Build-depend on libncurses5-dev, until swi-prolog-nox depends on it.
diff -Nru ppl-0.11.2/debian/control ppl-0.11.2/debian/control
--- ppl-0.11.2/debian/control   2011-10-11 12:14:41.0 +0200
+++ ppl-0.11.2/debian/control   2012-05-19 16:24:39.0 +0200
@@ -4,7 +4,7 @@
 Maintainer: Debian GCC Maintainers debian-...@lists.debian.org
 Uploaders: Michael Tautschnig m...@debian.org, Arthur Loiret 
aloi...@debian.org, Matthias Klose d...@debian.org
 Standards-Version: 3.9.2
-Build-Depends: debhelper (= 6.0.7~), libgmp-dev, autoconf, libtool, 
autotools-dev, swi-prolog [!hurd-i386 !mips], chrpath, libncurses5-dev
+Build-Depends: debhelper (= 6.0.7~), libgmp-dev, autoconf, libtool, 
autotools-dev, swi-prolog [!hurd-i386 !mips], chrpath, libncursesw5-dev
 Build-Depends-Indep: doxygen-latex, graphviz, poppler-utils, ghostscript, 
texlive-math-extra
 Homepage: http://www.cs.unipr.it/ppl/
 

Bug#667868: (no subject)

[Artur Rona]

tags 667868 patch
thanks



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

Bug#448326: criticalmass has no .desktop file and ships no icon

[Artur Rona]

tags 448326 patch
thanks

Bug#635923: ghdl: FTBFS: features.h:323:26: error: bits/predefs.h: No such file or directory

[Artur Rona]

tags 635923 patch
thanks



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

Bug#666174: criticalmass: Wrong section in the menu setting

[Artur Rona]

tags 666174 patch
thanks

Bug#669553: criticalmass: FTBFS: configure: error: libpng is needed

[Artur Rona]

tags 669553 patch
thanks

Bug#669525: bumprace: FTBFS: configure: error: Your system is missing libjpeg!

[Artur Rona]

tags 669525 patch
thanks



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

Bug#669519: luola: FTBFS: configure: error: libz is needed

[Artur Rona]

tags 669519 patch
thanks



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