diff -Nru bitstormlite-0.2q/debian/bitstormlite.install bitstormlite-0.2q/debian/bitstormlite.install --- bitstormlite-0.2q/debian/bitstormlite.install 1970-01-01 00:00:00.000000000 +0000 +++ bitstormlite-0.2q/debian/bitstormlite.install 2011-12-05 22:07:41.000000000 +0000 @@ -0,0 +1 @@ +bitstormlite.desktop /usr/share/applications/ diff -Nru bitstormlite-0.2q/debian/bitstormlite.manpages bitstormlite-0.2q/debian/bitstormlite.manpages --- bitstormlite-0.2q/debian/bitstormlite.manpages 1970-01-01 00:00:00.000000000 +0000 +++ bitstormlite-0.2q/debian/bitstormlite.manpages 2011-12-05 21:50:42.000000000 +0000 @@ -0,0 +1 @@ +debian/bitstormlite.1 diff -Nru bitstormlite-0.2q/debian/changelog bitstormlite-0.2q/debian/changelog --- bitstormlite-0.2q/debian/changelog 2011-12-08 19:48:41.000000000 +0000 +++ bitstormlite-0.2q/debian/changelog 2011-12-05 22:00:58.000000000 +0000 @@ -1,9 +1,16 @@ -bitstormlite (0.2q-1ubuntu1) oneiric; urgency=low +bitstormlite (0.2q-2) unstable; urgency=low - * src/Makefile.am/in: Fix FTBFS with --as-needed by putting - libraries in LDADD instead of LDFLAGS. (LP: #765953) + * Moved to Source Format Quilt. + * debian/patches/ld_as-needed_FTFBS_fix.patch: + - added to prevent a FTBFS with ld --as-needed. Thanks + Andreas Moog for the patch. (Closes: #631322) + * General package's cleanup: + - copyright moved to DEP-5. + - bumped Standards-Version to latest. + - AUTHORS and ABOUT-NLS files won't be installed anymore + as docs. - -- Andreas Moog Wed, 22 Jun 2011 20:23:56 +0000 + -- Andrea Veri Mon, 05 Dec 2011 22:43:40 +0100 bitstormlite (0.2q-1) unstable; urgency=low @@ -95,4 +102,3 @@ * First package release (Closes: 390964) -- Andrea Veri Tue, 15 May 2007 20:47:24 +0200 - diff -Nru bitstormlite-0.2q/debian/compat bitstormlite-0.2q/debian/compat --- bitstormlite-0.2q/debian/compat 2011-12-08 19:48:41.000000000 +0000 +++ bitstormlite-0.2q/debian/compat 2011-12-05 21:43:41.000000000 +0000 @@ -1 +1 @@ -7 +8 diff -Nru bitstormlite-0.2q/debian/control bitstormlite-0.2q/debian/control --- bitstormlite-0.2q/debian/control 2011-12-08 19:48:41.000000000 +0000 +++ bitstormlite-0.2q/debian/control 2011-12-05 21:46:50.000000000 +0000 @@ -1,11 +1,10 @@ Source: bitstormlite Section: net Priority: optional -Maintainer: Ubuntu Developers -XSBC-Original-Maintainer: Andrea Veri +Maintainer: Andrea Veri Homepage: http://sourceforge.net/projects/bbom/ -Build-Depends: debhelper (>= 7), pkg-config, libgtk2.0-dev, libcurl4-gnutls-dev -Standards-Version: 3.8.3 +Build-Depends: debhelper (>= 8.0.0), pkg-config, libgtk2.0-dev, libcurl4-gnutls-dev +Standards-Version: 3.9.2 Package: bitstormlite Architecture: any @@ -16,4 +15,3 @@ which is the possibility to download a huge amount of data from any .torrent file taken from trackers around the web. - diff -Nru bitstormlite-0.2q/debian/copyright bitstormlite-0.2q/debian/copyright --- bitstormlite-0.2q/debian/copyright 2011-12-08 19:48:41.000000000 +0000 +++ bitstormlite-0.2q/debian/copyright 2011-12-05 21:49:10.000000000 +0000 @@ -1,36 +1,36 @@ -This package was debianized by Andrea Veri on -Tue, 15 May 2007 20:47:24 +0200. - -It was downloaded from http://sourceforge.net/projects/bbom/ - -Upstream Authors: gaoxianchao , - - -Copyright Holders: 2004, 2006 gaoxianchao - 2004, 2006 gnap_an - 2004, 2006 linux_lyb - 2004, 2006 ahlongxp - 2002 Dr Brian Gladman - 2003 Glenn L. McGrath - 2003 Erik Andersen - 1995, 2006 Free Software Foundation, Inc - 2002 Dr Brian Gladman - -License: - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. - -The Debian packaging is (C) 2007, Andrea Veri and -is licensed under the GPL, see `/usr/share/common-licenses/GPL'.. +Format: http://dep.debian.net/deps/dep5 +Upstream-Name: bitstormlite +Source: http://sourceforge.net/projects/bbom + +Files: * +Copyright: 2004, 2006 gaoxianchao + 2004, 2006 gnap_an + 2004, 2006 linux_lyb + 2004, 2006 ahlongxp + 2002 Dr Brian Gladman + 2003 Glenn L. McGrath + 2003 Erik Andersen + 1995, 2006 Free Software Foundation, Inc + 2002 Dr Brian Gladman +License: GPL-2.0+ + +Files: debian/* +Copyright: 2011 Andrea Veri +License: GPL-2.0+ + +License: GPL-2.0+ + 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 + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + . + This package is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + . + You should have received a copy of the GNU General Public License + along with this program. If not, see + . + On Debian systems, the complete text of the GNU General + Public License version 2 can be found in "/usr/share/common-licenses/GPL-2". diff -Nru bitstormlite-0.2q/debian/docs bitstormlite-0.2q/debian/docs --- bitstormlite-0.2q/debian/docs 2011-12-08 19:48:41.000000000 +0000 +++ bitstormlite-0.2q/debian/docs 2011-12-05 21:59:38.000000000 +0000 @@ -1,3 +1 @@ NEWS -AUTHORS -ABOUT-NLS diff -Nru bitstormlite-0.2q/debian/patches/ld_as-needed_FTFBS_fix.patch bitstormlite-0.2q/debian/patches/ld_as-needed_FTFBS_fix.patch --- bitstormlite-0.2q/debian/patches/ld_as-needed_FTFBS_fix.patch 1970-01-01 00:00:00.000000000 +0000 +++ bitstormlite-0.2q/debian/patches/ld_as-needed_FTFBS_fix.patch 2011-12-05 21:56:47.000000000 +0000 @@ -0,0 +1,28 @@ +Index: bitstormlite-0.2q/src/Makefile.am +=================================================================== +--- bitstormlite-0.2q.orig/src/Makefile.am 2010-01-17 13:43:30.000000000 +0100 ++++ bitstormlite-0.2q/src/Makefile.am 2011-12-05 22:56:00.376599420 +0100 +@@ -4,8 +4,7 @@ + localedir = $(datadir)/locale + INCLUDES = $(GTK_CFLAGS) -DLOCALEDIR=\"$(localedir)\" + +-bitstormlite_LDFLAGS = -lpthread $(GTK_LIBS) `curl-config --libs` +-bitstormlite_LDADD = $(LIBINTL) ++bitstormlite_LDADD = -lpthread $(GTK_LIBS) `curl-config --libs` $(LIBINTL) + + bitstormlite_SOURCES = bdict.cpp\ + BitSet.cpp\ +Index: bitstormlite-0.2q/src/Makefile.in +=================================================================== +--- bitstormlite-0.2q.orig/src/Makefile.in 2010-01-17 14:08:25.000000000 +0100 ++++ bitstormlite-0.2q/src/Makefile.in 2011-12-05 22:56:42.856598222 +0100 +@@ -238,8 +238,7 @@ + top_srcdir = @top_srcdir@ + AUTOMAKE_OPTIONS = foreign + INCLUDES = $(GTK_CFLAGS) -DLOCALEDIR=\"$(localedir)\" +-bitstormlite_LDFLAGS = -lpthread $(GTK_LIBS) `curl-config --libs` +-bitstormlite_LDADD = $(LIBINTL) ++bitstormlite_LDADD = -lpthread $(GTK_LIBS) `curl-config --libs` $(LIBINTL) + bitstormlite_SOURCES = bdict.cpp\ + BitSet.cpp\ + blist.cpp\ diff -Nru bitstormlite-0.2q/debian/patches/series bitstormlite-0.2q/debian/patches/series --- bitstormlite-0.2q/debian/patches/series 1970-01-01 00:00:00.000000000 +0000 +++ bitstormlite-0.2q/debian/patches/series 2011-12-05 21:55:21.000000000 +0000 @@ -0,0 +1 @@ +ld_as-needed_FTFBS_fix.patch diff -Nru bitstormlite-0.2q/debian/rules bitstormlite-0.2q/debian/rules --- bitstormlite-0.2q/debian/rules 2011-12-08 19:48:41.000000000 +0000 +++ bitstormlite-0.2q/debian/rules 2011-12-05 21:44:57.000000000 +0000 @@ -1,66 +1,4 @@ #!/usr/bin/make -f -DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) -DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) - -CFLAGS = -Wall -g - -ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) - CFLAGS += -O0 -else - CFLAGS += -O2 -endif - -config.status: configure - dh_testdir - ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info CFLAGS="$(CFLAGS)" - - -build: build-stamp - -build-stamp: config.status - dh_testdir - - $(MAKE) - - touch $@ - -clean: - dh_testdir - dh_testroot - rm -f build-stamp - - [ ! -f Makefile ] || $(MAKE) distclean - dh_clean - -rm -f $(CURDIR)/bitstormlite.1 - -install: build - dh_testdir - dh_testroot - dh_prep - dh_installdirs - - $(MAKE) DESTDIR=$(CURDIR)/debian/bitstormlite install - - -binary-indep: build install - -binary-arch: build install - dh_testdir - dh_testroot - dh_installchangelogs ChangeLog - dh_installdocs - dh_installman debian/bitstormlite.1 - dh_install bitstormlite.desktop usr/share/applications - dh_link - dh_strip - dh_compress - dh_fixperms - dh_installdeb - dh_shlibdeps - dh_gencontrol - dh_md5sums - dh_builddeb - -binary: binary-indep binary-arch -.PHONY: build clean binary-indep binary-arch binary install +%: + dh $@ diff -Nru bitstormlite-0.2q/debian/source/format bitstormlite-0.2q/debian/source/format --- bitstormlite-0.2q/debian/source/format 1970-01-01 00:00:00.000000000 +0000 +++ bitstormlite-0.2q/debian/source/format 2011-12-08 19:48:41.000000000 +0000 @@ -0,0 +1 @@ +3.0 (quilt) diff -Nru bitstormlite-0.2q/src/Makefile.am bitstormlite-0.2q/src/Makefile.am --- bitstormlite-0.2q/src/Makefile.am 2011-12-08 19:48:41.000000000 +0000 +++ bitstormlite-0.2q/src/Makefile.am 2010-01-17 12:43:30.000000000 +0000 @@ -4,7 +4,8 @@ localedir = $(datadir)/locale INCLUDES = $(GTK_CFLAGS) -DLOCALEDIR=\"$(localedir)\" -bitstormlite_LDADD = -lpthread $(GTK_LIBS) `curl-config --libs` $(LIBINTL) +bitstormlite_LDFLAGS = -lpthread $(GTK_LIBS) `curl-config --libs` +bitstormlite_LDADD = $(LIBINTL) bitstormlite_SOURCES = bdict.cpp\ BitSet.cpp\ diff -Nru bitstormlite-0.2q/src/Makefile.in bitstormlite-0.2q/src/Makefile.in --- bitstormlite-0.2q/src/Makefile.in 2011-12-08 19:48:41.000000000 +0000 +++ bitstormlite-0.2q/src/Makefile.in 2010-01-17 13:08:25.000000000 +0000 @@ -238,7 +238,8 @@ top_srcdir = @top_srcdir@ AUTOMAKE_OPTIONS = foreign INCLUDES = $(GTK_CFLAGS) -DLOCALEDIR=\"$(localedir)\" -bitstormlite_LDADD = -lpthread $(GTK_LIBS) `curl-config --libs` $(LIBINTL) +bitstormlite_LDFLAGS = -lpthread $(GTK_LIBS) `curl-config --libs` +bitstormlite_LDADD = $(LIBINTL) bitstormlite_SOURCES = bdict.cpp\ BitSet.cpp\ blist.cpp\