--- pencil2d-0.5.4~git20140614+dfsg/debian/changelog 2014-06-14 12:33:06.000000000 +0200 +++ pencil2d-0.5.4~git20141029.21a350e+dfsg/debian/changelog 2014-11-15 21:30:11.000000000 +0100 @@ -1,3 +1,26 @@ +pencil2d (0.5.4~git20141029.21a350e+dfsg-1) unstable; urgency=low + + * [3542c83] Imported Upstream commit 0.5.4~git20141029.21a350e+dfsg. + * debian/control: + + [80150f7] demote pencil2d to Priority: extra. + pencil2d depends on qt5-* stuff, which are Priority: extra. According to + the policy a package must not depend on package with lower priority. + + [4e0d0e5] Build-depend on git, to use git in the get-orig-source target. + + [1ab07d5] bump Standard-Version to 3.9.6. No changes needed. + * [7963ebc] upstream drop the Help directory and the unsourced PDF: + * debian/README.source: update. + * debian/rules: update the get-orig-source target. + * [b03a6bc] debian/copyright: add Files-Excluded field. + * debian/rules: + + [e4b0002] update get-orig-source target to use the commit id. + + [74b50b5] uses parallel building (Closes: #755941). + * [904970e] debian/patches/*: refresh patches against new upstream release. + * [55edb01] fix build-depends-on-metapackage lintian error: + + debian/control: drop build-dep on qt5-default + + debian/rules: export QT_SELECT=qt5 + + -- Mattia Rizzolo Sat, 08 Nov 2014 22:46:25 +0100 + pencil2d (0.5.4~git20140614+dfsg-1) unstable; urgency=medium * [aaab030] New upstream commit --- pencil2d-0.5.4~git20140614+dfsg/debian/control 2014-06-09 12:11:08.000000000 +0200 +++ pencil2d-0.5.4~git20141029.21a350e+dfsg/debian/control 2014-11-10 19:23:21.000000000 +0100 @@ -1,19 +1,19 @@ Source: pencil2d Section: graphics -Priority: optional +Priority: extra Maintainer: Mattia Rizzolo Build-Depends: debhelper (>= 9.0.0), gdb, + git, libming-dev, libphonon-dev, libpng++-dev, libqt5svg5-dev, libqt5xmlpatterns5-dev, - qt5-default, qtmultimedia5-dev, qttools5-dev-tools, zlib1g-dev -Standards-Version: 3.9.5 +Standards-Version: 3.9.6 Homepage: http://www.pencil2d.org Vcs-Git: git://anonscm.debian.org/collab-maint/pencil2d.git Vcs-Browser: http://anonscm.debian.org/gitweb/?p=collab-maint/pencil2d.git --- pencil2d-0.5.4~git20140614+dfsg/debian/copyright 2014-06-10 13:39:15.000000000 +0200 +++ pencil2d-0.5.4~git20141029.21a350e+dfsg/debian/copyright 2014-11-08 22:43:06.000000000 +0100 @@ -2,6 +2,9 @@ Upstream-Name: pencil2d Upstream-Contact: Matt Chang Source: http://www.pencil2d.org +File-Excluded: + util/* + 3rdlib/zlib/* Files: * Copyright: 2005-2007 Patrick Corrieri --- pencil2d-0.5.4~git20140614+dfsg/debian/patches/002_translation.patch 2014-06-09 13:56:38.000000000 +0200 +++ pencil2d-0.5.4~git20141029.21a350e+dfsg/debian/patches/002_translation.patch 2014-11-08 22:51:12.000000000 +0100 @@ -1,16 +1,16 @@ Description: Change the directory the program get translations from. Forwarded: not-needed Author: Mattia Rizzolo -Last-Update: 2014-06-09 +Last-Update: 2014-11-08 --- a/app/main.cpp +++ b/app/main.cpp -@@ -35,7 +35,7 @@ +@@ -33,7 +33,7 @@ app.installTranslator(&qtTranslator); - QTranslator myappTranslator; -- myappTranslator.load("pencil2d_" + QLocale::system().name()); -+ myappTranslator.load("/usr/share/pencil2d/translations/pencil2d_" + QLocale::system().name()); - app.installTranslator(&myappTranslator); + QTranslator pencil2DTranslator; +- pencil2DTranslator.load("pencil2d_" + QLocale::system().name()); ++ pencil2DTranslator.load("/usr/share/pencil2d/translations/pencil2d_" + QLocale::system().name()); + app.installTranslator(&pencil2DTranslator); #ifndef Q_WS_MAC --- pencil2d-0.5.4~git20140614+dfsg/debian/patches/quazip.patch 2014-06-10 00:00:18.000000000 +0200 +++ pencil2d-0.5.4~git20141029.21a350e+dfsg/debian/patches/quazip.patch 2014-11-08 22:51:20.000000000 +0100 @@ -7,7 +7,7 @@ --- a/3rdlib/quazip/quazip.pro +++ b/3rdlib/quazip/quazip.pro -@@ -12,10 +12,8 @@ +@@ -14,10 +14,8 @@ include(quazip.pri) unix:!symbian { --- pencil2d-0.5.4~git20140614+dfsg/debian/patches/remove-zlib.patch 2014-06-14 09:42:58.000000000 +0200 +++ pencil2d-0.5.4~git20141029.21a350e+dfsg/debian/patches/remove-zlib.patch 2014-11-08 22:51:40.000000000 +0100 @@ -36,7 +36,7 @@ --- a/core_lib/core_lib.pro +++ b/core_lib/core_lib.pro -@@ -204,5 +204,3 @@ +@@ -208,5 +208,3 @@ INCLUDEPATH += $$PWD/../3rdlib/quazip DEPENDPATH += $$PWD/../3rdlib/quazip @@ -75,7 +75,7 @@ +LIBS += -lz --- a/app/app.pro +++ b/app/app.pro -@@ -68,15 +68,5 @@ +@@ -79,15 +79,5 @@ else:unix: PRE_TARGETDEPS += $$OUT_PWD/../3rdlib/quazip/libquazip.a # --- zlib --- --- pencil2d-0.5.4~git20140614+dfsg/debian/README.source 2014-06-09 19:09:19.000000000 +0200 +++ pencil2d-0.5.4~git20141029.21a350e+dfsg/debian/README.source 2014-11-08 22:43:06.000000000 +0100 @@ -17,19 +17,15 @@ rm -rf pencil2d/util -3. Remove the unsourced PDF (and the directory containing it, since it's empty): - - rm -rf pencil2d/Help - -4. Remove the bundled zlib library: +3. Remove the bundled zlib library: rm -rf pencil2d/3rdlib/zlib -5. Create a tarball, excluding git-specific files, using as name for the file +4. Create a tarball, excluding git-specific files, using as name for the file the date of the last commit: tar --exclude-vcs -cjf pencil2d_0.5.4~git20140607+dfsg.orig.tar.bz2 pencil2d -6. Use the resulting orig.tar.gz tarball with the debian directory and patches +5. Use the resulting orig.tar.gz tarball with the debian directory and patches contained within to build your package. The result will be equal to the package uploaded into Debian. --- pencil2d-0.5.4~git20140614+dfsg/debian/rules 2014-06-09 19:08:00.000000000 +0200 +++ pencil2d-0.5.4~git20141029.21a350e+dfsg/debian/rules 2014-11-10 19:23:09.000000000 +0100 @@ -2,9 +2,10 @@ #export DH_VERBOSE=1 export DEB_BUILD_MAINT_OPTIONS=hardening=+all +export QT_SELECT=qt5 %: - dh $@ + dh $@ --parallel override_dh_install: dh_install --list-missing @@ -15,7 +16,6 @@ dh_testdir git clone git@github.com:pencil2d/pencil.git pencil2d rm -rf pencil2d/util - rm -rf pencil2d/Help rm -rf pencil2d/3rdlib/zlib - cd pencil2d && tar --exclude-vcs -cjf ../../pencil2d_0.5.4~git$$(git log -1 --format="%ci"|awk {'print $$1'}|tr -d '-')+dfsg.orig.tar.bz2 . + cd pencil2d && tar --exclude-vcs -cJf ../../pencil2d_0.5.4~git$$(git log -1 --format="%ci %h"|awk '{print $$1"."$$4}'|tr -d '-')+dfsg.orig.tar.xz . rm -rf pencil2d