Timo Aaltonen pushed to branch master at X Strike Force / app / s3switch


Commits:
1414e22a by Tormod Volden at 2020-03-05T23:02:20+01:00
Update Version Control System location

- - - - -
8b645c17 by Tormod Volden at 2020-03-05T23:38:20+01:00
Update origin link in debian/copyright

- - - - -
d968dc02 by Tormod Volden at 2020-09-08T22:00:37+02:00
Use dh_install instead of install

Thanks to Simon McVittie for the suggestion.

- - - - -
6c67dafe by Tormod Volden at 2020-09-08T22:04:19+02:00
Start new version in debian/changelog

- - - - -
c1c607c9 by Tormod Volden at 2020-09-08T22:52:47+02:00
Correct Vcs links

- - - - -


5 changed files:

- debian/changelog
- debian/control
- debian/copyright
- debian/rules
- + debian/s3switch.install


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,10 @@
+s3switch (0.1-2) UNRELEASED; urgency=medium
+
+  * debian/control: Update Vcs links to salsa
+  * debian/rules: Use .install file for binary (Closes: #968529)
+
+ -- Tormod Volden <debian.tor...@gmail.com>  Tue, 08 Sep 2020 21:53:16 +0200
+
 s3switch (0.1-1) unstable; urgency=low
 
   * New upstream release and upstream location


=====================================
debian/control
=====================================
@@ -4,8 +4,8 @@ Priority: extra
 Maintainer: Tormod Volden <debian.tor...@gmail.com>
 Standards-Version: 3.9.2
 Build-Depends: debhelper (>=7)
-Vcs-Git: git://anonscm.debian.org/pkg-xorg/app/s3switch.git
-Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-xorg/app/s3switch.git
+Vcs-Browser: https://salsa.debian.org/xorg-team/app/s3switch
+Vcs-Git: https://salsa.debian.org/xorg-team/app/s3switch.git
 
 Package: s3switch
 Architecture: i386


=====================================
debian/copyright
=====================================
@@ -7,7 +7,7 @@ Packaged-by: Guido Guenther <a...@debian.org>
 
 Files: *
 Copyright: Copyright 2000 S3, Incorporated.
-Origin: http://www.probo.com/timr/savage40.html
+Origin: http://www.timr.probo.com/savage40.html
 License: MIT with extra notice
  Permission is hereby granted, free of charge, to any person obtaining a copy 
of
  this software and associated documentation files (the "Software"), to deal in


=====================================
debian/rules
=====================================
@@ -12,11 +12,6 @@ ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
 else
         CFLAGS += -O2
 endif
-ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
-        INSTALL_PROGRAM = install -s
-else
-        INSTALL_PROGRAM = install
-endif
 
 build: build-arch build-indep
 build-arch: build-stamp
@@ -45,10 +40,8 @@ install: build
        dh_testroot
        dh_prep
        dh_installdirs
+       dh_install
 
-       # Add here commands to install the package into debian/tmp.
-#      $(MAKE) install DESTDIR=`pwd`/debian/s3switch
-       ${INSTALL_PROGRAM} s3switch `pwd`/debian/s3switch/usr/bin
        cp s3switch.1x s3switch.8
 
 # Build architecture-independent files here.


=====================================
debian/s3switch.install
=====================================
@@ -0,0 +1 @@
+s3switch usr/bin



View it on GitLab: 
https://salsa.debian.org/xorg-team/app/s3switch/-/compare/625ed6330db369cb2d427d71a804f4e03451806c...c1c607c95e907f1a1b993ea8283e18123dc3fbda

-- 
View it on GitLab: 
https://salsa.debian.org/xorg-team/app/s3switch/-/compare/625ed6330db369cb2d427d71a804f4e03451806c...c1c607c95e907f1a1b993ea8283e18123dc3fbda
You're receiving this email because of your account on salsa.debian.org.


Reply via email to