Bug#569245: wmaker: diff for NMU version 0.92.0-8.2

2010-04-07 Thread Alexander Reichle-Schmehl
tags 569245 + patch
thanks

Dear maintainer,

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

Regards.
diff -u wmaker-0.92.0/debian/rules wmaker-0.92.0/debian/rules
--- wmaker-0.92.0/debian/rules
+++ wmaker-0.92.0/debian/rules
@@ -194,7 +194,7 @@
 	  ltmain.sh
 	$(RM) $(IN_MAKEFILES) $(GEN_FILES)
 endif
-	dh_clean
+	dh_prep
 
 binary-indep: build
 #	dh_testdir -i
@@ -204,7 +204,7 @@
 binary-arch: build
 	dh_testdir -a
 	dh_testroot
-	dh_clean -a -k
+	dh_prep -a -k
 	dh_installdirs -a
 	debian/rules install-wmaker-stamp
 	debian/rules debian/$(LIBWRASTER)-dev.files
diff -u wmaker-0.92.0/debian/control wmaker-0.92.0/debian/control
--- wmaker-0.92.0/debian/control
+++ wmaker-0.92.0/debian/control
@@ -2,14 +2,15 @@
 Section: x11
 Priority: optional
 Maintainer: John H. Robinson, IV jaq...@debian.org
-Standards-Version: 3.8.0.1
-Build-Depends: debhelper (= 4), automake1.4, gettext, dctrl-tools, libfontconfig1-dev, libjpeg62-dev, libpng12-dev, libsm-dev, libtiff4-dev, libtool (= 2.2.6a), libgif-dev, libx11-dev, libxext-dev, libxft-dev, libxinerama-dev, libxkbfile-dev, libxpm-dev, libxt-dev, libxrender-dev, sharutils
+Standards-Version: 3.8.4
+Homepage: http://www.windowmaker.info/
+Build-Depends: debhelper (= 7), automake1.4, gettext, dctrl-tools, libfontconfig1-dev, libjpeg-dev, libpng12-dev, libsm-dev, libtiff4-dev, libtool (= 2.2.6a), libgif-dev, libx11-dev, libxext-dev, libxft-dev, libxinerama-dev, libxkbfile-dev, libxpm-dev, libxt-dev, libxrender-dev, sharutils
 
 Package: wmaker
 Architecture: any
 Section: x11
 Priority: optional
-Depends: ${shlibs:Depends}, cpp
+Depends: ${shlibs:Depends}, cpp, ${misc:Depends}
 Provides: x-window-manager
 Suggests: wmaker-data, menu, x11-apps, xosview, wterm | x-terminal-emulator
 Description: NeXTSTEP-like window manager for X
@@ -19,14 +20,12 @@
  managers. Its final goal is to produce a window manager that doesn't require
  editing of configuration files. Window Maker is fast and doesn't require tons
  of memory to run.
- .
-  Homepage: http://www.windowmaker.info/
 
 Package: libwmaker0-dev
 Architecture: any
 Section: libdevel
 Priority: optional
-Depends: libc6-dev, libx11-dev
+Depends: libc6-dev, libx11-dev, ${misc:Depends}
 Description: Static libraries and headers for Window Maker applications
  Contains libWMaker and header files, for building Window Maker aware
  applications.
@@ -35,7 +34,7 @@
 Architecture: any
 Section: libdevel
 Priority: optional
-Depends: libwraster3 (= ${Source-Version}), libc6-dev, libx11-dev, libxext-dev, libxpm-dev, libjpeg62-dev, libpng12-0-dev, libgif-dev, libtiff4-dev
+Depends: libwraster3 (= ${binary:Version}), libc6-dev, libx11-dev, libxext-dev, libxpm-dev, libjpeg-dev, libpng12-0-dev, libgif-dev, libtiff4-dev, ${misc:Depends}
 Provides: libwraster-dev
 Description: Static libraries and headers of Window Maker rasterizer
  Contains libwraster and header files, for manipulating and
@@ -45,7 +44,7 @@
 Architecture: any
 Section: libs
 Priority: optional
-Depends: ${shlibs:Depends}
+Depends: ${shlibs:Depends},  ${misc:Depends}
 Description: Shared libraries of Window Maker rasterizer
  Contains libwraster, for manipulating and rasterizing images.
 
