Bug#736038: photoprint: diff for NMU version 0.4.2~pre2-2.3

2014-09-07 Thread tobi


Dear maintainer,

I've prepared an NMU for photoprint (versioned as 0.4.2~pre2-2.3). The diff
is attached to this message.

Regards.
diff -Nru photoprint-0.4.2~pre2/debian/changelog 
photoprint-0.4.2~pre2/debian/changelog
--- photoprint-0.4.2~pre2/debian/changelog  2014-08-11 20:54:09.0 
+0200
+++ photoprint-0.4.2~pre2/debian/changelog  2014-09-07 20:30:00.0 
+0200
@@ -1,3 +1,10 @@
+photoprint (0.4.2~pre2-2.3) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Really change B-D on libtiff-dev, not libtiff4-dev (Closes: #736038)
+
+ -- Tobias Frost   Sun, 07 Sep 2014 20:23:24 +0200
+
 photoprint (0.4.2~pre2-2.2) unstable; urgency=low
 
   * Non-maintainer upload.
diff -Nru photoprint-0.4.2~pre2/debian/control 
photoprint-0.4.2~pre2/debian/control
--- photoprint-0.4.2~pre2/debian/control2014-08-11 18:39:22.0 
+0200
+++ photoprint-0.4.2~pre2/debian/control2014-09-07 20:22:38.0 
+0200
@@ -2,7 +2,7 @@
 Section: graphics
 Priority: optional
 Maintainer: David Stone 
-Build-Depends: debhelper (>= 7), libgtk2.0-dev, liblcms2-dev, libpng12-dev, 
libtiff4-dev, libnetpbm10-dev, libgutenprint-dev, chrpath, automake, libtool, 
autopoint
+Build-Depends: debhelper (>= 7), libgtk2.0-dev, liblcms2-dev, libpng12-dev, 
libtiff-dev, libnetpbm10-dev, libgutenprint-dev, chrpath, automake, libtool, 
autopoint
 Standards-Version: 3.9.2
 Homepage: 
http://blackfiveimaging.co.uk/index.php?article=02Software%2F01PhotoPrint
 


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



Bug#745530: cegui-mk2: diff for NMU version 0.7.6-3.3

2014-08-03 Thread tobi
tags 745530 + patch
tags 745530 + pending
thanks

Dear maintainer,

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

Regards.
diff -Nru cegui-mk2-0.7.6/debian/changelog cegui-mk2-0.7.6/debian/changelog
--- cegui-mk2-0.7.6/debian/changelog2014-03-04 04:54:44.0 +0100
+++ cegui-mk2-0.7.6/debian/changelog2014-08-03 19:09:44.0 +0200
@@ -1,3 +1,11 @@
+cegui-mk2 (0.7.6-3.3) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Remove unneeded depdendency on liblcms-dev (Closes: #745530) and libmng-dev
+which would also pull-in lcms.
+
+ -- Tobias Frost   Sun, 03 Aug 2014 19:09:41 +0200
+
 cegui-mk2 (0.7.6-3.2) unstable; urgency=medium
 
   * Non-maintainer upload.
diff -Nru cegui-mk2-0.7.6/debian/control cegui-mk2-0.7.6/debian/control
--- cegui-mk2-0.7.6/debian/control  2014-03-04 04:52:53.0 +0100
+++ cegui-mk2-0.7.6/debian/control  2014-08-03 19:13:44.0 +0200
@@ -4,13 +4,14 @@
 Maintainer: Muammar El Khatib 
 Build-Depends: debhelper (>= 6), cdbs, libtool, automake1.11, autoconf,
pkg-config, libxerces-c-dev, libboost-signals-dev,
-   libboost-regex-dev, libfreetype6-dev, liblcms1-dev,
+   libboost-regex-dev, libfreetype6-dev,
libtiff-dev, libgl1-mesa-dev, libglu1-mesa-dev, libdevil-dev,
libpcre3-dev, liblua5.1-dev, lua5.1, libois-dev [linux-any],
libfreeimage-dev, libxcursor-dev, libxpm-dev, python-dev,
-   libpng-dev, libmng-dev, libxxf86vm-dev, libexpat1-dev,
-   liblua5.1-expat-dev, libxml2-dev, libsilly-dev, libogre-1.8-dev,
-   libglew1.6-dev, libtinyxml-dev, libtolua++5.1-dev (>= 1.0.93)
+   libpng-dev, libxxf86vm-dev,
+   libexpat1-dev, liblua5.1-expat-dev, libxml2-dev, libsilly-dev,
+   libogre-1.8-dev, libglew1.6-dev, libtinyxml-dev,
+   libtolua++5.1-dev (>= 1.0.93)
 Standards-Version: 3.9.4
 Homepage: http://www.cegui.org.uk/
 
@@ -52,8 +53,8 @@
 Suggests: libcegui-mk2-0.7.6-doc
 Depends: ${misc:Depends}, libcegui-mk2-0.7.6 (= ${binary:Version}),
  libdevil-dev, libxerces-c3.1, libpng12-dev | libpng-dev,
- libtiff5-dev | libtiff-dev, libjpeg-dev, libmng-dev,
- zlib1g-dev | libz-dev, libfreetype6-dev, liblua5.1-dev, liblcms1-dev,
+ libtiff5-dev | libtiff-dev, libjpeg-dev,
+ zlib1g-dev | libz-dev, libfreetype6-dev, liblua5.1-dev,
  libpcre3-dev, libfreeimage-dev
 Description: Crazy Eddie's GUI (development files)
  CEGUI is a free library providing windowing and widgets for graphics


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



Bug#699304: libmng: diff for NMU version 1.0.10+dfsg-3.1

2014-08-03 Thread tobi
tags 699304 + patch
tags 699304 + pending
tags 745525 + patch
tags 745525 + pending
thanks

Dear maintainer,

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

Regards.

-- 
tobi

Binary files /tmp/gpYxIQ67pL/libmng-1.0.10/contrib/msvc/mngview/sRGB.icm and 
/tmp/OiF0VWc2ny/libmng-1.0.10+dfsg/contrib/msvc/mngview/sRGB.icm differ
diff -Nru libmng-1.0.10/debian/changelog libmng-1.0.10+dfsg/debian/changelog
--- libmng-1.0.10/debian/changelog  2011-09-16 17:41:19.0 +0200
+++ libmng-1.0.10+dfsg/debian/changelog 2014-08-03 13:30:49.0 +0200
@@ -1,3 +1,13 @@
+libmng (1.0.10+dfsg-3.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Buld against lcms2: new patch support-lcms2.patch (Closes: #745525)
+The patch cherry-picks the relevant changes from the new upstream version.
+  * Repack tarball using Exclude-Files in d/copyright to remove non-free
+file contrib/msvc/mngview/sRGB.icm (Closes: #699304).
+
+ --  Tobias Frost   Sun, 03 Aug 2014 13:20:17 +
+
 libmng (1.0.10-3) unstable; urgency=low
 
   * debian/control:
diff -Nru libmng-1.0.10/debian/control libmng-1.0.10+dfsg/debian/control
--- libmng-1.0.10/debian/control2011-09-16 18:18:21.0 +0200
+++ libmng-1.0.10+dfsg/debian/control   2014-08-03 13:06:38.0 +0200
@@ -3,7 +3,7 @@
 Priority: optional
 Build-Depends: debhelper (>= 8.1.3),
libjpeg-dev,
-   liblcms1-dev,
+   liblcms2-dev,
libtool,
zlib1g-dev
 Maintainer: Kartik Mistry 
@@ -31,7 +31,7 @@
 Depends: ${misc:Depends},
  libmng1 (= ${binary:Version}),
  libjpeg-dev,
- liblcms1-dev,
+ liblcms2-dev,
  zlib1g-dev
 Description: M-N-G library (Development headers)
  The libmng library supports decoding, displaying, encoding, and various other
diff -Nru libmng-1.0.10/debian/copyright libmng-1.0.10+dfsg/debian/copyright
--- libmng-1.0.10/debian/copyright  2011-09-16 17:22:20.0 +0200
+++ libmng-1.0.10+dfsg/debian/copyright 2014-08-03 13:19:56.0 +0200
@@ -1,6 +1,7 @@
-Format: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=174
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: libmng
 Source: http://www.libmng.com
+Files-Excluded: contrib/msvc/mngview/sRGB.icm
 
 Files: *
 Copyright: (C) 2000, Gerard Juyn 
diff -Nru libmng-1.0.10/debian/patches/series 
libmng-1.0.10+dfsg/debian/patches/series
--- libmng-1.0.10/debian/patches/series 2010-06-12 11:27:40.0 +0200
+++ libmng-1.0.10+dfsg/debian/patches/series2014-08-03 13:01:59.0 
+0200
@@ -1,3 +1,4 @@
 linux-makefile.diff
 kfreebsd-build-fix.diff
 manpage-typo-fixes.diff
+support-lcms2.patch
diff -Nru libmng-1.0.10/debian/patches/support-lcms2.patch 
libmng-1.0.10+dfsg/debian/patches/support-lcms2.patch
--- libmng-1.0.10/debian/patches/support-lcms2.patch1970-01-01 
01:00:00.0 +0100
+++ libmng-1.0.10+dfsg/debian/patches/support-lcms2.patch   2014-08-03 
13:25:42.0 +0200
@@ -0,0 +1,189 @@
+Description: Patch to support lcms2
+ Cherry-pick lcms2-support from new upstream version 2.0.2
+Author: Tobias Frost 
+Forwarded: not-needed
+Last-Update: 2014-08-03
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/libmng_cms.c
 b/libmng_cms.c
+@@ -86,6 +86,9 @@
+ #pragma option -A  /* force ANSI-C */
+ #endif
+ 
++#undef HAVE_LIBLCMS1
++#define HAVE_LIBLCMS2
++
+ /* ** 
*/
+ 
+ #ifdef MNG_INCLUDE_DISPLAY_PROCS
+@@ -104,7 +107,9 @@
+ 
+ void mnglcms_initlibrary ()
+ {
++#ifdef HAVE_LIBLCMS1
+   cmsErrorAction (LCMS_ERROR_IGNORE);  /* LCMS should ignore errors! */
++#endif
+ }
+ 
+ /* ** 
*/
+@@ -132,14 +137,30 @@
+   {0.3000, 0.6000, 1.0},
+   {0.1500, 0.0600, 1.0}
+ };
++#ifdef HAVE_LIBLCMS1
+   LPGAMMATABLEGamma24[3];
++#elif defined(HAVE_LIBLCMS2)
++  cmsToneCurve* Gamma24[3];
++#endif
+   mng_cmsprof hsRGB;
+ 
++#ifdef HAVE_LIBLCMS1
+   cmsWhitePointFromTemp(6504, &D65);
+-  Gamma24[0] = Gamma24[1] = Gamma24[2] = cmsBuildGamma(256, 2.4);
++#elif defined(HAVE_LIBLCMS2)
++  cmsWhitePointFromTemp(&D65, 6504);
++#endif
++  Gamma24[0] = Gamma24[1] = Gamma24[2] =
++#ifdef HAVE_LIBLCMS1 
++  cmsBuildGamma(256, 2.4);
++#elif defined(HAVE_LIBLCMS2)
++  cmsBuildGamma(NULL, 2.4);
++#endif
+   hsRGB = cmsCreateRGBProfile(&D65, &Rec709Primaries, Gamma24);
++#ifdef HAVE_LIBLCMS1
+   cmsFreeGamma(Gamma24[0]);
+-
++#elif defined(HAVE_LIBLCMS2)
++  cmsFreeToneCurve(Gamma24[0]);
++#endif
+   return hsRGB;
+ }
+ 
+@@ -368,16 +389,22 @@
+ 
+   pGammatable [0] =

Bug#736040: prima: diff for NMU version 1.28-1.3

2014-08-02 Thread tobi
tags 736040 + patch
tags 736040 + pending
tags 752805 + pending
thanks

Dear maintainer,

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

Regards.
diff -u prima-1.28/debian/changelog prima-1.28/debian/changelog
--- prima-1.28/debian/changelog
+++ prima-1.28/debian/changelog
@@ -1,3 +1,12 @@
+prima (1.28-1.3) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Do not hardcode /usr/lib/perl5 (Closes: #752805), taking the patch from the
+BTS (authored by Gregor Herrmann)
+  * Do not B-D on libtiff4-dev, but on libtiff-dev (Closes: #736040)
+
+ -- Tobias Frost   Sat, 02 Aug 2014 17:03:18 +0200
+
 prima (1.28-1.2) unstable; urgency=medium
 
   * Non-maintainer upload. Announced with this bug: (Closes: #734974)
diff -u prima-1.28/debian/control prima-1.28/debian/control
--- prima-1.28/debian/control
+++ prima-1.28/debian/control
@@ -2,7 +2,7 @@
 Section: perl
 Priority: extra
 Maintainer: Bas Zoetekouw 
-Build-Depends: 
+Build-Depends:
  debhelper (>= 5),
  perl (>= 5.8),
  libx11-dev,
@@ -14,7 +14,7 @@
  libpng-dev,
  libxpm-dev,
  libjpeg-dev,
- libtiff4-dev
+ libtiff-dev
 Standards-Version: 3.8.2
 Homepage: http://search.cpan.org/dist/Prima/
 
diff -u prima-1.28/debian/rules prima-1.28/debian/rules
--- prima-1.28/debian/rules
+++ prima-1.28/debian/rules
@@ -1,6 +1,8 @@
 #!/usr/bin/make -f
 
 DEST = $(CURDIR)/debian/libprima-perl
+VENDORARCH := $(shell perl -MConfig -e 'print substr($$Config{vendorarch}, 1)')
+SITEARCH   := $(shell perl -MConfig -e 'print substr($$Config{sitearch}, 5)')
 
 ifneq ($(findstring parallel=,$(DEB_BUILD_OPTIONS)),)
   PARALLEL = -j$(subst parallel=,,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
@@ -64,21 +66,21 @@
# Fix the messed up paths
#
cd $(DEST) && \
-   mkdir -p usr/share/doc/prima usr/lib/perl5 
usr/share/perl5/Prima/VB  && \
-   mv local/lib/perl/*/Prima/*.pod usr/share/perl5/Prima/  
 && \
-   mv local/lib/perl/*/Prima/*.gif usr/share/perl5/Prima/  
 && \
-   mv local/lib/perl/*/Prima/VB/*.gif  usr/share/perl5/Prima/VB/   
 && \
-   mv local/lib/perl/*/*   usr/lib/perl5/  
 && \
+   mkdir -p usr/share/doc/prima $(VENDORARCH) 
usr/share/perl5/Prima/VB  && \
+   mv $(SITEARCH)/Prima/*.pod usr/share/perl5/Prima/   
 && \
+   mv $(SITEARCH)/Prima/*.gif usr/share/perl5/Prima/   
 && \
+   mv $(SITEARCH)/Prima/VB/*.gif  usr/share/perl5/Prima/VB/
 && \
+   mv $(SITEARCH)/*   $(VENDORARCH)/   
 && \
mv bin  usr/
 && \
-   mv usr/lib/perl5/manusr/share/  
 && \
-   mv usr/lib/perl5/Prima/tutorial usr/share/doc/prima/
 && \
-   mv usr/lib/perl5/Prima/examples usr/share/doc/prima/
 && \
-   mv usr/lib/perl5/Prima/VB/examples  
usr/share/doc/prima/examples/VB
+   mv $(VENDORARCH)/manusr/share/  
 && \
+   mv $(VENDORARCH)/Prima/tutorial usr/share/doc/prima/
 && \
+   mv $(VENDORARCH)/Prima/examples usr/share/doc/prima/
 && \
+   mv $(VENDORARCH)/Prima/VB/examples  
usr/share/doc/prima/examples/VB
 
cd $(DEST) && \
-   rmdir local/lib/perl/* local/lib/perl local/lib/ local/ 
 && \
-   rm usr/lib/perl5/auto/Prima/.packlist   
 && \
-   rm -r usr/lib/perl5/Prima/sys/win32
+   rmdir --ignore-fail-on-non-empty --parents $(SITEARCH)  
 && \
+   rm $(VENDORARCH)/auto/Prima/.packlist   
 && \
+   rm -r $(VENDORARCH)/Prima/sys/win32
 
###
# Fix overly generic names of binaries


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



Bug#741600: 389-ds-base: diff for NMU version 1.3.2.9-1.1

2014-04-25 Thread tobi
tags 741600 + patch
tags 741600 + pending
thanks

Dear maintainer,

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

Regards.
diff -Nru 389-ds-base-1.3.2.9/debian/changelog 
389-ds-base-1.3.2.9/debian/changelog
--- 389-ds-base-1.3.2.9/debian/changelog2014-02-03 10:09:07.0 
+0100
+++ 389-ds-base-1.3.2.9/debian/changelog2014-04-25 16:55:53.0 
+0200
@@ -1,3 +1,12 @@
+389-ds-base (1.3.2.9-1.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Apply fix for CVE-2014-0132, see like named patch (Closes: 741600)
+  * Fix m4-macro for libsrvcore and add missing B-D on libpci-dev
+(Closes: #745821)
+
+ -- Tobias Frost   Fri, 25 Apr 2014 15:11:16 +0200
+
 389-ds-base (1.3.2.9-1) unstable; urgency=low
 
   * New upstream release.
diff -Nru 389-ds-base-1.3.2.9/debian/control 389-ds-base-1.3.2.9/debian/control
--- 389-ds-base-1.3.2.9/debian/control  2014-01-11 11:40:42.0 +0100
+++ 389-ds-base-1.3.2.9/debian/control  2014-04-25 16:37:03.0 +0200
@@ -22,6 +22,7 @@
  libperl-dev,
  libkrb5-dev,
  libpcre3-dev,
+ libpci-dev
 Standards-Version: 3.9.5
 Vcs-Git: git://git.debian.org/git/pkg-fedora-ds/389-ds-base.git
 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-fedora-ds/389-ds-base.git
diff -Nru 389-ds-base-1.3.2.9/debian/patches/CVE-2014-0132.patch 
389-ds-base-1.3.2.9/debian/patches/CVE-2014-0132.patch
--- 389-ds-base-1.3.2.9/debian/patches/CVE-2014-0132.patch  1970-01-01 
01:00:00.0 +0100
+++ 389-ds-base-1.3.2.9/debian/patches/CVE-2014-0132.patch  2014-04-25 
15:11:13.0 +0200
@@ -0,0 +1,49 @@
+--- a/ldap/servers/slapd/saslbind.c
 b/ldap/servers/slapd/saslbind.c
+@@ -229,34 +229,6 @@
+ return SASL_OK;
+ }
+ 
+-static int ids_sasl_proxy_policy(
+-sasl_conn_t *conn,
+-void *context,
+-const char *requested_user, int rlen,
+-const char *auth_identity, int alen,
+-const char *def_realm, int urlen,
+-struct propctx *propctx
+-)
+-{
+-int retVal = SASL_OK;
+-/* do not permit sasl proxy authorization */
+-/* if the auth_identity is null or empty string, allow the sasl request 
to go thru */
+-if ( (auth_identity != NULL ) && ( strlen(auth_identity) > 0 ) ) {
+-Slapi_DN authId , reqUser;
+-slapi_sdn_init_dn_byref(&authId,auth_identity);
+-slapi_sdn_init_dn_byref(&reqUser,requested_user);
+-if (slapi_sdn_compare((const Slapi_DN *)&reqUser,(const Slapi_DN *) 
&authId) != 0) {
+-LDAPDebug(LDAP_DEBUG_TRACE, 
+-  "sasl proxy auth not permitted authid=%s user=%s\n",
+-  auth_identity, requested_user, 0);
+-retVal =  SASL_NOAUTHZ;
+-}
+-slapi_sdn_done(&authId);
+-slapi_sdn_done(&reqUser); 
+-}
+-return retVal;
+-}
+-
+ static void ids_sasl_user_search(
+ char *basedn,
+ int scope,
+@@ -583,11 +555,6 @@
+   NULL
+ },
+ {
+-  SASL_CB_PROXY_POLICY,
+-  (IFP) ids_sasl_proxy_policy,
+-  NULL
+-},
+-{
+   SASL_CB_CANON_USER,
+   (IFP) ids_sasl_canon_user,
+   NULL
diff -Nru 389-ds-base-1.3.2.9/debian/patches/ftbs_lsoftotkn3.patch 
389-ds-base-1.3.2.9/debian/patches/ftbs_lsoftotkn3.patch
--- 389-ds-base-1.3.2.9/debian/patches/ftbs_lsoftotkn3.patch1970-01-01 
01:00:00.0 +0100
+++ 389-ds-base-1.3.2.9/debian/patches/ftbs_lsoftotkn3.patch2014-04-25 
16:17:53.0 +0200
@@ -0,0 +1,20 @@
+Description: Fix autoconf macro to detect svrcore properly
+ configure bails out with a linking error against libsoftokn, which is 
according
+ #473275 the correct behaviour. The patch modifies the m4 file to do not link
+ against this lib.
+Author: Tobias Frost 
+Forwarded: no
+Last-Update: 2014-04-25
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/m4/svrcore.m4
 b/m4/svrcore.m4
+@@ -96,7 +96,7 @@
+ if test -z "$svrcore_inc" -o -z "$svrcore_lib"; then
+ dnl just see if SVRCORE is already a system library
+   AC_CHECK_LIB([svrcore], [SVRCORE_GetRegisteredPinObj], [havesvrcore=1],
+- [], [$nss_inc $nspr_inc $nss_lib -lnss3 -lsoftokn3 $nspr_lib 
-lplds4 -lplc4 -lnspr4])
++ [], [$nss_inc $nspr_inc $nss_lib -lnss3 $nspr_lib -lplds4 -lplc4 
-lnspr4])
+   if test -n "$havesvrcore" ; then
+ dnl just see if SVRCORE is already a system header file
+ save_cppflags="$CPPFLAGS"
diff -Nru 389-ds-base-1.3.2.9/debian/patches/rename-online-scripts.diff 
389-ds-base-1.3.2.9/debian/patches/rename-online-scripts.diff
--- 389-ds-base-1.3.2.9/debian/patches/rename-online-scripts.diff   
2014-01-11 11:39:16.0 +0100
+++ 389-ds-base-1.3.2.9/debian/patches/rename-online-scripts.diff   
2014-04-25 15:11:03.0 +0200
@@ -1,8 +1,14 @@
-diff --git a/ldap/admin/src/scripts/template-bak2db.pl.in 
b/ldap/admin/src/scripts/template-bak2db.pl.in
-index 4c7bab8..a972878 100644
+Descrip

Bug#731018: smc: diff for NMU version 1.9+git20121121-1.1

2014-01-13 Thread tobi
tags 731018 + patch
tags 731018 + pending
thanks

Dear maintainer,

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

Regards.
diff -Nru smc-1.9+git20121121/debian/changelog 
smc-1.9+git20121121/debian/changelog
--- smc-1.9+git20121121/debian/changelog2013-06-16 16:46:22.0 
+0200
+++ smc-1.9+git20121121/debian/changelog2014-01-11 15:59:32.0 
+0100
@@ -1,3 +1,11 @@
+smc (1.9+git20121121-1.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Fix "boost 1.53 is going away" by removing versioned dependencies
+on boost libraries (Closes: #731018)
+
+ -- Tobias Frost   Sat, 11 Jan 2014 14:59:28 +
+
 smc (1.9+git20121121-1) unstable; urgency=low
 
   * New upstream snapshot.
diff -Nru smc-1.9+git20121121/debian/control smc-1.9+git20121121/debian/control
--- smc-1.9+git20121121/debian/control  2013-05-12 00:33:57.0 +0200
+++ smc-1.9+git20121121/debian/control  2014-01-11 15:42:06.0 +0100
@@ -6,8 +6,8 @@
debhelper (>= 9),
autotools-dev,
libcegui-mk2-dev (>= 0.6.2),
-   libboost-filesystem1.53-dev,
-   libboost-thread1.53-dev,
+   libboost-filesystem-dev,
+   libboost-thread-dev,
libsdl1.2-dev,
libsdl-image1.2-dev,
libsdl-mixer1.2-dev,


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



Bug#731019: cegui-mk2: diff for NMU version 0.7.6-3.1

2014-01-11 Thread tobi
tags 731019 + patch
tags 731019 + pending
thanks

Dear maintainer,

I've prepared an NMU for cegui-mk2 (versioned as 0.7.6-3.1) and
will ask my sponsor to uploaded it to DELAYED/5.
Please feel free to tell me if I should delay it longer.

Regards.
diff -Nru cegui-mk2-0.7.6/debian/changelog cegui-mk2-0.7.6/debian/changelog
--- cegui-mk2-0.7.6/debian/changelog2013-08-14 23:15:57.0 +0200
+++ cegui-mk2-0.7.6/debian/changelog2014-01-11 15:47:25.0 +0100
@@ -1,3 +1,11 @@
+cegui-mk2 (0.7.6-3.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Fix "boost 1.53 is going away" Removing versioned dependencies
+(Closes: #731019)
+
+ -- Tobias Frost   Sat, 11 Jan 2014 14:47:21 +
+
 cegui-mk2 (0.7.6-3) unstable; urgency=low
 
   * Bump Standards-Version to 3.9.4.
diff -Nru cegui-mk2-0.7.6/debian/control cegui-mk2-0.7.6/debian/control
--- cegui-mk2-0.7.6/debian/control  2013-08-14 23:14:50.0 +0200
+++ cegui-mk2-0.7.6/debian/control  2014-01-11 15:12:08.0 +0100
@@ -3,8 +3,8 @@
 Priority: optional
 Maintainer: Muammar El Khatib 
 Build-Depends: debhelper (>= 6), cdbs, libtool, automake1.9, autoconf,
-   pkg-config, libxerces-c-dev, libboost-signals1.53-dev,
-   libboost-regex1.53-dev, libfreetype6-dev, liblcms1-dev,
+   pkg-config, libxerces-c-dev, libboost-signals-dev,
+   libboost-regex-dev, libfreetype6-dev, liblcms1-dev,
libtiff-dev, libgl1-mesa-dev, libglu1-mesa-dev, libdevil-dev,
libpcre3-dev, liblua5.1-dev, lua5.1, libois-dev [linux-any],
libfreeimage-dev, libxcursor-dev, libxpm-dev, python-dev,


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



Bug#721271: python-drizzle: diff for NMU version 1.0-3.2

2013-08-30 Thread tobi
tags 721271 + patch
tags 721271 + pending
thanks

Dear maintainer,

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

Regards.
diff -Nru python-drizzle-1.0/debian/changelog 
python-drizzle-1.0/debian/changelog
--- python-drizzle-1.0/debian/changelog 2012-04-30 10:16:47.0 +0200
+++ python-drizzle-1.0/debian/changelog 2013-08-30 14:54:42.0 +0200
@@ -1,3 +1,10 @@
+python-drizzle (1.0-3.2) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Add B-D on libssl-dev" (Closes: #721271)
+
+ -- Tobias Frost   Fri, 30 Aug 2013 14:54:09 +0200
+
 python-drizzle (1.0-3.1) unstable; urgency=low
 
   * Non-maintainer upload.


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



Bug#691929: libapache2-mod-fcgid: diff for NMU version 1:2.3.6-1.2

2012-11-18 Thread tobi
tags 691929 + pending
thanks

Dear maintainer,

I've prepared an NMU for libapache2-mod-fcgid (versioned as 1:2.3.6-1.2) and
asked my sponsor to uploaded it to DELAYED/10. Please feel free to tell me if I
should delay it longer.

Regards.
diff -u libapache2-mod-fcgid-2.3.6/debian/changelog 
libapache2-mod-fcgid-2.3.6/debian/changelog
--- libapache2-mod-fcgid-2.3.6/debian/changelog
+++ libapache2-mod-fcgid-2.3.6/debian/changelog
@@ -1,3 +1,12 @@
+libapache2-mod-fcgid (1:2.3.6-1.2) UNRELEASED; urgency=low
+
+  * Non-maintainer upload.
+  * Fix "mod_fcgid: requests with chunked encoding have no body
+available to FCGI backend": Applied upstream patch
+(Closes: #691929)
+
+ -- Tobias Frost   Sun, 18 Nov 2012 18:33:32 +0100
+
 libapache2-mod-fcgid (1:2.3.6-1.1) unstable; urgency=low
 
   * Non-maintainer upload.
diff -u libapache2-mod-fcgid-2.3.6/debian/patches/00list 
libapache2-mod-fcgid-2.3.6/debian/patches/00list
--- libapache2-mod-fcgid-2.3.6/debian/patches/00list
+++ libapache2-mod-fcgid-2.3.6/debian/patches/00list
@@ -2,0 +3 @@
+30_fix-bts-691929.patch
only in patch2:
unchanged:
--- libapache2-mod-fcgid-2.3.6.orig/debian/patches/30_fix-bts-691929.patch
+++ libapache2-mod-fcgid-2.3.6/debian/patches/30_fix-bts-691929.patch
@@ -0,0 +1,70 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## Description: Patch to set CONTENT_LENGTH FCGI params based on actual 
request body
+## Author: Dominic Benson
+## Bug: https://issues.apache.org/bugzilla/show_bug.cgi?id=53332
+
+
+@DPATCH@
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' 
'--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' 
libapache2-mod-fcgid-2.3.6~/modules/fcgid/fcgid_spawn_ctl.c 
libapache2-mod-fcgid-2.3.6/modules/fcgid/fcgid_spawn_ctl.c
+--- mod_fcgid-2.3.6.orig/modules/fcgid/fcgid_bridge.c  2012-05-30 
09:53:20.928783540 +0100
 mod_fcgid-2.3.6/modules/fcgid/fcgid_bridge.c   2012-05-30 
18:04:01.648850877 +0100
+@@ -662,6 +662,11 @@ static int add_request_body(request_rec
+ apr_brigade_destroy(input_brigade);
+ apr_brigade_destroy(tmp_brigade);
+ 
++char sizestr[21];
++apr_snprintf(sizestr, sizeof sizestr, "%" APR_OFF_T_FMT, request_size);
++apr_table_set(r->subprocess_env, "CONTENT_LENGTH", sizestr);
++apr_table_unset(r->subprocess_env, "HTTP_TRANSFER_ENCODING");
++
+ /* Append an empty body stdin header */
+ stdin_request_header = apr_bucket_alloc(sizeof(FCGI_Header),
+ r->connection->bucket_alloc);
+@@ -682,31 +687,37 @@ static int add_request_body(request_rec
+ int bridge_request(request_rec * r, int role, fcgid_cmd_conf *cmd_conf)
+ {
+ apr_bucket_brigade *output_brigade;
++apr_bucket_brigade *header_brigade;
+ apr_bucket *bucket_eos;
+-char **envp = ap_create_environment(r->pool,
+-r->subprocess_env);
+ int rc;
+ 
+ /* Create brigade for the request to fastcgi server */
+ output_brigade =
+ apr_brigade_create(r->pool, r->connection->bucket_alloc);
++header_brigade =
++apr_brigade_create(r->pool, r->connection->bucket_alloc);
++
++if (role == FCGI_RESPONDER) {
++rc = add_request_body(r, r->pool, output_brigade);
++if (rc) {
++return rc;
++}
++}
++
++char **envp = ap_create_environment(r->pool,
++r->subprocess_env);
+ 
+ /* Build the begin request and environ request, append them to 
output_brigade */
+ if (!build_begin_block
+-(role, r, r->connection->bucket_alloc, output_brigade)
++(role, r, r->connection->bucket_alloc, header_brigade)
+ || !build_env_block(r, envp, r->connection->bucket_alloc,
+-output_brigade)) {
++header_brigade)) {
+ ap_log_rerror(APLOG_MARK, APLOG_WARNING, 0, r,
+   "mod_fcgid: can't build begin or env request");
+ return HTTP_INTERNAL_SERVER_ERROR;
+ }
+ 
+-if (role == FCGI_RESPONDER) {
+-rc = add_request_body(r, r->pool, output_brigade);
+-if (rc) {
+-return rc;
+-}
+-}
++APR_BRIGADE_PREPEND(output_brigade,header_brigade);
+ 
+ /* The eos bucket now */
+ bucket_eos = apr_bucket_eos_create(r->connection->bucket_alloc);


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



Bug#691271: lvm2: diff for NMU version 2.02.95-4.1

2012-11-18 Thread tobi
Am Sonntag, den 18.11.2012, 13:52 +0100 schrieb Bastian Blank:
On Sun, Nov 18, 2012 at 12:27:12PM +0100, t...@coldtobi.de wrote:
> > I've prepared an NMU for lvm2 (versioned as 2.02.95-4.1) and
> > will be uploaded via my sponsor to DELAYED/5. Please feel free to tell me 
> > if I
> > should delay it longer.
>
> How does this work without any change except of the changelog? Or is the
> patch incomplete?
>
> Bastian
> 
No, of course not.
It seems, that I was unable to use nmudiff properly ...
However, lets retry:

diff -Nru lvm2-2.02.95/debian/changelog lvm2-2.02.95/debian/changelog
--- lvm2-2.02.95/debian/changelog   2012-05-27 19:05:43.0 +0200
+++ lvm2-2.02.95/debian/changelog   2012-11-18 12:29:14.0 +0100
@@ -1,3 +1,11 @@
+lvm2 (2.02.95-4.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Fix "Losing data when moving LV between regular HD -> SSD"
+Applied upstream patch (from 2.02.97) (Closes: #691271)
+
+ -- Tobias Frost   Sun, 18 Nov 2012 12:12:22 +0100
+
 lvm2 (2.02.95-4) unstable; urgency=low
 
   * Force building with -j1.
diff -Nru lvm2-2.02.95/debian/patches/lvm-patch-691271.patch 
lvm2-2.02.95/debian/patches/lvm-patch-691271.patch
--- lvm2-2.02.95/debian/patches/lvm-patch-691271.patch  1970-01-01 
01:00:00.0 +0100
+++ lvm2-2.02.95/debian/patches/lvm-patch-691271.patch  2012-11-18 
11:43:09.0 +0100
@@ -0,0 +1,280 @@
+# Subject: pmmove leads to data-loss when used with issue_discards=1
+# Bug: https://bugzilla.redhat.com/show_bug.cgi?id=832392
+# Origin: 
https://lists.fedorahosted.org/pipermail/lvm2-commits/2012-June/37.html
+#  https://lists.fedorahosted.org/pipermail/lvm2-commits/2012-June/38.html
+#  https://lists.fedorahosted.org/pipermail/lvm2-commits/2012-June/39.html
+# Applied-Upstream: lvm2-2.02.97-2
+--- a/lib/metadata/lv_alloc.h
 b/lib/metadata/lv_alloc.h
+@@ -40,8 +40,9 @@
+  uint64_t status);
+ int move_lv_segment_area(struct lv_segment *seg_to, uint32_t area_to,
+struct lv_segment *seg_from, uint32_t area_from);
+-void release_lv_segment_area(struct lv_segment *seg, uint32_t s,
+-   uint32_t area_reduction);
++int release_lv_segment_area(struct lv_segment *seg, uint32_t s,
++  uint32_t area_reduction);
++int release_and_discard_lv_segment_area(struct lv_segment *seg, uint32_t s, 
uint32_t area_reduction);
+ 
+ struct alloc_handle;
+ struct alloc_handle *allocate_extents(struct volume_group *vg,
+--- a/lib/metadata/lv_manip.c
 b/lib/metadata/lv_manip.c
+@@ -299,24 +299,30 @@
+   return seg;
+ }
+ 
+-void release_lv_segment_area(struct lv_segment *seg, uint32_t s,
+-   uint32_t area_reduction)
++static int _release_and_discard_lv_segment_area(struct lv_segment *seg, 
uint32_t s,
++  uint32_t area_reduction, int 
with_discard)
+ {
+   if (seg_type(seg, s) == AREA_UNASSIGNED)
+-  return;
++  return 1;
+ 
+   if (seg_type(seg, s) == AREA_PV) {
+-  if (release_pv_segment(seg_pvseg(seg, s), area_reduction) &&
+-  seg->area_len == area_reduction)
++  if (with_discard && !discard_pv_segment(seg_pvseg(seg, s), 
area_reduction))
++  return_0;
++
++  if (!release_pv_segment(seg_pvseg(seg, s), area_reduction))
++  return_0;
++
++  if (seg->area_len == area_reduction)
+   seg_type(seg, s) = AREA_UNASSIGNED;
+-  return;
++
++  return 1;
+   }
+ 
+   if ((seg_lv(seg, s)->status & MIRROR_IMAGE) ||
+   (seg_lv(seg, s)->status & THIN_POOL_DATA)) {
+   if (!lv_reduce(seg_lv(seg, s), area_reduction))
+-  stack; /* FIXME: any upper level reporting */
+-  return;
++  return_0; /* FIXME: any upper level reporting */
++  return 1;
+   }
+ 
+   if (seg_lv(seg, s)->status & RAID_IMAGE) {
+@@ -328,12 +334,12 @@
+   */
+   if (area_reduction != seg->area_len) {
+   log_error("Unable to reduce RAID LV - operation not 
implemented.");
+-  return;
++  return_0;
+   } else {
+   if (!lv_remove(seg_lv(seg, s))) {
+   log_error("Failed to remove RAID image %s",
+ seg_lv(seg, s)->name);
+-  return;
++  return 0;
+   }
+   }
+ 
+@@ -343,10 +349,10 @@
+  seg_metalv(seg, s)->le_count)) {
+   log_error("Failed to remove RAID meta-device 
%s",
+ seg_metalv(seg, s)->name);
+-  return;
++  r

Bug#691271: lvm2: diff for NMU version 2.02.95-4.1

2012-11-18 Thread tobi
Update: s/UNRELEASED/unstable.

diff -Nru lvm2-2.02.95/debian/changelog lvm2-2.02.95/debian/changelog
--- lvm2-2.02.95/debian/changelog   2012-05-27 19:05:43.0 +0200
+++ lvm2-2.02.95/debian/changelog   2012-11-18 12:29:14.0 +0100
@@ -1,3 +1,11 @@
+lvm2 (2.02.95-4.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Fix "Losing data when moving LV between regular HD -> SSD"
+Applied upstream patch (from 2.02.97) (Closes: #691271)
+
+ -- Tobias Frost   Sun, 18 Nov 2012 12:12:22 +0100
+
 lvm2 (2.02.95-4) unstable; urgency=low
 
   * Force building with -j1.


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



Bug#691271: lvm2: diff for NMU version 2.02.95-4.1

2012-11-18 Thread tobi
tags 691271 + pending
thanks

Dear maintainer,

I've prepared an NMU for lvm2 (versioned as 2.02.95-4.1) and
will be uploaded via my sponsor to DELAYED/5. Please feel free to tell me if I
should delay it longer.

Regards.
diff -Nru lvm2-2.02.95/debian/changelog lvm2-2.02.95/debian/changelog
--- lvm2-2.02.95/debian/changelog   2012-05-27 19:05:43.0 +0200
+++ lvm2-2.02.95/debian/changelog   2012-11-18 12:15:47.0 +0100
@@ -1,3 +1,11 @@
+lvm2 (2.02.95-4.1) UNRELEASED; urgency=low
+
+  * Non-maintainer upload.
+  * Fix "Losing data when moving LV between regular HD -> SSD"
+Applied upstream patch (from 2.02.97) (Closes: #691271)
+
+ -- Tobias Frost   Sun, 18 Nov 2012 12:12:22 +0100
+
 lvm2 (2.02.95-4) unstable; urgency=low
 
   * Force building with -j1.


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



Bug#664927: python-drizzle: diff for NMU version 1.0-3.1

2012-04-30 Thread tobi
tags 664927 + patch
tags 664927 + pending
thanks

Dear maintainer,

I've prepared an NMU for python-drizzle (versioned as 1.0-3.1) and
I will upload it (via sponsor) to DELAYED/5. Please feel free to tell me if I
should delay it longer.

Regards.
diff -Nru python-drizzle-1.0/debian/changelog 
python-drizzle-1.0/debian/changelog
--- python-drizzle-1.0/debian/changelog 2011-10-02 12:25:06.0 +0200
+++ python-drizzle-1.0/debian/changelog 2012-04-30 10:16:47.0 +0200
@@ -1,3 +1,13 @@
+python-drizzle (1.0-3.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Fix "FTBFS: interface/globals.i:82: Error: Unable to find
+'libdrizzle/constants.h'" Changed include paths for libdrizzle from
+libdrizzle/ to libdrizzle-1.0/
+(Closes: #664927)
+
+ -- Tobias Frost   Mon, 30 Apr 2012 10:15:33 +0200
+
 python-drizzle (1.0-3) unstable; urgency=medium
 
   * Team upload.



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



Bug#665363: sqlite3: diff for NMU version 3.7.11-2.1

2012-04-30 Thread tobi
tags 665363 + pending
thanks

[Replace XX with correct value]
Dear maintainer,

I've prepared an NMU for sqlite3 (versioned as 3.7.11-2.1) and
will upload (via sponsor) to DELAYED/10. Please feel free to tell me if I
should delay it longer.

Regards.
diff -Nru sqlite3-3.7.11/debian/changelog sqlite3-3.7.11/debian/changelog
--- sqlite3-3.7.11/debian/changelog 2012-03-22 02:09:32.0 +0100
+++ sqlite3-3.7.11/debian/changelog 2012-04-30 09:52:26.0 +0200
@@ -1,3 +1,12 @@
+sqlite3 (3.7.11-2.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Fix "[3.7.9-3 -> 3.7.10-1 regression] free(): invalid pointer"
+Apply patch from Stevwen Chamberlain to disable HAVE_MALLOC_USABLE_SIZE
+(Closes: #665363)
+
+ -- Tobias Frost   Mon, 30 Apr 2012 09:51:35 +0200
+
 sqlite3 (3.7.11-2) unstable; urgency=low
 
   * Fix pkgIndex.tcl generation for multi-arch.



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



Bug#620647: kumofs: diff for NMU version 0.4.13-1.1

2012-03-24 Thread tobi
tags 620647 + patch
tags 620647 + pending
tags 640602 + patch
tags 640602 + pending
thanks

Dear maintainer,

I've prepared an NMU for kumofs (versioned as 0.4.13-1.1) and will ask my 
sponsor to
uploaded it to the DELAYED queue.

Regards.
diff -Nru kumofs-0.4.13/debian/changelog kumofs-0.4.13/debian/changelog
--- kumofs-0.4.13/debian/changelog  2011-02-19 05:11:27.0 +0100
+++ kumofs-0.4.13/debian/changelog  2012-03-24 17:40:45.0 +0100
@@ -1,3 +1,13 @@
+kumofs (0.4.13-1.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Add B-D on libmsgpack-ruby1.8 and libmsgpack-ruby1.9 to avoid building on
+archs where those packages are not installable. (Closes: 620647)
+  * Fix "installation fails: detects changed config file": Do not install
+/etc/default/kumofs, as it is generated during install (Closes: #640602)
+
+ -- Tobias Frost   Sat, 24 Mar 2012 17:39:16 +0100
+
 kumofs (0.4.13-1) unstable; urgency=low
 
   * New upstream release
diff -Nru kumofs-0.4.13/debian/control kumofs-0.4.13/debian/control
--- kumofs-0.4.13/debian/control2010-11-13 17:15:04.0 +0100
+++ kumofs-0.4.13/debian/control2012-03-24 17:24:06.0 +0100
@@ -2,7 +2,7 @@
 Section: misc
 Priority: extra
 Maintainer: Taku YASUI 
-Build-Depends: cdbs, debhelper (>= 7.0.50~), dpatch, po-debconf, 
autotools-dev, zlib1g-dev, libssl-dev, libmsgpack-dev, libtokyocabinet-dev, 
chrpath
+Build-Depends: cdbs, debhelper (>= 7.0.50~), dpatch, po-debconf, 
autotools-dev, zlib1g-dev, libssl-dev, libmsgpack-dev, libtokyocabinet-dev, 
chrpath, libmsgpack-ruby1.8, libmsgpack-ruby1.9.1
 Standards-Version: 3.9.1
 Homepage: http://kumofs.sourceforge.net/
 #Vcs-Git: git://git.debian.org/collab-maint/kumofs.git
diff -Nru kumofs-0.4.13/debian/default kumofs-0.4.13/debian/default
--- kumofs-0.4.13/debian/default2010-09-05 18:50:17.0 +0200
+++ kumofs-0.4.13/debian/default1970-01-01 01:00:00.0 +0100
@@ -1,6 +0,0 @@
-# Defaults for kumofs initscript
-# sourced by /etc/init.d/kumofs
-# installed at /etc/default/kumofs by the maintainer scripts
-
-###DO_NOT_EDIT_BELOW_THIS_LINE_DEBCONF###
-###DO_NOT_EDIT_ABOVE_THIS_LINE_DEBCONF###



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