diff -Nru project-x-0.90.4dfsg/debian/changelog project-x-0.90.4dfsg/debian/changelog --- project-x-0.90.4dfsg/debian/changelog 2023-12-21 19:32:01.000000000 +0000 +++ project-x-0.90.4dfsg/debian/changelog 2023-12-21 19:30:01.000000000 +0000 @@ -1,3 +1,16 @@ +project-x (0.90.4dfsg-0ubuntu6) noble; urgency=medium + + * Redo the packaging to fix FTBFS. (LP: #2045816) + - remove cdbs dependency. + - d/control: start using debhelper-compat 13. + - d/control: fix whitespace errors. + - d/control: Update to Standards-Version 4.6.2 + - d/copyright: redo copyright file according to dep-5. + - d/rules: redo rules file with cdbs removal. + - d/source/format: update to 3.0 quilt format. + + -- Sudip Mukherjee Thu, 21 Dec 2023 19:30:01 +0000 + project-x (0.90.4dfsg-0ubuntu5) intrepid; urgency=low * remove java specific dependencies and icedtea-java7-jre NBS (LP: #203636) diff -Nru project-x-0.90.4dfsg/debian/compat project-x-0.90.4dfsg/debian/compat --- project-x-0.90.4dfsg/debian/compat 2023-12-21 19:32:01.000000000 +0000 +++ project-x-0.90.4dfsg/debian/compat 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -5 diff -Nru project-x-0.90.4dfsg/debian/control project-x-0.90.4dfsg/debian/control --- project-x-0.90.4dfsg/debian/control 2023-12-21 19:32:01.000000000 +0000 +++ project-x-0.90.4dfsg/debian/control 2023-12-21 16:37:29.000000000 +0000 @@ -2,18 +2,15 @@ Section: x11 Priority: optional Maintainer: Ubuntu MOTU -Build-Depends: cdbs (>= 0.4.43), debhelper (>= 5.0.38), default-jdk, liboro-java, libcommons-net-java -XS-Python-Version: current -Standards-Version: 3.7.3 +Build-Depends: debhelper-compat (= 13), default-jdk, liboro-java, libcommons-net-java +Standards-Version: 4.6.2 Homepage: http://sourceforge.net/projects/project-x Package: project-x Architecture: all -Depends:${misc:Depends}, libcommons-net-java, default-jre | java2-runtime +Depends: ${misc:Depends}, libcommons-net-java, default-jre | java2-runtime Description: DVB demuxing tool - European digital radio & television uses the DVB standard to broadcast its - data. Project X gives you a look behind the transmissions and tries its - best to handle & repair many stream types and shows what went wrong on + European digital radio & television uses the DVB standard to broadcast its + data. Project X gives you a look behind the transmissions and tries its + best to handle & repair many stream types and shows what went wrong on reception. - - diff -Nru project-x-0.90.4dfsg/debian/copyright project-x-0.90.4dfsg/debian/copyright --- project-x-0.90.4dfsg/debian/copyright 2023-12-21 19:32:01.000000000 +0000 +++ project-x-0.90.4dfsg/debian/copyright 2023-12-21 17:35:38.000000000 +0000 @@ -1,62 +1,56 @@ -This package was debianized by Mario Limonciello on -Tue, 21 Jan 2008 16:41:23 -0500 - -This original source for this package was obtained via the website -http://sourceforge.net/projects/project-x - -It is distributed in a .zip archive, so it had to be repackaged. - -Additionally, due to DFSG, the lib/ directory has been removed from -the .orig.tar.gz due to questionable licensing on multiple binaries -shipped within it, as well as several unnecessary binaries under -the Apache License. - -Copyright: - - ProjectX: - dvb.matt - - Portions copyright Eric Albert - * This code is Copyright 1999-2001 by Eric Albert (ejalbert@cs.stanford.edu) and may be - * redistributed or modified in any form without restrictions as long as the portion of this - * comment from this paragraph through the end of the comment is not removed. The author - * requests that he be notified of any application, applet, or other binary that makes use of - * this code, but that's more out of curiosity than anything and is not required. This software - * includes no warranty. The author is not repsonsible for any loss of data or functionality - * or any adverse or unexpected effects of using this software. - - Other Contributors: - TheHorse - keyboardcontrol of preview - java.lang - conditional patch of H-resolution - R-One - DTS support - ghost - dreambox file segment completion - roehrist - CVS, X-input - pstorch - i18n support - chrisg - Topfield disk access (AddOn) - jazzydane - danish translation - Kano / RoEn - Unix buils script - catapult,Bonni - Topfield 5x00 export - MartinR - Gui-BaseOutputFileName - - -License: +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: project-x +Source: http://sourceforge.net/projects/project-x +Files-Excluded: lib + +Files: * +Copyright: dvb.matt + TheHorse + java.lang + R-One + ghost + roehrist + pstorch + chrisg + jazzydane + Kano + RoEn + catapult + Bonni + MartinR +License: GPL + +Files: src/edu/stanford/ejalbert/BrowserLauncher.java +Copyright: 1999-2001, Eric Albert +License: Portions + +Files: debian/* +Copyright: 2008, Mario Limonciello +License: GPL + +License: Portions + This code is Copyright 1999-2001 by Eric Albert (ejalbert@cs.stanford.edu) and may be + redistributed or modified in any form without restrictions as long as the portion of this + comment from this paragraph through the end of the comment is not removed. The author + requests that he be notified of any application, applet, or other binary that makes use of + this code, but that's more out of curiosity than anything and is not required. This software + includes no warranty. The author is not repsonsible for any loss of data or functionality + or any adverse or unexpected effects of using this software. +License: GPL 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 package; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -On Debian & Ubuntu systems, a complete copy of the GPL can be found under -/usr/share/common-licenses/GPL - -The Debian packaging is © 2008, Mario Limonciello and is -also licensed under the GPL. + . + On Debian & Ubuntu systems, a complete copy of the GPL can be found under + /usr/share/common-licenses/GPL-2 diff -Nru project-x-0.90.4dfsg/debian/rules project-x-0.90.4dfsg/debian/rules --- project-x-0.90.4dfsg/debian/rules 2023-12-21 19:32:01.000000000 +0000 +++ project-x-0.90.4dfsg/debian/rules 2023-12-21 17:20:18.000000000 +0000 @@ -1,7 +1,9 @@ #!/usr/bin/make -f -include /usr/share/cdbs/1/rules/debhelper.mk -build/project-x:: +%: + dh $@ + +override_dh_auto_build: sed -i "s/lib/\/usr\/share\/java/g; \ s/\-1.3.0//g; \ s/jakarta\-//g" build.sh @@ -11,7 +13,7 @@ /bin/bash build.sh sed -i "s/java\ \-jar\ \/usr\/share\/projectx\/ProjectX.jar/\/usr\/bin\/projectx/" projectx.desktop -clean:: +override_dh_auto_clean: sed -i "s/\/usr\/bin\/projectx/java\ \-jar\ \/usr\/share\/projectx\/ProjectX.jar/" projectx.desktop sed -i "s/\/usr\/share\/java/lib/g; \ s/net.jar/net\-1.3.0.jar/; \ @@ -21,3 +23,4 @@ s/\/oro/jakarta\-oro/" MANIFEST.MF rm -rf build rm -rf ProjectX.jar + dh_auto_clean diff -Nru project-x-0.90.4dfsg/debian/source/format project-x-0.90.4dfsg/debian/source/format --- project-x-0.90.4dfsg/debian/source/format 1970-01-01 01:00:00.000000000 +0100 +++ project-x-0.90.4dfsg/debian/source/format 2023-12-21 16:01:44.000000000 +0000 @@ -0,0 +1 @@ +3.0 (quilt)