@@ -53,7 +52,7 @@
 Architecture: any
 Section: libdevel
 Priority: optional
-Depends: libc6-dev, libx11-dev, libxext-dev, libwraster3-dev, libxft-dev, libfontconfig1-dev
+Depends: libc6-dev, libx11-dev, libxext-dev, libwraster3-dev, libxft-dev, libfontconfig1-dev, ${misc:Depends}
 Description: Window Maker's own widget set
  WINGs Is Not GNUstep (WINGs) is a small widget set with the NeXTSTEP
  look and feel. Its API is inspired in OpenSTEP and its
diff -u wmaker-0.92.0/debian/changelog wmaker-0.92.0/debian/changelog
--- wmaker-0.92.0/debian/changelog
+++ wmaker-0.92.0/debian/changelog
@@ -1,3 +1,19 @@
+wmaker (0.92.0-8.2) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Fix please depend on libjpeg-dev, not libjpeg62-dev: change
+build-dependency and dependency. (Closes: #569245)
+  * Bump to standard version 3.8.4, adjusted following lintian warnings:
+- debhelper-but-no-misc-depends
+- dh-clean-k-is-deprecated
+- package-lacks-versioned-build-depends-on-debhelper 7
+- substvar-source-version-is-deprecated
+- description-contains-homepage	
+Overridden the following lintian error:
+- menu-method-should-include-menu-h
+
+ -- Karl Ferdinand Ebert kfeb...@gmail.com  Tue, 23 Feb 2010 09:31:49 +0100
+
 wmaker (0.92.0-8.1) unstable; urgency=low
 
   * Non-maintainer upload.
diff -u wmaker-0.92.0/debian/wmaker.overrides wmaker-0.92.0/debian/wmaker.overrides
--- wmaker-0.92.0/debian/wmaker.overrides
+++ wmaker-0.92.0/debian/wmaker.overrides
@@ -5,0 +6 @@
+wmaker: menu-method-should-include-menu-h etc/menu-methods/wmappearance
only in patch2:
unchanged:
--- wmaker-0.92.0.orig/debian/wmaker.debhelper.log
+++ wmaker-0.92.0/debian/wmaker.debhelper.log
@@ -0,0 

Bug#569245: wmaker: diff for NMU version 0.92.0-8.2

2010-02-23 Thread Karl Ferdinand Ebert
tags 569245 + patch
thanks

Dear maintainer,

I've prepared an NMU for wmaker (versioned as 0.92.0-8.2) and
uploaded it to mentors.debian.net. It fixes the bug and adoptes a newer 
standard version.

Regards.
diff -u wmaker-0.92.0/debian/rules wmaker-0.92.0/debian/rules
--- wmaker-0.92.0/debian/rules
+++ wmaker-0.92.0/debian/rules
@@ -194,7 +194,7 @@
  ltmain.sh
$(RM) $(IN_MAKEFILES) $(GEN_FILES)
 endif
-   dh_clean
+   dh_prep
 
 binary-indep: build
 #  dh_testdir -i
@@ -204,7 +204,7 @@
 binary-arch: build
dh_testdir -a
dh_testroot
-   dh_clean -a -k
+   dh_prep -a -k
dh_installdirs -a
debian/rules install-wmaker-stamp
debian/rules debian/$(LIBWRASTER)-dev.files
diff -u wmaker-0.92.0/debian/control wmaker-0.92.0/debian/control
--- wmaker-0.92.0/debian/control
+++ wmaker-0.92.0/debian/control
@@ -2,14 +2,15 @@
 Section: x11
 Priority: optional
 Maintainer: John H. Robinson, IV jaq...@debian.org
-Standards-Version: 3.8.0.1
-Build-Depends: debhelper (= 4), automake1.4, gettext, dctrl-tools, 
libfontconfig1-dev, libjpeg62-dev, libpng12-dev, libsm-dev, libtiff4-dev, 
libtool (= 2.2.6a), libgif-dev, libx11-dev, libxext-dev, libxft-dev, 
libxinerama-dev, libxkbfile-dev, libxpm-dev, libxt-dev, libxrender-dev, 
sharutils
+Standards-Version: 3.8.4
+Homepage: http://www.windowmaker.info/
+Build-Depends: debhelper (= 7), automake1.4, gettext, dctrl-tools, 
libfontconfig1-dev, libjpeg-dev, libpng12-dev, libsm-dev, libtiff4-dev, 
libtool (= 2.2.6a), libgif-dev, libx11-dev, libxext-dev, libxft-dev, 
libxinerama-dev, libxkbfile-dev, libxpm-dev, libxt-dev, libxrender-dev, 
sharutils
 
 Package: wmaker
 Architecture: any
 Section: x11
 Priority: optional
-Depends: ${shlibs:Depends}, cpp
+Depends: ${shlibs:Depends}, cpp, ${misc:Depends}
 Provides: x-window-manager
 Suggests: wmaker-data, menu, x11-apps, xosview, wterm | x-terminal-emulator
 Description: NeXTSTEP-like window manager for X
@@ -19,14 +20,12 @@
  managers. Its final goal is to produce a window manager that doesn't require
  editing of configuration files. Window Maker is fast and doesn't require 
tons
  of memory to run.
- .
-  Homepage: http://www.windowmaker.info/
 
 Package: libwmaker0-dev
 Architecture: any
 Section: libdevel
 Priority: optional
-Depends: libc6-dev, libx11-dev
+Depends: libc6-dev, libx11-dev, ${misc:Depends}
 Description: Static libraries and headers for Window Maker applications
  Contains libWMaker and header files, for building Window Maker aware
  applications.
@@ -35,7 +34,7 @@
 Architecture: any
 Section: libdevel
 Priority: optional
-Depends: libwraster3 (= ${Source-Version}), libc6-dev, libx11-dev, libxext-
dev, libxpm-dev, libjpeg62-dev, libpng12-0-dev, libgif-dev, libtiff4-dev
+Depends: libwraster3 (= ${binary:Version}), libc6-dev, libx11-dev, libxext-
dev, libxpm-dev, libjpeg-dev, libpng12-0-dev, libgif-dev, libtiff4-dev, 
${misc:Depends}
 Provides: libwraster-dev
 Description: Static libraries and headers of Window Maker rasterizer
  Contains libwraster and header files, for manipulating and
@@ -45,7 +44,7 @@
 Architecture: any
 Section: libs
 Priority: optional
-Depends: ${shlibs:Depends}
+Depends: ${shlibs:Depends},  ${misc:Depends}
 Description: Shared libraries of Window Maker rasterizer
  Contains libwraster, for manipulating and rasterizing images.
 
@@ -53,7 +52,7 @@
 Architecture: any
 Section: libdevel
 Priority: optional
-Depends: libc6-dev, libx11-dev, libxext-dev, libwraster3-dev, libxft-dev, 
libfontconfig1-dev
+Depends: libc6-dev, libx11-dev, libxext-dev, libwraster3-dev, libxft-dev, 
libfontconfig1-dev, ${misc:Depends}
 Description: Window Maker's own widget set
  WINGs Is Not GNUstep (WINGs) is a small widget set with the NeXTSTEP
  look and feel. Its API is inspired in OpenSTEP and its
diff -u wmaker-0.92.0/debian/changelog wmaker-0.92.0/debian/changelog
--- wmaker-0.92.0/debian/changelog
+++ wmaker-0.92.0/debian/changelog
@@ -1,3 +1,19 @@
+wmaker (0.92.0-8.2) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Fix please depend on libjpeg-dev, not libjpeg62-dev: change
+build-dependency and dependency. (Closes: #569245)
+  * Bump to standard version 3.8.4, adjusted following lintian warnings:
+- debhelper-but-no-misc-depends
+- dh-clean-k-is-deprecated
+- package-lacks-versioned-build-depends-on-debhelper 7
+- substvar-source-version-is-deprecated
+- description-contains-homepage
+Overridden the following lintian error:
+- menu-method-should-include-menu-h
+
+ -- Karl Ferdinand Ebert kfeb...@gmail.com  Tue, 23 Feb 2010 09:31:49 +0100
+
 wmaker (0.92.0-8.1) unstable; urgency=low
 
   * Non-maintainer upload.
diff -u wmaker-0.92.0/debian/wmaker.overrides 
wmaker-0.92.0/debian/wmaker.overrides
--- wmaker-0.92.0/debian/wmaker.overrides
+++ wmaker-0.92.0/debian/wmaker.overrides
@@ -5,0 +6 @@
+wmaker: menu-method-should-include-menu-h etc/menu-methods/wmappearance
only in patch2:
unchanged:
---