Please sponsor amule upload

[Evan]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

 affects ubuntu/amule
 subscribe ubuntu-universe-sponsors

diff -u amule-2.1.3/debian/control amule-2.1.3/debian/control
- --- amule-2.1.3/debian/control
+++ amule-2.1.3/debian/control
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Ubuntu MOTU Developers <email address hidden>
 XSBC-Original-Maintainer: Adeodato Simó <email address hidden>
- -Build-Depends: autotools-dev, debhelper, quilt, libglib2.0-dev, zlib1g-dev, libgd2-xpm-dev, libreadline5-dev, libcrypto++-dev, libwxgtk2.8-dev, wx2.8-i18n
+Build-Depends: autotools-dev, debhelper, quilt, libglib2.0-dev, zlib1g-dev, libgd2-xpm-dev, libpng12-dev, libreadline5-dev, libcrypto++-dev, libwxgtk2.8-dev, wx2.8-i18n
 Standards-Version: 3.7.2
 XS-VCS-Bzr: http://people.debian.org/~adeodato/code/packages/amule

diff -u amule-2.1.3/debian/changelog amule-2.1.3/debian/changelog
- --- amule-2.1.3/debian/changelog
+++ amule-2.1.3/debian/changelog
@@ -1,3 +1,29 @@
+amule (2.1.3-3ubuntu1) gutsy; urgency=low
+
+ [ Evan Dandrea ]
+ * Merge from Debian unstable. Remaining Ubuntu changes:
+ - Continue to use the wx-2.8 patch.
+
+ -- Evan Dandrea <email address hidden> Wed, 30 May 2007 14:30:47 -0400
+
+amule (2.1.3-3) unstable; urgency=low
+
+ * The "Let's pretend it never happened" release.
+
+ * Drop the just introduced patch unconditional_global_search.diff, because
+ upstream thinks it's a very bad idea.
+
+ * Patch acinclude.m4 to cope with libpng versions that are not X.Y.Z, like
+ the current 1.2.15beta5. This makes amuleweb link against libpng12 again,
+ enabling the generation of download progress bar images. Thanks to Emilio
+ Pozuelo Monfort for the heads-up. (Closes: #424774)
+
+ * Add libpng12-dev to Build-Depends.
+
+ * Use quilt.make.
+
+ -- Adeodato Simó <email address hidden> Sun, 20 May 2007 12:32:45 +0200
+
 amule (2.1.3-2ubuntu1) gutsy; urgency=low

   * Merge with Debian, remaining Ubuntu changes:
diff -u amule-2.1.3/debian/rules amule-2.1.3/debian/rules
- --- amule-2.1.3/debian/rules
+++ amule-2.1.3/debian/rules
@@ -1,5 +1,7 @@
 #! /usr/bin/make -f

+include /usr/share/quilt/quilt.make
+
 ###

 # Configure arguments
@@ -40,15 +42,12 @@

 ###

- -$(objdir)/config.status: configure
+$(objdir)/config.status: configure $(QUILT_STAMPFN)
  dh_testdir

  ln -sf /usr/share/misc/config.sub .
  ln -sf /usr/share/misc/config.guess .

- - ln -sf debian/patches
- - quilt --quiltrc /dev/null push -a || test $$? = 2
- -
  ln -sf debian/amule-32.xpm amule.xpm

  -mkdir $(objdir)
@@ -70,14 +69,10 @@

 #

- -clean:
+clean: unpatch
  dh_testdir
  dh_testroot

- - quilt --quiltrc /dev/null pop -a -R || test $$? = 2
- - rm -rf .pc
- - rm -f patches
- -
  rm -f build-stamp install-stamp
  rm -f config.guess config.sub

diff -u amule-2.1.3/debian/patches/series amule-2.1.3/debian/patches/series
- --- amule-2.1.3/debian/patches/series
+++ amule-2.1.3/debian/patches/series
@@ -1,4 +1,5 @@
 configure_ignore_gdlib-config_garbage.diff -p0
+configure_proper_libpng_detection.diff -p0
 cas_configfile.c_good_default_paths.diff -p0
 for_upstream-manpage_typos.diff -p0
 wx-2.8.diff -p1
reverted:
- --- amule-2.1.3/debian/patches/unconditional_global_search.diff
+++ amule-2.1.3.orig/debian/patches/unconditional_global_search.diff
@@ -1,16 +0,0 @@
- ---- src/SearchDlg.cpp.orig
- -+++ src/SearchDlg.cpp
- -@@ -112,12 +112,7 @@
- - wxASSERT(CastChild( ID_SEARCHTYPE, wxChoice )->GetString(0) == _("Local Search"));
- - wxASSERT(CastChild( ID_SEARCHTYPE, wxChoice )->GetString(2) == _("Kad"));
- -
- -- if (thePrefs::GetNetworkED2K()){
- -- CastChild( ID_SEARCHTYPE, wxChoice )->SetSelection(0);
- -- } else {
- -- CastChild( ID_SEARCHTYPE, wxChoice )->SetSelection(2);
- -- }
- --
- -+ CastChild( ID_SEARCHTYPE, wxChoice )->SetSelection(1);
- - CastChild( IDC_TypeSearch, wxChoice )->SetSelection(0);
- - CastChild( IDC_SEARCHMINSIZE, wxChoice )->SetSelection(2);
- - CastChild( IDC_SEARCHMAXSIZE, wxChoice )->SetSelection(2);
only in patch2:
unchanged:
- --- amule-2.1.3.orig/debian/patches/configure_proper_libpng_detection.diff
+++ amule-2.1.3/debian/patches/configure_proper_libpng_detection.diff
@@ -0,0 +1,34 @@
+--- acinclude.m4.orig
++++ acinclude.m4
+@@ -258,11 +258,11 @@
+
+ LIBPNG_VERSION=`$LIBPNG_CONFIG_WITH_ARGS --version`
+ libpng_config_major_version=`echo $LIBPNG_VERSION | \
+- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
++ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\).*/\1/'`
+ libpng_config_minor_version=`echo $LIBPNG_VERSION | \
+- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
++ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\).*/\2/'`
+ libpng_config_micro_version=`echo $LIBPNG_VERSION | \
+- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
++ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\).*/\3/'`
+
+ libpng_requested_major_version=`echo $min_libpng_version | \
+ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
+--- configure.orig
++++ configure
+@@ -6917,11 +6917,11 @@
+
+ LIBPNG_VERSION=`$LIBPNG_CONFIG_WITH_ARGS --version`
+ libpng_config_major_version=`echo $LIBPNG_VERSION | \
+- sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'`
++ sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\).*/\1/'`
+ libpng_config_minor_version=`echo $LIBPNG_VERSION | \
+- sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\2/'`
++ sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\).*/\2/'`
+ libpng_config_micro_version=`echo $LIBPNG_VERSION | \
+- sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\3/'`
++ sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\).*/\3/'`
+
+ libpng_requested_major_version=`echo $min_libpng_version | \
+ sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'`

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.6 (GNU/Linux)

iD8DBQFGXdD1YMSoESsJNnsRArpIAKCFlPLFn1wisV+ch+S5+jZ4/JbURwCfTXzR
kP0eQ8Z7QWiT7sadKa4NGwI=
=Nkmc
-----END PGP SIGNATURE-----

[Emilio Pozuelo Monfort (pochu)]

Evan,

You should also add the "Use a better icon" entry in the changelog" (and the Debian Maintainer Field, as a new contributor may look at it).

Also, it would be easier for the sponsors if you attach the diff, instead of pasting it (though I'm not an sponsor ;)

Regards
Emilio

[Evan (ev)]

Ok, I think this fixes all of the mistakes that were pointed out. Thanks again for your help.

[Evan (ev)]

Attaching a debdiff between 2.1.3-2ubuntu1 and 2.1.3-3ubuntu1 as requested.

[Brandon Holtsclaw (imbrandon)]

uploaded