Ralph Janke <[EMAIL PROTECTED]> writes:
> This is a corrected debdiff. The first one did not create 100% right
>
> Thanks
>
> diff -u search-ccsb-0.5/debian/control search-ccsb-0.5/debian/control
> --- search-ccsb-0.5/debian/control
> +++ search-ccsb-0.5/debian/control
> @@ -1,9 +1,10 @@
> Source: search-ccsb
> Section: tex
> Priority: optional
> -Maintainer: Otavio Salvador <[EMAIL PROTECTED]>
> -Build-Depends-Indep: debhelper (>= 4)
> -Standards-Version: 3.6.1
> +Maintainer: Ubuntu MOTU Developers <[EMAIL PROTECTED]>
> +XSBC-Original-Maintainer: Otavio Salvador <[EMAIL PROTECTED]>
Please drop these changes.
> +Build-Depends: debhelper (>= 4)
> +Standards-Version: 3.7.3
>
> Package: search-ccsb
> Architecture: all
> diff -u search-ccsb-0.5/debian/rules search-ccsb-0.5/debian/rules
> --- search-ccsb-0.5/debian/rules
> +++ search-ccsb-0.5/debian/rules
> @@ -10,9 +10,7 @@
> #export DH_VERBOSE=1
>
> # This is the debhelper compatibility version to use.
> -export DH_COMPAT=4
> -
> -
> +#export DH_COMPAT=4
Since you added the compat file, drop this all (with the comment)
> # ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
> # CFLAGS += -g
> @@ -21,11 +19,37 @@
> # INSTALL_PROGRAM += -s
> # endif
>
> +# Apply patches to the package
> +patch: patch-stamp
> +patch-stamp:
> + dh_testdir
> + @patches=debian/patches/*.patch; for patch in $$patches; do \
> + test -f $$patch || continue; \
> + echo "Applying $$patch"; \
> + patch -stuN -p1 < $$patch || exit 1; \
> + done
> + touch $@
> +
> +# Remove patches from the package
> +unpatch:
> + dh_testdir
> + @if test -f patch-stamp; then \
> + patches=debian/patches/*.patch; \
> + for patch in $$patches; do \
> + reversepatches="$$patch $$reversepatches"; \
> + done; \
> + for patch in $$reversepatches; do \
> + test -f $$patch || continue; \
> + echo "Reversing $$patch"; \
> + patch -suRf -p1 < $$patch || exit 1; \
> + done; \
> + rm -f patch-stamp; \
> + fi
> +
> configure: configure-stamp
> configure-stamp:
> dh_testdir
> # Add here commands to configure the package.
> -
> touch configure-stamp
>
>
> @@ -49,9 +73,9 @@
>
> touch build-indep-stamp
>
> -build: build-arch build-indep
> +build: patch build-arch build-indep
>
> -clean:
> +clean: unpatch
> dh_testdir
> dh_testroot
> rm -f build-arch-stamp build-indep-stamp configure-stamp
> @@ -106,2 +130,4 @@
> +binary-arch:
> +
> binary: binary-indep
> -.PHONY: build clean binary-indep binary install configure
> +.PHONY: build clean binary-indep binary install configure patch unpatch
> diff -u search-ccsb-0.5/debian/changelog search-ccsb-0.5/debian/changelog
> --- search-ccsb-0.5/debian/changelog
> +++ search-ccsb-0.5/debian/changelog
> @@ -1,3 +1,15 @@
> +search-ccsb (0.5-2ubuntu1) intrepid; urgency=low
> +
> + * Changed url (LP: #102876)
> + * Changed Standards Version to 3.7.3
> + * Corrected debian/copyright file
> + * added patch system to debian/rules file
> + * added debian/compat file
> + * Changed debhelper from Build-Depends-Indep to Build-Depends
> + * Changed Maintainer Field
> +
> + -- Ralph Janke <[EMAIL PROTECTED]> Sat, 07 Jun 2008 20:07:31 +0100
> +
> search-ccsb (0.5-2) unstable; urgency=low
>
> * Merged packages since the search-ccsb is so small.
> @@ -25,7 +37,7 @@
>
> -- Otavio Salvador <[EMAIL PROTECTED]> Mon, 8 Dec 2003 22:40:05 -0200
>
> -search-ccsb (0.5-1) unstable; urgency=low
> +search -ccsb (0.5-1) unstable; urgency=low
Broken
> * New upstream release
> * Update the packaging, now conforming to policy version 3.6.0.
> @@ -41,7 +53,7 @@
> - Updated the Build-Depends-Indep to depends of debhelper >= 4
>
> -- Otavio Salvador <[EMAIL PROTECTED]> Thu, 19 Dec 2002 14:02:04 -0200
> -
> +
Really need?
> search-ccsb (0.4-3) unstable; urgency=low
>
> * Updated the package to policy version 3.5.7
> diff -u search-ccsb-0.5/debian/copyright search-ccsb-0.5/debian/copyright
> --- search-ccsb-0.5/debian/copyright
> +++ search-ccsb-0.5/debian/copyright
> @@ -5,7 +5,7 @@
>
> Upstream Author: Rodrigo Araujo Real <[EMAIL PROTECTED]>
>
> -Copyright:
> +Copyright 2002 Rodrigo Araujo Real <[EMAIL PROTECTED]>
>
> This package is free software; you can redistribute it and/or modify
> it under the terms of the GNU General Public License as published by
> @@ -17,9 +17,9 @@
> GNU General Public License for more details.
>
> You should have received a copy of the GNU General Public License
> - along with this package; if not, write to the Free Software
> - Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
> - 02111-1307, USA.
> + along with this package; if not, write to the
> + Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
> + MA 02110-1301, USA.
Bad indent
> On Debian GNU/Linux systems, the complete text of the GNU General
> Public License can be found in `/usr/share/common-licenses/GPL'.
> only in patch2:
> unchanged:
> --- search-ccsb-0.5.orig/debian/patches/00_fix_url.patch
> +++ search-ccsb-0.5/debian/patches/00_fix_url.patch
> @@ -0,0 +1,11 @@
> +--- ./search-ccsb 2008-06-07 20:57:52.000000000 +0100
> ++++ ./search-ccsb.new 2008-06-07 20:57:39.000000000 +0100
> +@@ -24,7 +24,7 @@ use LWP::UserAgent;
> + $Ua = LWP::UserAgent->new;
> + $Ua->agent("Mozilla (compatible: LWP $LWP::VERSION)");
> +
> +-$res = $Ua->request(POST 'http://liinwww.ira.uka.de/searchbib/index',
> [query => $ARGV[0], results => "bibtex"]);
> ++$res = $Ua->request(POST 'http://liinwww.ira.uka.de/csbib', [query =>
> $ARGV[0], results => "bibtex"]);
> + die "Error while getting ", $res->request->uri,
> + " -- ", $res->status_line, "\nAborting"
> + unless $res->is_success;
> only in patch2:
> unchanged:
> --- search-ccsb-0.5.orig/debian/compat
> +++ search-ccsb-0.5/debian/compat
> @@ -0,0 +1 @@
> +4
If you could do those changes, we can upload it to Debian... no problem.
--
O T A V I O S A L V A D O R
---------------------------------------------
E-mail: [EMAIL PROTECTED] UIN: 5906116
GNU/Linux User: 239058 GPG ID: 49A5F855
Home Page: http://otavio.ossystems.com.br
---------------------------------------------
"Microsoft sells you Windows ... Linux gives
you the whole house."
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
