This is an automated email from the git hooks/post-receive script. skitt pushed a commit to branch master in repository jstest-gtk.
commit e2804dd3e1318ecf92fe93147a4a8d023bb31af9 Author: Stephen Kitt <[email protected]> Date: Mon Dec 12 23:06:11 2016 +0100 New upstream snapshot --- debian/changelog | 3 ++- debian/clean | 1 + debian/control | 2 +- debian/copyright | 8 +++++++- debian/docs | 2 +- debian/patches/datadir.patch | 15 --------------- debian/patches/flags-from-env.patch | 20 -------------------- debian/patches/series | 2 -- debian/rules | 25 +++++-------------------- 9 files changed, 17 insertions(+), 61 deletions(-) diff --git a/debian/changelog b/debian/changelog index 324d96b..bf69102 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,6 @@ -jstest-gtk (0.1.1~git20140501-3) UNRELEASED; urgency=medium +jstest-gtk (0.1.1~git20160825-1) UNRELEASED; urgency=medium + * New upstream snapshot, switching to CMake. * Migrate to dbgsym debug packages. * Switch to https: VCS URIs (see #810378). diff --git a/debian/clean b/debian/clean new file mode 100644 index 0000000..ba989ff --- /dev/null +++ b/debian/clean @@ -0,0 +1 @@ +jstest-gtk diff --git a/debian/control b/debian/control index 0518d22..4399b19 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Section: utils Priority: optional Maintainer: Debian Games Team <[email protected]> Uploaders: Stephen Kitt <[email protected]> -Build-Depends: debhelper (>= 9.20151219~), scons, dh-buildinfo, +Build-Depends: debhelper (>= 9.20151219~), cmake, dh-buildinfo, libgtkmm-2.4-dev, libsigc++-2.0-dev, libexpat1-dev, libx11-dev Standards-Version: 3.9.6 Homepage: http://pingus.seul.org/~grumbel/jstest-gtk/ diff --git a/debian/copyright b/debian/copyright index 0575464..8f6211f 100644 --- a/debian/copyright +++ b/debian/copyright @@ -8,9 +8,15 @@ Files: * Copyright: 2009 Ingo Ruhnke <[email protected]> License: GPL-3+ +Files: external/binreloc-2.0/* +Copyright: Hongli Lai <[email protected]> +License: public-domain + This source code is public domain. You can relicense this code under + whatever license you want. + Files: debian/* Copyright: 2009-2011 Miriam Ruiz <[email protected]> - 2011-2015 Stephen Kitt <[email protected]> + 2011-2016 Stephen Kitt <[email protected]> License: GPL-3+ License: GPL-3+ diff --git a/debian/docs b/debian/docs index 724e084..6f77277 100644 --- a/debian/docs +++ b/debian/docs @@ -1,2 +1,2 @@ -README +README.md TODO diff --git a/debian/patches/datadir.patch b/debian/patches/datadir.patch deleted file mode 100644 index 09c9f29..0000000 --- a/debian/patches/datadir.patch +++ /dev/null @@ -1,15 +0,0 @@ -Description: Specify full path for joystick icon -Author: Miriam Ruiz <[email protected]> -Forwarded: no - ---- a/src/joystick_list_widget.cpp -+++ b/src/joystick_list_widget.cpp -@@ -123,7 +123,7 @@ - for(std::vector<JoystickDescription>::const_iterator i = joysticks.begin(); i != joysticks.end(); ++i) - { - Gtk::ListStore::iterator it = device_list->append(); -- (*it)[DeviceListColumns::instance().icon] = Gdk::Pixbuf::create_from_file("data/generic.png"); -+ (*it)[DeviceListColumns::instance().icon] = Gdk::Pixbuf::create_from_file("/usr/share/jstest-gtk/data/generic.png"); - (*it)[DeviceListColumns::instance().path] = i->filename; - - std::ostringstream out; diff --git a/debian/patches/flags-from-env.patch b/debian/patches/flags-from-env.patch deleted file mode 100644 index 3ce5421..0000000 --- a/debian/patches/flags-from-env.patch +++ /dev/null @@ -1,20 +0,0 @@ -Description: Pass build flags from the environment -Author: Stephen Kitt <[email protected]> -Forwarded: no - ---- a/SConstruct -+++ b/SConstruct -@@ -15,7 +15,12 @@ - ## You should have received a copy of the GNU General Public License - ## along with this program. If not, see <http://www.gnu.org/licenses/>. - --env = Environment(CXXFLAGS=["-g", "-Wall", "-Werror"]) -+import os -+env = Environment() -+env.MergeFlags(os.environ['CPPFLAGS']) -+env.MergeFlags(os.environ['CFLAGS']) -+env.MergeFlags(os.environ['CXXFLAGS']) -+env.MergeFlags(os.environ['LINKFLAGS']) - env.ParseConfig('pkg-config --cflags --libs gtkmm-2.4 sigc++-2.0 expat x11') - env.Program('jstest-gtk', [ - 'src/axis_widget.cpp', diff --git a/debian/patches/series b/debian/patches/series index fb9fe62..96879a1 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,3 +1 @@ -datadir.patch -flags-from-env.patch persistent-settings.patch diff --git a/debian/rules b/debian/rules index f8e5c92..7cb8700 100755 --- a/debian/rules +++ b/debian/rules @@ -1,31 +1,16 @@ #!/usr/bin/make -f -# Uncomment this to turn on verbose mode. -#export DH_VERBOSE=1 - -CPPFLAGS := $(shell dpkg-buildflags --get CPPFLAGS) -CFLAGS := $(shell dpkg-buildflags --get CFLAGS) -CXXFLAGS := $(shell dpkg-buildflags --get CXXFLAGS) -LDFLAGS := $(shell DEB_LDFLAGS_MAINT_APPEND="-Wl,-z,defs -Wl,--as-needed" dpkg-buildflags --get LDFLAGS) -# SCons passes $LINKFLAGS to the compiler as a single argument -# so we build up a single -Wl argument -LINKFLAGS = -Wl$(shell for arg in $(subst -Wl,,$(LDFLAGS)); do echo -n $$arg; done) -export CPPFLAGS CFLAGS CXXFLAGS LINKFLAGS +export DEB_LDFLAGS_MAINT_APPEND="-Wl,-z,defs -Wl,--as-needed" %: dh $@ -override_dh_auto_build: - scons \ - prefix=/usr \ - resources_dir=/usr/share/jstest-gtk \ - lib_dir="$(CURDIR)" - -override_dh_auto_clean: - -scons -c - override_dh_strip: dh_strip --ddeb-migration='jstest-gtk-dbg (<< 0.1.1~git20140501-3~)' override_dh_installchangelogs: dh_installchangelogs NEWS + +override_dh_install: + cp obj-$(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)/jstest-gtk . + dh_install -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/jstest-gtk.git _______________________________________________ Pkg-games-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
