Commit 3eb52b79 authored by Vincent Cheng's avatar Vincent Cheng

refresh patches


git-svn-id: svn://svn.debian.org/svn/pkg-nvidia/packages/nvidia-settings/trunk@4826 b6a4b1ba-b714-0410-8a2d-fc0b36c6496e
parent dc41ec79
......@@ -18,6 +18,7 @@ nvidia-settings (340.24-1) UNRELEASED; urgency=medium
- Fixed a bug that caused duplicate entries to appear in some dropdown
menus in the "Application Profiles" page of nvidia-setting
* Add myself to Uploaders.
* Refresh patches.
[ Andreas Beckmann ]
* Merge from unstable prior to being branched off:
......
......@@ -3,7 +3,7 @@ Description: link with -Wl,--as-needed to reduce library footprint
--- a/utils.mk
+++ b/utils.mk
@@ -36,6 +36,9 @@ CC_ONLY_CFLAGS ?=
@@ -36,6 +36,9 @@
LDFLAGS ?=
BIN_LDFLAGS ?=
......@@ -15,7 +15,7 @@ Description: link with -Wl,--as-needed to reduce library footprint
HOST_CFLAGS ?= $(CFLAGS)
--- a/samples/Makefile
+++ b/samples/Makefile
@@ -59,6 +59,8 @@ LDFLAGS += $(X_LDFLAGS)
@@ -59,6 +59,8 @@
LDFLAGS += -L $(XNVCTRL_DIR)
LIBS += -lXNVCtrl -lXext -lX11
......
......@@ -3,7 +3,7 @@ Author: Andreas Beckmann <debian@abeckmann.de>
--- a/utils.mk
+++ b/utils.mk
@@ -51,6 +51,7 @@
@@ -53,6 +53,7 @@
STRIP_CMD ?= true
CFLAGS += -O0 -g
else
......
......@@ -4,7 +4,7 @@ Bug-Debian: http://bugs.debian.org/666909
--- a/src/Makefile
+++ b/src/Makefile
@@ -83,6 +83,9 @@ endif
@@ -84,6 +84,9 @@
XNVCTRL_DIR ?= libXNVCtrl
XNVCTRL_MAKEFILE ?= Makefile
XNVCTRL_ARCHIVE ?= $(XNVCTRL_DIR)/libXNVCtrl.a
......@@ -14,7 +14,7 @@ Bug-Debian: http://bugs.debian.org/666909
XCONFIG_PARSER_DIR ?= XF86Config-parser
COMMON_UTILS_DIR ?= common-utils
COMMON_UNIX_DIR ?= common-unix
@@ -183,9 +186,12 @@ NVIDIA_SETTINGS_install: $(NVIDIA_SETTIN
@@ -203,9 +206,12 @@
$(MKDIR) $(BINDIR)
$(INSTALL) $(INSTALL_BIN_ARGS) $< $(BINDIR)/$(notdir $<)
......@@ -31,7 +31,7 @@ Bug-Debian: http://bugs.debian.org/666909
# define the rule to build each object file
--- a/src/libXNVCtrl/Makefile
+++ b/src/libXNVCtrl/Makefile
@@ -55,10 +55,17 @@ OBJS = $(call BUILD_OBJECT_LIST,$(SRC))
@@ -55,10 +55,17 @@
.PHONY: clean
all: $(LIBXNVCTRL)
......@@ -49,7 +49,7 @@ Bug-Debian: http://bugs.debian.org/666909
# define the rule to build each object file
$(foreach src,$(SRC),$(eval $(call DEFINE_OBJECT_RULE,TARGET,$(src))))
@@ -68,3 +75,4 @@ $(eval $(call DEFINE_STAMP_C_RULE, $(OBJ
@@ -68,3 +75,4 @@
clean:
rm -rf $(LIBXNVCTRL) *~ $(STAMP_C) \
$(OUTPUTDIR)/*.o $(OUTPUTDIR)/*.d
......
......@@ -3,7 +3,7 @@ Description: let clean recurse into libXNVCtrl
--- a/src/Makefile
+++ b/src/Makefile
@@ -207,6 +207,7 @@ build-xnvctrl:
@@ -227,6 +227,7 @@
@$(MAKE) -C $(XNVCTRL_DIR) -f $(XNVCTRL_MAKEFILE)
clean clobber:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment